commit 5bf5e526d550d84ea15626590db40a97607d8662 (HEAD, refs/remotes/origin/master) Author: Stefan Kangas Date: Tue Nov 1 06:00:54 2022 +0100 Update publicsuffix.txt from upstream * etc/publicsuffix.txt: Update from https://publicsuffix.org/list/public_suffix_list.dat dated 2022-10-29 17:48:52 UTC. diff --git a/etc/publicsuffix.txt b/etc/publicsuffix.txt index 5676a31c3a..025cf47274 100644 --- a/etc/publicsuffix.txt +++ b/etc/publicsuffix.txt @@ -7171,7 +7171,7 @@ org.zw // newGTLDs -// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2022-09-15T15:17:34Z +// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2022-10-29T15:16:24Z // This list is auto-generated, don't edit it manually. // aaa : 2015-02-26 American Automobile Association, Inc. aaa @@ -7341,7 +7341,7 @@ arab // aramco : 2014-11-20 Aramco Services Company aramco -// archi : 2014-02-06 Afilias Limited +// archi : 2014-02-06 Identity Digital Limited archi // army : 2014-03-06 Dog Beach, LLC @@ -7389,7 +7389,7 @@ auto // autos : 2014-01-09 XYZ.COM LLC autos -// avianca : 2015-01-08 Avianca Holdings S.A. +// avianca : 2015-01-08 Avianca Inc. avianca // aws : 2015-06-25 AWS Registry LLC @@ -7485,7 +7485,7 @@ best // bestbuy : 2015-07-31 BBY Solutions, Inc. bestbuy -// bet : 2015-05-07 Afilias Limited +// bet : 2015-05-07 Identity Digital Limited bet // bharti : 2014-01-09 Bharti Enterprises (Holding) Private Limited @@ -7506,10 +7506,10 @@ bing // bingo : 2014-12-04 Binky Moon, LLC bingo -// bio : 2014-03-06 Afilias Limited +// bio : 2014-03-06 Identity Digital Limited bio -// black : 2014-01-16 Afilias Limited +// black : 2014-01-16 Identity Digital Limited black // blackfriday : 2014-01-16 Registry Services, LLC @@ -7524,7 +7524,7 @@ blog // bloomberg : 2014-07-17 Bloomberg IP Holdings LLC bloomberg -// blue : 2013-11-07 Afilias Limited +// blue : 2013-11-07 Identity Digital Limited blue // bms : 2014-10-30 Bristol-Myers Squibb Company @@ -7596,9 +7596,6 @@ brother // brussels : 2014-02-06 DNS.be vzw brussels -// bugatti : 2015-07-23 Bugatti International SA -bugatti - // build : 2013-11-07 Plan Bee LLC build @@ -7641,9 +7638,6 @@ camera // camp : 2013-11-07 Binky Moon, LLC camp -// cancerresearch : 2014-05-15 Australian Cancer Research Foundation -cancerresearch - // canon : 2014-09-12 Canon Inc. canon @@ -7782,7 +7776,7 @@ claims // cleaning : 2013-12-05 Binky Moon, LLC cleaning -// click : 2014-06-05 UNR Corp. +// click : 2014-06-05 Internet Naming Company LLC click // clinic : 2014-03-20 Binky Moon, LLC @@ -8436,7 +8430,7 @@ graphics // gratis : 2014-03-20 Binky Moon, LLC gratis -// green : 2014-05-08 Afilias Limited +// green : 2014-05-08 Identity Digital Limited green // gripe : 2014-03-06 Binky Moon, LLC @@ -8751,7 +8745,7 @@ kia // kids : 2021-08-13 DotKids Foundation Limited kids -// kim : 2013-09-23 Afilias Limited +// kim : 2013-09-23 Identity Digital Limited kim // kinder : 2014-11-07 Ferrero Trading Lux S.A. @@ -8856,7 +8850,7 @@ lego // lexus : 2015-04-23 TOYOTA MOTOR CORPORATION lexus -// lgbt : 2014-05-08 Afilias Limited +// lgbt : 2014-05-08 Identity Digital Limited lgbt // lidl : 2014-09-18 Schwarz Domains und Services GmbH & Co. KG @@ -8904,7 +8898,7 @@ live // living : 2015-07-30 Lifestyle Domain Holdings, Inc. living -// llc : 2017-12-14 Afilias Limited +// llc : 2017-12-14 Identity Digital Limited llc // llp : 2019-08-26 Intercap Registry Inc. @@ -8934,7 +8928,7 @@ london // lotte : 2014-11-07 Lotte Holdings Co., Ltd. lotte -// lotto : 2014-04-10 Afilias Limited +// lotto : 2014-04-10 Identity Digital Limited lotto // love : 2014-12-22 Merchant Law Group LLP @@ -9282,7 +9276,7 @@ oracle // orange : 2015-03-12 Orange Brand Services Limited orange -// organic : 2014-03-27 Afilias Limited +// organic : 2014-03-27 Identity Digital Limited organic // origins : 2015-10-01 The Estée Lauder Companies Inc. @@ -9330,7 +9324,7 @@ pay // pccw : 2015-05-14 PCCW Enterprises Limited pccw -// pet : 2015-05-07 Afilias Limited +// pet : 2015-05-07 Identity Digital Limited pet // pfizer : 2015-09-11 Pfizer Inc. @@ -9378,7 +9372,7 @@ pin // ping : 2015-06-11 Ping Registry Provider, Inc. ping -// pink : 2013-10-01 Afilias Limited +// pink : 2013-10-01 Identity Digital Limited pink // pioneer : 2015-07-16 Pioneer Corporation @@ -9408,7 +9402,7 @@ pnc // pohl : 2014-06-23 Deutsche Vermögensberatung Aktiengesellschaft DVAG pohl -// poker : 2014-07-03 Afilias Limited +// poker : 2014-07-03 Identity Digital Limited poker // politie : 2015-08-20 Politie Nederland @@ -9441,7 +9435,7 @@ prof // progressive : 2015-07-23 Progressive Casualty Insurance Company progressive -// promo : 2014-12-18 Afilias Limited +// promo : 2014-12-18 Identity Digital Limited promo // properties : 2013-12-05 Binky Moon, LLC @@ -9495,7 +9489,7 @@ realty // recipes : 2013-10-17 Binky Moon, LLC recipes -// red : 2013-11-07 Afilias Limited +// red : 2013-11-07 Identity Digital Limited red // redstone : 2014-10-31 Redstone Haute Couture Co., Ltd. @@ -9744,7 +9738,7 @@ shell // shia : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti. shia -// shiksha : 2013-11-14 Afilias Limited +// shiksha : 2013-11-14 Identity Digital Limited shiksha // shoes : 2013-10-02 Binky Moon, LLC @@ -9777,7 +9771,7 @@ singles // site : 2015-01-15 Radix FZC site -// ski : 2015-04-09 Afilias Limited +// ski : 2015-04-09 Identity Digital Limited ski // skin : 2015-01-15 XYZ.COM LLC @@ -10218,7 +10212,7 @@ wanggou // watch : 2013-11-14 Binky Moon, LLC watch -// watches : 2014-12-22 Afilias Limited +// watches : 2014-12-22 Identity Digital Limited watches // weather : 2015-01-08 International Business Machines Corporation @@ -10353,7 +10347,7 @@ xin // xn--5tzm5g : 2014-12-22 Global Website TLD Asia Limited 网站 -// xn--6frz82g : 2013-09-23 Afilias Limited +// xn--6frz82g : 2013-09-23 Identity Digital Limited 移动 // xn--6qq986b3xl : 2013-09-13 Tycoon Treasure Limited @@ -10660,6 +10654,10 @@ graphox.us // Submitted by accesso Team *.devcdnaccesso.com +// Acorn Labs : https://acorn.io +// Submitted by Craig Jellick +*.on-acorn.io + // Adobe : https://www.adobe.com/ // Submitted by Ian Boston and Lars Trieloff adobeaemcloud.com @@ -10704,51 +10702,49 @@ altervista.org // Submitted by Cyril alwaysdata.net -// Amazon CloudFront : https://aws.amazon.com/cloudfront/ +// Amazon : https://www.amazon.com/ +// Submitted by AWS Security +// Subsections of Amazon/subsidiaries will appear until "concludes" tag + +// Amazon CloudFront // Submitted by Donavan Miller +// Reference: 54144616-fd49-4435-8535-19c6a601bdb3 cloudfront.net -// Amazon Elastic Compute Cloud : https://aws.amazon.com/ec2/ +// Amazon EC2 // Submitted by Luke Wells +// Reference: 4c38fa71-58ac-4768-99e5-689c1767e537 *.compute.amazonaws.com *.compute-1.amazonaws.com *.compute.amazonaws.com.cn us-east-1.amazonaws.com -// Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/ -// Submitted by Luke Wells -cn-north-1.eb.amazonaws.com.cn -cn-northwest-1.eb.amazonaws.com.cn -elasticbeanstalk.com -ap-northeast-1.elasticbeanstalk.com -ap-northeast-2.elasticbeanstalk.com -ap-northeast-3.elasticbeanstalk.com -ap-south-1.elasticbeanstalk.com -ap-southeast-1.elasticbeanstalk.com -ap-southeast-2.elasticbeanstalk.com -ca-central-1.elasticbeanstalk.com -eu-central-1.elasticbeanstalk.com -eu-west-1.elasticbeanstalk.com -eu-west-2.elasticbeanstalk.com -eu-west-3.elasticbeanstalk.com -sa-east-1.elasticbeanstalk.com -us-east-1.elasticbeanstalk.com -us-east-2.elasticbeanstalk.com -us-gov-west-1.elasticbeanstalk.com -us-west-1.elasticbeanstalk.com -us-west-2.elasticbeanstalk.com - -// Amazon Elastic Load Balancing : https://aws.amazon.com/elasticloadbalancing/ -// Submitted by Luke Wells -*.elb.amazonaws.com -*.elb.amazonaws.com.cn - -// Amazon Global Accelerator : https://aws.amazon.com/global-accelerator/ -// Submitted by Daniel Massaguer -awsglobalaccelerator.com - -// Amazon S3 : https://aws.amazon.com/s3/ +// Amazon S3 // Submitted by Luke Wells +// Reference: d068bd97-f0a9-4838-a6d8-954b622ef4ae +s3.cn-north-1.amazonaws.com.cn +s3.dualstack.ap-northeast-1.amazonaws.com +s3.dualstack.ap-northeast-2.amazonaws.com +s3.ap-northeast-2.amazonaws.com +s3-website.ap-northeast-2.amazonaws.com +s3.dualstack.ap-south-1.amazonaws.com +s3.ap-south-1.amazonaws.com +s3-website.ap-south-1.amazonaws.com +s3.dualstack.ap-southeast-1.amazonaws.com +s3.dualstack.ap-southeast-2.amazonaws.com +s3.dualstack.ca-central-1.amazonaws.com +s3.ca-central-1.amazonaws.com +s3-website.ca-central-1.amazonaws.com +s3.dualstack.eu-central-1.amazonaws.com +s3.eu-central-1.amazonaws.com +s3-website.eu-central-1.amazonaws.com +s3.dualstack.eu-west-1.amazonaws.com +s3.dualstack.eu-west-2.amazonaws.com +s3.eu-west-2.amazonaws.com +s3-website.eu-west-2.amazonaws.com +s3.dualstack.eu-west-3.amazonaws.com +s3.eu-west-3.amazonaws.com +s3-website.eu-west-3.amazonaws.com s3.amazonaws.com s3-ap-northeast-1.amazonaws.com s3-ap-northeast-2.amazonaws.com @@ -10763,48 +10759,25 @@ s3-eu-west-3.amazonaws.com s3-external-1.amazonaws.com s3-fips-us-gov-west-1.amazonaws.com s3-sa-east-1.amazonaws.com -s3-us-gov-west-1.amazonaws.com s3-us-east-2.amazonaws.com +s3-us-gov-west-1.amazonaws.com s3-us-west-1.amazonaws.com s3-us-west-2.amazonaws.com -s3.ap-northeast-2.amazonaws.com -s3.ap-south-1.amazonaws.com -s3.cn-north-1.amazonaws.com.cn -s3.ca-central-1.amazonaws.com -s3.eu-central-1.amazonaws.com -s3.eu-west-2.amazonaws.com -s3.eu-west-3.amazonaws.com -s3.us-east-2.amazonaws.com -s3.dualstack.ap-northeast-1.amazonaws.com -s3.dualstack.ap-northeast-2.amazonaws.com -s3.dualstack.ap-south-1.amazonaws.com -s3.dualstack.ap-southeast-1.amazonaws.com -s3.dualstack.ap-southeast-2.amazonaws.com -s3.dualstack.ca-central-1.amazonaws.com -s3.dualstack.eu-central-1.amazonaws.com -s3.dualstack.eu-west-1.amazonaws.com -s3.dualstack.eu-west-2.amazonaws.com -s3.dualstack.eu-west-3.amazonaws.com -s3.dualstack.sa-east-1.amazonaws.com -s3.dualstack.us-east-1.amazonaws.com -s3.dualstack.us-east-2.amazonaws.com -s3-website-us-east-1.amazonaws.com -s3-website-us-west-1.amazonaws.com -s3-website-us-west-2.amazonaws.com s3-website-ap-northeast-1.amazonaws.com s3-website-ap-southeast-1.amazonaws.com s3-website-ap-southeast-2.amazonaws.com s3-website-eu-west-1.amazonaws.com s3-website-sa-east-1.amazonaws.com -s3-website.ap-northeast-2.amazonaws.com -s3-website.ap-south-1.amazonaws.com -s3-website.ca-central-1.amazonaws.com -s3-website.eu-central-1.amazonaws.com -s3-website.eu-west-2.amazonaws.com -s3-website.eu-west-3.amazonaws.com +s3-website-us-east-1.amazonaws.com +s3-website-us-west-1.amazonaws.com +s3-website-us-west-2.amazonaws.com +s3.dualstack.sa-east-1.amazonaws.com +s3.dualstack.us-east-1.amazonaws.com +s3.dualstack.us-east-2.amazonaws.com +s3.us-east-2.amazonaws.com s3-website.us-east-2.amazonaws.com -// AWS Cloud9 : https://aws.amazon.com/cloud9/ +// AWS Cloud9 // Submitted by: AWS Security // Reference: 2b6dfa9a-3a7f-4367-b2e7-0321e77c0d59 vfs.cloud9.af-south-1.amazonaws.com @@ -10850,6 +10823,49 @@ webview-assets.cloud9.us-west-1.amazonaws.com vfs.cloud9.us-west-2.amazonaws.com webview-assets.cloud9.us-west-2.amazonaws.com +// AWS Elastic Beanstalk +// Submitted by Luke Wells +// Reference: aa202394-43a0-4857-b245-8db04549137e +cn-north-1.eb.amazonaws.com.cn +cn-northwest-1.eb.amazonaws.com.cn +elasticbeanstalk.com +ap-northeast-1.elasticbeanstalk.com +ap-northeast-2.elasticbeanstalk.com +ap-northeast-3.elasticbeanstalk.com +ap-south-1.elasticbeanstalk.com +ap-southeast-1.elasticbeanstalk.com +ap-southeast-2.elasticbeanstalk.com +ca-central-1.elasticbeanstalk.com +eu-central-1.elasticbeanstalk.com +eu-west-1.elasticbeanstalk.com +eu-west-2.elasticbeanstalk.com +eu-west-3.elasticbeanstalk.com +sa-east-1.elasticbeanstalk.com +us-east-1.elasticbeanstalk.com +us-east-2.elasticbeanstalk.com +us-gov-west-1.elasticbeanstalk.com +us-west-1.elasticbeanstalk.com +us-west-2.elasticbeanstalk.com + +// (AWS) Elastic Load Balancing +// Submitted by Luke Wells +// Reference: 12a3d528-1bac-4433-a359-a395867ffed2 +*.elb.amazonaws.com.cn +*.elb.amazonaws.com + +// AWS Global Accelerator +// Submitted by Daniel Massaguer +// Reference: d916759d-a08b-4241-b536-4db887383a6a +awsglobalaccelerator.com + +// eero +// Submitted by Yue Kang +// Reference: 264afe70-f62c-4c02-8ab9-b5281ed24461 +eero.online +eero-stage.online + +// concludes Amazon + // Amune : https://amune.org/ // Submitted by Team Amune t3l3p0rt.net @@ -11745,11 +11761,6 @@ e4.cz easypanel.app easypanel.host -// eero : https://eero.com/ -// Submitted by Yue Kang -eero.online -eero-stage.online - // Elementor : Elementor Ltd. // Submitted by Anton Barkan elementor.cloud @@ -11963,6 +11974,10 @@ a.ssl.fastly.net b.ssl.fastly.net global.ssl.fastly.net +// Fastmail : https://www.fastmail.com/ +// Submitted by Marc Bradshaw +*.user.fm + // FASTVPS EESTI OU : https://fastvps.ru/ // Submitted by Likhachev Vasiliy fastvps-server.com @@ -12973,25 +12988,6 @@ cust.retrosnub.co.uk // Submitted by Paulus Schoutsen ui.nabu.casa -// Names.of.London : https://names.of.london/ -// Submitted by James Stevens or -pony.club -of.fashion -in.london -of.london -from.marketing -with.marketing -for.men -repair.men -and.mom -for.mom -for.one -under.one -for.sale -that.win -from.work -to.work - // Net at Work Gmbh : https://www.netatwork.de // Submitted by Jan Jaeschke cloud.nospamproxy.com @@ -13188,7 +13184,26 @@ omniwe.site // One.com: https://www.one.com/ // Submitted by Jacob Bunk Nielsen +123hjemmeside.dk +123hjemmeside.no +123homepage.it +123kotisivu.fi +123minsida.se +123miweb.es +123paginaweb.pt +123sait.ru +123siteweb.fr +123webseite.at +123webseite.de +123website.be +123website.ch +123website.lu +123website.nl service.one +simplesite.com +simplesite.com.br +simplesite.gr +simplesite.pl // One Fold Media : http://www.onefoldmedia.com/ // Submitted by Eddie Jones @@ -13457,7 +13472,9 @@ app.render.com onrender.com // Repl.it : https://repl.it -// Submitted by Mason Clayton +// Submitted by Lincoln Bergeson +firewalledreplit.co +id.firewalledreplit.co repl.co id.repl.co repl.run commit ecdbf82cb920f0648b6398502091868bb1bf7829 Author: Po Lu Date: Tue Nov 1 12:51:38 2022 +0800 Fix leaks of XImage structures in image.c * src/image.c (image_clear_image, lookup_image): Fix coding style. (x_destroy_x_image): Remove unnecessary assertion. Call XDestroyImage, since otherwise only the image data is freed. (image_from_emacs_colors): Rename variables to make more sense. diff --git a/src/image.c b/src/image.c index 1e323ba66a..80b814cb1c 100644 --- a/src/image.c +++ b/src/image.c @@ -1843,7 +1843,9 @@ image_clear_image (struct frame *f, struct image *img) { block_input (); image_clear_image_1 (f, img, - CLEAR_IMAGE_PIXMAP | CLEAR_IMAGE_MASK | CLEAR_IMAGE_COLORS); + (CLEAR_IMAGE_PIXMAP + | CLEAR_IMAGE_MASK + | CLEAR_IMAGE_COLORS)); unblock_input (); } @@ -2980,7 +2982,8 @@ lookup_image (struct frame *f, Lisp_Object spec, int face_id) unblock_input (); } - /* We're using IMG, so set its timestamp to `now'. */ + /* IMG is now being used, so set its timestamp to the current + time. */ img->timestamp = current_timespec (); /* Value is the image id. */ @@ -3238,12 +3241,13 @@ x_create_x_image_and_pixmap (struct frame *f, int width, int height, int depth, static void x_destroy_x_image (XImage *ximg) { - eassert (input_blocked_p ()); if (ximg) { xfree (ximg->data); ximg->data = NULL; } + + XDestroyImage (ximg); } # if !defined USE_CAIRO && defined HAVE_XRENDER @@ -6224,26 +6228,28 @@ static void image_from_emacs_colors (struct frame *f, struct image *img, Emacs_Color *colors) { int x, y; - Emacs_Pix_Container oimg = NULL; + Emacs_Pix_Container ximage; Emacs_Color *p; + ximage = NULL; + init_color_table (); image_clear_image_1 (f, img, CLEAR_IMAGE_PIXMAP | CLEAR_IMAGE_COLORS); image_create_x_image_and_pixmap (f, img, img->width, img->height, 0, - &oimg, 0); + &ximage, 0); p = colors; for (y = 0; y < img->height; ++y) for (x = 0; x < img->width; ++x, ++p) { unsigned long pixel; pixel = lookup_rgb_color (f, p->red, p->green, p->blue); - PUT_PIXEL (oimg, x, y, pixel); + PUT_PIXEL (ximage, x, y, pixel); } xfree (colors); - image_put_x_image (f, img, oimg, 0); + image_put_x_image (f, img, ximage, false); #ifdef COLOR_TABLE_SUPPORT img->colors = colors_in_color_table (&img->ncolors); free_color_table (); commit a7ded19ffce57bf8b475aeb28fbfa72e91f4d4d9 Author: Stefan Kangas Date: Tue Nov 1 05:07:50 2022 +0100 ; Auto-commit of loaddefs files. diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index b992846b0b..c754e72354 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -3924,18 +3924,6 @@ See the documentation of `define-ccl-program' for the detail of CCL program. (fn CCL-PROG &rest ARGS)") (register-definition-prefixes "ccl" '("ccl-")) - -;;; Generated autoloads from emacs-lisp/cconv.el - -(autoload 'cconv-closure-convert "cconv" "\ -Main entry point for closure conversion. -FORM is a piece of Elisp code after macroexpansion. - -Returns a form where all lambdas don't have any free variables. - -(fn FORM)") -(register-definition-prefixes "cconv" '("cconv-")) - ;;; Generated autoloads from cdl.el @@ -4959,6 +4947,8 @@ evaluate `compilation-shell-minor-mode'. The mode's hook is called both when the mode is enabled and when it is disabled. +\\{compilation-shell-minor-mode-map} + (fn &optional ARG)" t) (autoload 'compilation-minor-mode "compile" "\ Toggle Compilation minor mode. @@ -4982,6 +4972,8 @@ evaluate `compilation-minor-mode'. The mode's hook is called both when the mode is enabled and when it is disabled. +\\{compilation-minor-mode-map} + (fn &optional ARG)" t) (autoload 'compilation-next-error-function "compile" "\ Advance to the next error message and visit the file where the error was. @@ -8366,7 +8358,7 @@ A second call of this function without changing point inserts the next match. A call with prefix PREFIX reads the symbol to insert from the minibuffer with completion. -(fn PREFIX)" '("P")) +(fn PREFIX)" t) (autoload 'ebrowse-tags-loop-continue "ebrowse" "\ Repeat last operation on files in tree. FIRST-TIME non-nil means this is not a repetition, but the first time. @@ -8975,6 +8967,55 @@ Turn on EDT Emulation." t) (register-definition-prefixes "edt-vt100" '("edt-set-term-width-")) + +;;; Generated autoloads from progmodes/eglot.el + +(push (purecopy '(eglot 1 9)) package--builtin-versions) +(autoload 'eglot "eglot" "\ +Start LSP server in support of PROJECT's buffers under MANAGED-MAJOR-MODE. + +This starts a Language Server Protocol (LSP) server suitable for the +buffers of PROJECT whose `major-mode' is MANAGED-MAJOR-MODE. +CLASS is the class of the LSP server to start and CONTACT specifies +how to connect to the server. + +Interactively, the command attempts to guess MANAGED-MAJOR-MODE +from the current buffer's `major-mode', CLASS and CONTACT from +`eglot-server-programs' looked up by the major mode, and PROJECT from +`project-find-functions'. The search for active projects in this +context binds `eglot-lsp-context' (which see). + +If it can't guess, it prompts the user for the mode and the server. +With a single \\[universal-argument] prefix arg, it always prompts for COMMAND. +With two \\[universal-argument], it also always prompts for MANAGED-MAJOR-MODE. + +The LSP server of CLASS is started (or contacted) via CONTACT. +If this operation is successful, current *and future* file +buffers of MANAGED-MAJOR-MODE inside PROJECT become \"managed\" +by the LSP server, meaning the information about their contents is +exchanged periodically with the server to provide enhanced +code-analysis via `xref-find-definitions', `flymake-mode', +`eldoc-mode', and `completion-at-point', among others. + +PROJECT is a project object as returned by `project-current'. + +CLASS is a subclass of `eglot-lsp-server'. + +CONTACT specifies how to contact the server. It is a +keyword-value plist used to initialize CLASS or a plain list as +described in `eglot-server-programs', which see. + +LANGUAGE-ID is the language ID string to send to the server for +MANAGED-MAJOR-MODE, which matters to a minority of servers. + +INTERACTIVE is t if called interactively. + +(fn MANAGED-MAJOR-MODE PROJECT CLASS CONTACT LANGUAGE-ID &optional INTERACTIVE)" t) +(autoload 'eglot-ensure "eglot" "\ +Start Eglot session for current buffer if there isn't one.") +(put 'eglot-workspace-configuration 'safe-local-variable 'listp) +(register-definition-prefixes "eglot" '("eglot-")) + ;;; Generated autoloads from ehelp.el @@ -9915,7 +9956,7 @@ When present, ID should be an opaque object used to identify the connection unequivocally. This is rarely needed and not available interactively. -(fn &key (SERVER (erc-compute-server)) (PORT (erc-compute-port)) (NICK (erc-compute-nick)) (USER (erc-compute-user)) PASSWORD (FULL-NAME (erc-compute-full-name)) ID)" '((erc-select-read-args))) +(fn &key (SERVER (erc-compute-server)) (PORT (erc-compute-port)) (NICK (erc-compute-nick)) (USER (erc-compute-user)) PASSWORD (FULL-NAME (erc-compute-full-name)) ID)" t) (defalias 'erc-select #'erc) (autoload 'erc-tls "erc" "\ ERC is a powerful, modular, and extensible IRC client. @@ -9962,7 +10003,7 @@ symbol composed of letters from the Latin alphabet.) This option is generally unneeded, however. See info node `(erc) Connecting' for use cases. Not available interactively. -(fn &key (SERVER (erc-compute-server)) (PORT (erc-compute-port)) (NICK (erc-compute-nick)) (USER (erc-compute-user)) PASSWORD (FULL-NAME (erc-compute-full-name)) CLIENT-CERTIFICATE ID)" '((let ((erc-default-port erc-default-port-tls)) (erc-select-read-args)))) +(fn &key (SERVER (erc-compute-server)) (PORT (erc-compute-port)) (NICK (erc-compute-nick)) (USER (erc-compute-user)) PASSWORD (FULL-NAME (erc-compute-full-name)) CLIENT-CERTIFICATE ID)" t) (autoload 'erc-handle-irc-url "erc" "\ Use ERC to IRC on HOST:PORT in CHANNEL as USER with PASSWORD. If ERC is already connected to HOST:PORT, simply /join CHANNEL. @@ -10178,7 +10219,9 @@ it has to be wrapped in `(eval (quote ...))'. If NAME is already defined as a test and Emacs is running in batch mode, an error is signalled. -(fn NAME () [DOCSTRING] [:expected-result RESULT-TYPE] [:tags \\='(TAG...)] BODY...)" nil 'macro) +(fn NAME () [DOCSTRING] [:expected-result RESULT-TYPE] [:tags \\='(TAG...)] BODY...)" nil t) +(function-put 'ert-deftest 'doc-string-elt 3) +(function-put 'ert-deftest 'lisp-indent-function 2) (autoload 'ert-run-tests-batch "ert" "\ Run the tests specified by SELECTOR, printing results to the terminal. @@ -12292,6 +12335,8 @@ evaluate `flymake-mode'. The mode's hook is called both when the mode is enabled and when it is disabled. +\\{flymake-mode-map} + (fn &optional ARG)" t) (autoload 'flymake-mode-on "flymake" "\ Turn Flymake mode on.") @@ -14396,7 +14441,12 @@ Run gdb passing it COMMAND-LINE as arguments. If COMMAND-LINE names a program FILE to debug, gdb will run in a buffer named *gud-FILE*, and the directory containing FILE becomes the initial working directory and source-file directory -for your debugger. +for your debugger. If you don't want `default-directory' to +change to the directory of FILE, specify FILE without leading +directories, in which case FILE should reside either in the +directory of the buffer from which this command is invoked, or +it can be found by searching PATH. + If COMMAND-LINE requests that gdb attaches to a process PID, gdb will run in *gud-PID*, otherwise it will run in *gud*; in these cases the initial working directory is the `default-directory' of @@ -15917,7 +15967,8 @@ inlined into the compiled format versions. This means that if you change its definition, you should explicitly call `ibuffer-recompile-formats'. -(fn SYMBOL (&key NAME INLINE PROPS SUMMARIZER) &rest BODY)" nil 'macro) +(fn SYMBOL (&key NAME INLINE PROPS SUMMARIZER) &rest BODY)" nil t) +(function-put 'define-ibuffer-column 'lisp-indent-function 'defun) (autoload 'define-ibuffer-sorter "ibuf-macs" "\ Define a method of sorting named NAME. DOCUMENTATION is the documentation of the function, which will be called @@ -15928,7 +15979,9 @@ For sorting, the forms in BODY will be evaluated with `a' bound to one buffer object, and `b' bound to another. BODY should return a non-nil value if and only if `a' is \"less than\" `b'. -(fn NAME DOCUMENTATION (&key DESCRIPTION) &rest BODY)" nil 'macro) +(fn NAME DOCUMENTATION (&key DESCRIPTION) &rest BODY)" nil t) +(function-put 'define-ibuffer-sorter 'lisp-indent-function 1) +(function-put 'define-ibuffer-sorter 'doc-string-elt 2) (autoload 'define-ibuffer-op "ibuf-macs" "\ Generate a function which operates on a buffer. OP becomes the name of the function; if it doesn't begin with @@ -15967,7 +16020,9 @@ BODY define the operation; they are forms to evaluate per each marked buffer. BODY is evaluated with `buf' bound to the buffer object. -(fn OP ARGS DOCUMENTATION (&key INTERACTIVE MARK MODIFIER-P DANGEROUS OPSTRING ACTIVE-OPSTRING BEFORE AFTER COMPLEX) &rest BODY)" nil 'macro) +(fn OP ARGS DOCUMENTATION (&key INTERACTIVE MARK MODIFIER-P DANGEROUS OPSTRING ACTIVE-OPSTRING BEFORE AFTER COMPLEX) &rest BODY)" nil t) +(function-put 'define-ibuffer-op 'lisp-indent-function 2) +(function-put 'define-ibuffer-op 'doc-string-elt 3) (autoload 'define-ibuffer-filter "ibuf-macs" "\ Define a filter named NAME. DOCUMENTATION is the documentation of the function. @@ -15982,7 +16037,9 @@ not a particular buffer should be displayed or not. The forms in BODY will be evaluated with BUF bound to the buffer object, and QUALIFIER bound to the current value of the filter. -(fn NAME DOCUMENTATION (&key READER DESCRIPTION) &rest BODY)" nil 'macro) +(fn NAME DOCUMENTATION (&key READER DESCRIPTION) &rest BODY)" nil t) +(function-put 'define-ibuffer-filter 'lisp-indent-function 2) +(function-put 'define-ibuffer-filter 'doc-string-elt 2) (register-definition-prefixes "ibuf-macs" '("ibuffer-")) @@ -17401,7 +17458,7 @@ Convert old Emacs Devanagari characters to UCS. ;;; Generated autoloads from leim/quail/indian.el -(register-definition-prefixes "quail/indian" '("indian-mlm-mozhi-u" "inscript-" "quail-" "tamil-")) +(register-definition-prefixes "quail/indian" '("indian-mlm-mozhi-u" "inscript-" "quail-" "tamil")) ;;; Generated autoloads from progmodes/inf-lisp.el @@ -19555,7 +19612,7 @@ Populate MENU with commands that open a man page at point. ;;; Generated autoloads from emacs-lisp/map.el -(push (purecopy '(map 3 2 1)) package--builtin-versions) +(push (purecopy '(map 3 3 1)) package--builtin-versions) (register-definition-prefixes "map" '("map-")) @@ -25621,6 +25678,8 @@ evaluate `rectangle-mark-mode'. The mode's hook is called both when the mode is enabled and when it is disabled. +\\{rectangle-mark-mode-map} + (fn &optional ARG)" t) (register-definition-prefixes "rect" '("apply-on-rectangle" "clear-rectangle-line" "delete-" "extract-rectangle-" "killed-rectangle" "ope" "rectangle-" "spaces-string" "string-rectangle-")) @@ -26500,7 +26559,7 @@ Emacs will list the message in the summary. (fn REGEXP)" t) (autoload 'rmail-summary-by-topic "rmailsum" "\ Display a summary of all messages with the given SUBJECT. -Normally checks just the Subject field of headers; but with prefix +Normally checks just the Subject field of headers; but when prefix argument WHOLE-MESSAGE is non-nil, looks in the whole message. SUBJECT is a regular expression. @@ -33026,7 +33085,7 @@ Like `message', but do nothing if `url-show-status' is nil. (fn X Y)") -(defalias 'url-basepath 'url-file-directory) +(defalias 'url-basepath #'url-file-directory) (autoload 'url-file-directory "url-util" "\ Return the directory part of FILE, for a URL. commit 4cc32937c06f7dd66da025fdb98369f456f1af0a Author: Stephen Leake Date: Mon Oct 31 17:30:02 2022 -0700 Fix eglot-shutdown-all: Match current eglot-shutdown signature diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index c587061837..0a0d73eb6d 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -877,7 +877,7 @@ SERVER." PRESERVE-BUFFERS as in `eglot-shutdown', which see." (interactive (list current-prefix-arg)) (cl-loop for ss being the hash-values of eglot--servers-by-project - do (cl-loop for s in ss do (eglot-shutdown s nil preserve-buffers)))) + do (cl-loop for s in ss do (eglot-shutdown s nil nil preserve-buffers)))) (defun eglot--on-shutdown (server) "Called by jsonrpc.el when SERVER is already dead." commit b7a76f288cc9d3a962cd5790203dc89303e81c97 Author: Michael Albinus Date: Mon Oct 31 16:48:15 2022 +0100 Fix tramp-handle-file-newer-than-file-p * lisp/net/tramp.el (tramp-handle-file-newer-than-file-p): Don't use fractions of seconds. (Bug#58842) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 63f313dc50..9552e51c48 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -3997,6 +3997,17 @@ Let-bind it when necessary.") (cond ((not (file-exists-p file1)) nil) ((not (file-exists-p file2)) t) + ;; Tramp reads and writes timestamps on second level. So we round + ;; the timestamps to seconds w/o fractions. + ;; `time-convert' has been introduced with Emacs 27.1. + ((fboundp 'time-convert) + (time-less-p + (tramp-compat-funcall + 'time-convert + (file-attribute-modification-time (file-attributes file2)) 'integer) + (tramp-compat-funcall + 'time-convert + (file-attribute-modification-time (file-attributes file1)) 'integer))) (t (time-less-p (file-attribute-modification-time (file-attributes file2)) (file-attribute-modification-time (file-attributes file1)))))) commit 3b555dc91d21476fa4384f17188661ef2bd3c4e5 Author: Stefan Kangas Date: Mon Oct 31 16:42:26 2022 +0100 Prefer defvar-keymap in cus-edit.el * lisp/cus-edit.el (custom-mode-map, custom-mode-link-map): Prefer defvar-keymap. diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index e043d9bc17..00ee9504c2 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -1,7 +1,7 @@ ;;; cus-edit.el --- tools for customizing Emacs and Lisp packages -*- lexical-binding:t -*- -;; -;; Copyright (C) 1996-1997, 1999-2022 Free Software Foundation, Inc. -;; + +;; Copyright (C) 1996-2022 Free Software Foundation, Inc. + ;; Author: Per Abrahamsen ;; Maintainer: emacs-devel@gnu.org ;; Keywords: help, faces @@ -23,7 +23,7 @@ ;; along with GNU Emacs. If not, see . ;;; Commentary: -;; + ;; This file implements the code to create and edit customize buffers. ;; ;; See `custom.el'. @@ -428,32 +428,30 @@ Use group `text' for this instead. This group is deprecated." ;;; Custom mode keymaps -(defvar custom-mode-map - (let ((map (make-keymap))) - (set-keymap-parent map widget-keymap) - (define-key map [remap self-insert-command] 'Custom-no-edit) - (define-key map "\^m" 'Custom-newline) - (define-key map " " 'scroll-up-command) - (define-key map [?\S-\ ] 'scroll-down-command) - (define-key map "\177" 'scroll-down-command) - (define-key map "\C-c\C-c" 'Custom-set) - (define-key map "\C-x\C-s" 'Custom-save) - (define-key map "q" 'Custom-buffer-done) - (define-key map "u" 'Custom-goto-parent) - (define-key map "n" 'widget-forward) - (define-key map "p" 'widget-backward) - (define-key map "H" 'custom-toggle-hide-all-widgets) - map) - "Keymap for `Custom-mode'.") - -(defvar custom-mode-link-map - (let ((map (make-keymap))) - (set-keymap-parent map custom-mode-map) - (define-key map [down-mouse-2] nil) - (define-key map [down-mouse-1] 'mouse-drag-region) - (define-key map [mouse-2] 'widget-move-and-invoke) - map) - "Local keymap for links in `Custom-mode'.") +(defvar-keymap custom-mode-map + :doc "Keymap for `Custom-mode'." + :full t + :parent widget-keymap + " " #'Custom-no-edit + "RET" #'Custom-newline + "SPC" #'scroll-up-command + "S-SPC" #'scroll-down-command + "DEL" #'scroll-down-command + "C-c C-c" #'Custom-set + "C-x C-s" #'Custom-save + "q" #'Custom-buffer-done + "u" #'Custom-goto-parent + "n" #'widget-forward + "p" #'widget-backward + "H" #'custom-toggle-hide-all-widgets) + +(defvar-keymap custom-mode-link-map + :doc "Local keymap for links in `Custom-mode'." + :full t + :parent custom-mode-map + "" nil + "" #'mouse-drag-region + "" #'widget-move-and-invoke) (defvar custom-field-keymap (let ((map (copy-keymap widget-field-keymap))) commit b250f89e63a135e04e61d66e1a83ff6d3c609e2c Author: Stefan Kangas Date: Mon Oct 31 15:28:36 2022 +0100 * lisp/emacs-lisp/multisession.el: Add Commentary. (Bug#58845) diff --git a/lisp/emacs-lisp/multisession.el b/lisp/emacs-lisp/multisession.el index d6f1ab98fa..9d6e8c0d88 100644 --- a/lisp/emacs-lisp/multisession.el +++ b/lisp/emacs-lisp/multisession.el @@ -19,7 +19,18 @@ ;;; Commentary: +;; This library provides multisession variables for Emacs Lisp, to +;; make them persist between sessions. ;; +;; Use `define-multisession-variable' to define a multisession +;; variable, and `multisession-value' to read its value. Use +;; `list-multisession-values' to list multisession variables. +;; +;; Users might want to customize `multisession-storage' and +;; `multisession-directory'. +;; +;; See Info node `(elisp) Multisession Variables' for more +;; information. ;;; Code: commit 20d9b4023571a0a34565a0dc326533224bd8e6dd Author: Stefan Kangas Date: Mon Oct 31 15:19:32 2022 +0100 * lisp/vcursor.el (vcursor-map): Prefer defvar-keymap. diff --git a/lisp/vcursor.el b/lisp/vcursor.el index e7dd1ba715..896df91983 100644 --- a/lisp/vcursor.el +++ b/lisp/vcursor.el @@ -1,7 +1,6 @@ ;;; vcursor.el --- manipulate an alternative ("virtual") cursor -*- lexical-binding: t; -*- -;; Copyright (C) 1994, 1996, 1998, 2001-2022 Free Software Foundation, -;; Inc. +;; Copyright (C) 1994-2022 Free Software Foundation, Inc. ;; Author: Peter Stephenson ;; Maintainer: emacs-devel@gnu.org @@ -39,7 +38,7 @@ ;; off after any operation not involving the vcursor, but the ;; vcursor itself will be left alone. ;; - works on dumb terminals -;; - new keymap vcursor-map for binding to a prefix key +;; - new keymap `vcursor-map' for binding to a prefix key ;; - `vcursor-compare-windows' substantially improved ;; - `vcursor-execute-{key,command}' much better about using the ;; right keymaps and arranging for the correct windows to be used @@ -339,8 +338,6 @@ disable the vcursor." (cons 'meta key) key)))) -;; (defvar vcursor) - (defun vcursor-bind-keys (var value) "Alter the value of the variable VAR to VALUE, binding keys as required. VAR is usually `vcursor-key-bindings'. Normally this function is called @@ -468,38 +465,36 @@ scrolling set this. It is used by the `vcursor-auto-disable' code.") (defvar vcursor-temp-goal-column nil "Keeps track of temporary goal columns for the virtual cursor.") -(defvar vcursor-map - (let ((map (make-sparse-keymap))) - (define-key map "t" #'vcursor-use-vcursor-map) - - (define-key map "\C-p" #'vcursor-previous-line) - (define-key map "\C-n" #'vcursor-next-line) - (define-key map "\C-b" #'vcursor-backward-char) - (define-key map "\C-f" #'vcursor-forward-char) - - (define-key map "\r" #'vcursor-disable) - (define-key map " " #'vcursor-copy) - (define-key map "\C-y" #'vcursor-copy-word) - (define-key map "\C-i" #'vcursor-toggle-copy) - (define-key map "<" #'vcursor-beginning-of-buffer) - (define-key map ">" #'vcursor-end-of-buffer) - (define-key map "\M-v" #'vcursor-scroll-down) - (define-key map "\C-v" #'vcursor-scroll-up) - (define-key map "o" #'vcursor-other-window) - (define-key map "g" #'vcursor-goto) - (define-key map "x" #'vcursor-swap-point) - (define-key map "\C-s" #'vcursor-isearch-forward) - (define-key map "\C-r" #'vcursor-isearch-backward) - (define-key map "\C-a" #'vcursor-beginning-of-line) - (define-key map "\C-e" #'vcursor-end-of-line) - (define-key map "\M-w" #'vcursor-forward-word) - (define-key map "\M-b" #'vcursor-backward-word) - (define-key map "\M-l" #'vcursor-copy-line) - (define-key map "c" #'vcursor-compare-windows) - (define-key map "k" #'vcursor-execute-key) - (define-key map "\M-x" #'vcursor-execute-command) - map) - "Keymap for vcursor command.") +(defvar-keymap vcursor-map + :doc "Keymap for vcursor command." + "t" #'vcursor-use-vcursor-map + + "C-p" #'vcursor-previous-line + "C-n" #'vcursor-next-line + "C-b" #'vcursor-backward-char + "C-f" #'vcursor-forward-char + + "RET" #'vcursor-disable + "SPC" #'vcursor-copy + "C-y" #'vcursor-copy-word + "C-i" #'vcursor-toggle-copy + "<" #'vcursor-beginning-of-buffer + ">" #'vcursor-end-of-buffer + "M-v" #'vcursor-scroll-down + "C-v" #'vcursor-scroll-up + "o" #'vcursor-other-window + "g" #'vcursor-goto + "x" #'vcursor-swap-point + "C-s" #'vcursor-isearch-forward + "C-r" #'vcursor-isearch-backward + "C-a" #'vcursor-beginning-of-line + "C-e" #'vcursor-end-of-line + "M-w" #'vcursor-forward-word + "M-b" #'vcursor-backward-word + "M-l" #'vcursor-copy-line + "c" #'vcursor-compare-windows + "k" #'vcursor-execute-key + "M-x" #'vcursor-execute-command) ;; This seems unused, but it was done as part of define-prefix-command, ;; so let's keep it for now. (fset 'vcursor-map vcursor-map) @@ -515,7 +510,6 @@ scrolling set this. It is used by the `vcursor-auto-disable' code.") If that's disabled, don't go anywhere but don't complain." ;; This is where we go off-mass-shell. Assume there is a ;; save-excursion to get us back to the pole, er, point. - (and (overlayp vcursor-overlay) (overlay-buffer vcursor-overlay) (set-buffer (overlay-buffer vcursor-overlay)) @@ -538,7 +532,6 @@ always considered, and the value of `pop-up-frames' is always respected). Returns nil if the virtual cursor is not visible anywhere suitable. Set `vcursor-window' to the returned value as a side effect." - ;; The order of priorities (respecting NOT-THIS) is (1) ;; vcursor-window if the virtual cursor is visible there (2) any ;; window displaying the virtual cursor (3) vcursor-window provided @@ -547,7 +540,6 @@ Set `vcursor-window' to the returned value as a side effect." ;; buffer (5) with NEW-WIN, a window selected by display-buffer (so ;; the variables pop-up-windows and pop-up-frames are significant) ;; (6) nil. - (let ((thiswin (selected-window)) winok winbuf) (save-excursion (vcursor-locate) @@ -652,7 +644,6 @@ This is called by most of the virtual-cursor motion commands." If the virtual cursor is (or was recently) visible in another window, switch to that first. Without a prefix ARG, disable the virtual cursor as well." - (interactive "P") (and (vcursor-find-window) (select-window vcursor-window)) (let ((buf (and vcursor-overlay (overlay-buffer vcursor-overlay)))) @@ -667,7 +658,6 @@ cursor as well." The virtual cursor window becomes the selected window and the old window becomes the virtual cursor window. If the virtual cursor would not be visible otherwise, display it in another window." - (interactive) (let ((buf (current-buffer)) (here (point)) (win (selected-window))) (vcursor-goto) ; will disable the vcursor @@ -679,14 +669,12 @@ not be visible otherwise, display it in another window." (defun vcursor-scroll-up (&optional n) "Scroll up the vcursor window ARG lines or near full screen if none. The vcursor will always appear in an unselected window." - (interactive "P") (vcursor-window-funcall #'scroll-up n)) (defun vcursor-scroll-down (&optional n) "Scroll down the vcursor window ARG lines or near full screen if none. The vcursor will always appear in an unselected window." - (interactive "P") (vcursor-window-funcall #'scroll-down n)) @@ -694,7 +682,6 @@ The vcursor will always appear in an unselected window." "Perform forward incremental search in the virtual cursor window. The virtual cursor is moved to the resulting point; the ordinary cursor stays where it was." - (interactive "P") (vcursor-window-funcall #'isearch-forward rep norecurs) ) @@ -703,7 +690,6 @@ cursor stays where it was." "Perform backward incremental search in the virtual cursor window. The virtual cursor is moved to the resulting point; the ordinary cursor stays where it was." - (interactive "P") (vcursor-window-funcall #'isearch-backward rep norecurs) ) @@ -719,7 +705,6 @@ ARGS. In this case, a new window will not be created if the vcursor is visible in the current one." ;; that's to avoid messing up compatibility with old versions ;; by introducing a new argument, which would have to come before ARGS. - (vcursor-find-window (not (and (listp func) (vcursor-check t))) t) (save-excursion (let ((sw (selected-window)) text) @@ -751,7 +736,6 @@ is called. This is called by most of the virtual-cursor copying commands to find out how much to copy." - (vcursor-check) (with-current-buffer (overlay-buffer vcursor-overlay) (save-excursion @@ -792,7 +776,6 @@ active at the same point as the real cursor. Copying mode is always turned off: the next use of the vcursor will not copy text until you turn it on again." - (interactive "P") (if (overlayp vcursor-overlay) (progn @@ -1078,7 +1061,6 @@ With no argument, copy to the end of the current line. Behavior with regard to newlines is similar (but not identical) to `kill-line'; the main difference is that whitespace at the end of the line is treated like ordinary characters." - (interactive "P") (let* ((num (prefix-numeric-value arg)) (count (vcursor-get-char-count #'end-of-line num)))