commit 7d6f9753ade57821f5c409bcdeea700be8e53a74 (HEAD, refs/remotes/origin/master) Merge: c384ce0ff1 70ecdebc92 Author: Stefan Kangas Date: Thu Dec 1 16:54:53 2022 +0100 Merge from origin/emacs-29 70ecdebc92 ; Fix typos (don't abbreviate "with" or "without") a86ccb5f9d ; Fix recently added treesit documentation 2d5cf7329e ; * etc/NEWS: Fix wording and punctuation of recently adde... 61311d6862 ; Fix test failure on CI # Conflicts: # etc/NEWS commit c384ce0ff1414aa3d28ac9a13a842ba324b7c6a2 Merge: cd89b81ffd 0a5ede0149 Author: Stefan Kangas Date: Thu Dec 1 16:54:50 2022 +0100 ; Merge from origin/emacs-29 The following commit was skipped: 0a5ede0149 ; Auto-commit of loaddefs files. commit cd89b81ffdb860b4e5958fe242720942faaa2940 Merge: dd9459c464 91a9598baf Author: Stefan Kangas Date: Thu Dec 1 16:54:50 2022 +0100 Merge from origin/emacs-29 91a9598baf Update project docs and NEWS # Conflicts: # etc/NEWS commit dd9459c4648568546ce3618eb77abb4f07131fe4 Merge: 05e336278e b7b2455c5f Author: Stefan Kangas Date: Thu Dec 1 16:54:48 2022 +0100 ; Merge from origin/emacs-29 The following commit was skipped: b7b2455c5f Update publicsuffix.txt from upstream commit 70ecdebc92c879af90f2d25a2b751d1cc4f3f80d Author: Stefan Kangas Date: Thu Dec 1 16:36:09 2022 +0100 ; Fix typos (don't abbreviate "with" or "without") diff --git a/ChangeLog.2 b/ChangeLog.2 index 483dec2542..143be59c9e 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -23054,8 +23054,8 @@ Fix tests in file-notify-tests.el * test/automated/file-notify-tests.el: Remove Tramp declarations. - (file-notify-test00-availability): Print remote command w/o Tramp - internal functions. + (file-notify-test00-availability): Print remote command without + Tramp internal functions. (file-notify-test02-events, file-notify-test02-events-remote): Adapt docstring. (file-notify-test03-autorevert): Use `format-message' when diff --git a/ChangeLog.3 b/ChangeLog.3 index e7ad130d00..136a276b63 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -32685,7 +32685,7 @@ * test/README: Mention $EMACS_TEST_DIRECTORY. * test/lisp/image-tests.el (image-tests--emacs-images-directory): - Use `data-directory', for runs w/o of make. + Use `data-directory', for runs without of make. (image-type/from-filename): Check for `image-load-path'. 2021-03-16 Michael Albinus @@ -69072,7 +69072,7 @@ 2020-08-27 Tino Calancha - dired: Show broken/circular links w/ different face + dired: Show broken/circular links with different face * lisp/dired.el (dired-broken-symlink): New face. (dired-font-lock-keywords): @@ -143455,7 +143455,8 @@ 2018-12-28 Michael Albinus - * lisp/net/tramp-sh.el (tramp-set-remote-path): Handle platforms w/o getconf. + * lisp/net/tramp-sh.el (tramp-set-remote-path): Handle platforms + without getconf. 2018-12-27 Paul Eggert @@ -157203,7 +157204,7 @@ Fix file name completion in Tramp * lisp/net/tramp.el (tramp-handle-file-name-directory): Fix case - of localname starts w/o a slash. + of localname starts without a slash. * test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name): Extend test. @@ -177123,7 +177124,7 @@ Mention pcase as a fifth conditional form * doc/lispref/control.texi (Conditionals): ...here, - in first para, w/ xref to "Pattern-Matching Conditional". + in first para, with xref to "Pattern-Matching Conditional". 2018-05-27 Thien-Thi Nguyen @@ -192390,7 +192391,7 @@ 2017-08-06 Tino Calancha - Dired w/ eshell-ls: Handle shell wildcards in file name + Dired with eshell-ls: Handle shell wildcards in file name * lisp/eshell/em-ls.el (eshell-ls--insert-directory): Use eshell-extended-glob (Bug#27844). @@ -192767,7 +192768,7 @@ 2017-08-01 Tino Calancha - Insert subdir content if dir-or-list is a string w/o wildcards + Insert subdir content if dir-or-list is a string without wildcards * lisp/eshell/em-ls.el (eshell-ls--insert-directory): Append '("-d") into 'eshell-ls-dired-initial-args' @@ -206236,7 +206237,7 @@ 2017-03-03 Rolf Ade (tiny change) - sql-mode w/ sqlite: In-memory database + sql-mode with sqlite: In-memory database Enable the usage of an in-memory database. Prior to this, sql-mode w/ sqlite could only be used with file databases. @@ -211195,7 +211196,8 @@ 2017-01-03 Stefan Monnier - (cl-defstruct): Improve error message for slots w/o value (bug#25312) + (cl-defstruct): Improve error message for slots without value + (bug#25312) * lisp/emacs-lisp/cl-macs.el (cl-defstruct): Don't signal an error but emit a warning for those coders who forgot to put a default value in diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 10a1a18dd1..60955fd319 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -5419,7 +5419,7 @@ Other Display Specs @c We put all the '@code{(when ...)}' on one line to encourage @c makeinfo's end-of-sentence heuristics to DTRT. Previously, the dot -@c was at eol; the info file ended up w/ two spaces rendered after it. +@c was at eol; the info file ended up with two spaces rendered after it. You can make any display specification conditional. To do that, package it in another list of the form @code{(when @var{condition} . @var{spec})}. diff --git a/lib-src/ChangeLog.1 b/lib-src/ChangeLog.1 index 0829f50a56..c5988072e9 100644 --- a/lib-src/ChangeLog.1 +++ b/lib-src/ChangeLog.1 @@ -3661,7 +3661,7 @@ 2004-05-07 Thien-Thi Nguyen * b2m.c (GOOD, BAD): Delete macros. Throughout, - replace w/ `EXIT_SUCCESS' and `EXIT_FAILURE', respectively. + replace with `EXIT_SUCCESS' and `EXIT_FAILURE', respectively. (main): Use `EXIT_SUCCESS' or `EXIT_FAILURE' for return value. * etags.c: Likewise. diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index de73fe7f0a..7c080ea496 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 @@ -4788,7 +4788,7 @@ 2003-03-10 Thien-Thi Nguyen * progmodes/scheme.el (scheme-mode-syntax-table): - Construct w/o using `with-syntax-table'. + Construct without using `with-syntax-table'. 2003-03-10 John Paul Wallington diff --git a/lisp/ChangeLog.11 b/lisp/ChangeLog.11 index 53a83c638c..f16191e8b7 100644 --- a/lisp/ChangeLog.11 +++ b/lisp/ChangeLog.11 @@ -212,7 +212,7 @@ 2004-12-27 Richard M. Stallman * files.el (buffer-save-without-query): New var (buffer-local). - (save-some-buffers): Save those buffers first, w/o asking. + (save-some-buffers): Save those buffers first, without asking. * files.el (insert-directory-ls-version): New variable. (insert-directory): When ls returns an error, test the version @@ -491,7 +491,7 @@ instead of `direction'. Update callers. When `del-count' is non-nil, delete that many characters, otherwise `count' characters backwards. Insert the newly-replaced string `count' times. - (zone-fret): Handle chars w/ width greater than one. + (zone-fret): Handle chars with width greater than one. (zone-fall-through-ws): No longer take window width `ww'. Update callers. Add handling for `char-width' greater than one. (zone-pgm-drip): Update var holding window-end position every cycle. @@ -3584,7 +3584,8 @@ * startup.el (fancy-splash-tail, normal-splash-screen): Update copyright year. - * shadowfile.el (shadowfile-unload-hook): Set as variable w/ add-hook. + * shadowfile.el (shadowfile-unload-hook): Set as variable with + add-hook. * server.el (server-unload-hook): Set as a variable with add-hook. @@ -8939,7 +8940,7 @@ (compilation-skip-visited, compilation-context-lines): Declare :version when added to Emacs. (compilation-error-regexp-alist-alist): Extend caml and irix. - (compilation-setup): Fix if font-locked w/o font-lock-defaults. + (compilation-setup): Fix if font-locked without font-lock-defaults. (compilation-mode-font-lock-keywords): Temporarily undo line as function patch, which wasn't ready. diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 0796965a9b..ec58ffc173 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -24499,8 +24499,9 @@ is updated. * whitespace.el (whitespace-buffer-leading-cleanup): - Simplify w/ skip-chars-forward. - (whitespace-buffer-trailing-cleanup): Simplify w/ skip-chars-backward. + Simplify with skip-chars-forward. + (whitespace-buffer-trailing-cleanup): Simplify with + skip-chars-backward. * mail/rmail.el (rmail-only-expunge): Fix paren error. Unconditionally try to leave point at the same old place. @@ -31346,7 +31347,7 @@ * facemenu.el (list-colors-print): Print #RRGGBB in default face. Remove 1 space before #RRGGBB to not truncate it on terminal - windows w/o fringes. Remove 1 space between bg and fg examples + windows without fringes. Remove 1 space between bg and fg examples to get more space. (list-colors-duplicates): Replace `and' with `if' for `boundp' to avoid byte-compile warnings. diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14 index 8d8c611778..eae47fe198 100644 --- a/lisp/ChangeLog.14 +++ b/lisp/ChangeLog.14 @@ -20218,7 +20218,7 @@ 2008-02-12 Stefan Monnier * doc-view.el (doc-view-display): Change file arg to buffer arg, so it - works also for buffers w/o buffer-file-name. Update callers. + works also for buffers without buffer-file-name. Update callers. (doc-view-clone-buffer-hook): New fun. (doc-view-mode): Use it for indirect clones. Mark the overlays with the `doc-view' property so they can be recognized. diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16 index 7b57c014d2..1d7684be81 100644 --- a/lisp/ChangeLog.16 +++ b/lisp/ChangeLog.16 @@ -4871,7 +4871,8 @@ 2012-10-11 Stefan Monnier - * help-fns.el (describe-function-1): Handle autoloads w/o docstrings. + * help-fns.el (describe-function-1): Handle autoloads without + docstrings. * emacs-lisp/bytecomp.el (byte-compile-eval): Adjust to long-ago changes to the format of load-history. diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3 index e23226b844..46089685a3 100644 --- a/lisp/ChangeLog.3 +++ b/lisp/ChangeLog.3 @@ -4172,7 +4172,8 @@ (next-matching-history-element): Likewise. (minibuffer-history-search-history): New variable. - * simple.el (read-expression-map): New keymap, w/ lisp-complete-symbol. + * simple.el (read-expression-map): New keymap, with + lisp-complete-symbol. (eval-expression, edit-and-eval-command): Use read-expression-map. (repeat-complex-command): Likewise. diff --git a/lisp/ChangeLog.4 b/lisp/ChangeLog.4 index ea0502975e..ddea2a4e2f 100644 --- a/lisp/ChangeLog.4 +++ b/lisp/ChangeLog.4 @@ -7238,7 +7238,8 @@ * ispell.el (ispell-menu-map): Add missing quote in defalias. (ispell-window-configuration): Initialize to nil. - * vc-hooks.el (vc-rcs-status): Make work buffer's name start w/ space. + * vc-hooks.el (vc-rcs-status): Make work buffer's name start with + space. * simple.el (completion-setup-function): Insert the mouse help message only if non-nil `window-system'. diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6 index 27d522aaf2..8e07e5c36a 100644 --- a/lisp/ChangeLog.6 +++ b/lisp/ChangeLog.6 @@ -1915,7 +1915,7 @@ * menu-bar.el (menu-bar-tools-menu): Delete ediff-doc and eregistry items. - * help.el (describe-mode): Handle minor mode w/o mode line indicator. + * help.el (describe-mode): Handle minor mode without mode line indicator. * bibtex.el (bibtex-version): Variable deleted. (bibtex-submit-bug-report): Don't use that. diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 3220832454..91b8d47422 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -1175,7 +1175,7 @@ (speedbar-supported-extension-expressions): Add more extensions. (speedbar-add-supported-extension) (speedbar-add-ignored-path-regexp): Made interactive. - (speedbar-update-flag): Nil w/ no window system. + (speedbar-update-flag): Nil with no window system. (speedbar-file-key-map): Move some key bindings from `speedbar-key-map' to this map. (speedbar-make-specialized-keymap): New function. @@ -4223,7 +4223,8 @@ Do the right thing when nil is specified as criterion for activeness. Fix string used to report an invalid item. - * tmm.el (tmm-get-keymap): Handle new format menu item w/o cache. + * tmm.el (tmm-get-keymap): Handle new format menu item without + cache. (tmm-prompt): If reach an empty menu, get an error. 1998-04-20 Per Starbäck diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8 index a14d682192..3b6205bc60 100644 --- a/lisp/ChangeLog.8 +++ b/lisp/ChangeLog.8 @@ -117,7 +117,7 @@ overlays if they interfere. (compilation-find-file): Make intangible overlays tangible. - * progmodes/hideshow.el: Generally, synch w/ maintainer + * progmodes/hideshow.el: Generally, synch with maintainer version 5.9. (hs-show-hidden-short-form): Delete var; hard-code uses as `t'. @@ -6715,7 +6715,7 @@ * speedbar.el (speedbar-item-info-file-helper): Add optional arg of the file whose info we want to display. - (speedbar-easymenu-definition-trailer) Fix list issue w/ customize. + (speedbar-easymenu-definition-trailer) Fix list issue with customize. (speedbar-add-mode-functions-list) Improve doc. (speedbar-line-token) New function. (speedbar-dired) Fix order of directories in -shown-directories. @@ -9800,8 +9800,8 @@ 1998-08-27 Richard Stallman * calendar/cal-tex.el (cal-tex-cursor-filofax-daily): Don't use oddp. - * calendar/appt.el (appt-check): Start the appt-mode-string w/ space. - Clear appt-mode-string if we don't put something in it. + * calendar/appt.el (appt-check): Start the appt-mode-string with + space. Clear appt-mode-string if we don't put something in it. 1998-08-27 Dave Love @@ -9979,7 +9979,8 @@ (speedbar-mode): Set buffer to read only. (speedbar-temp-buffer-show-function): For Emacs don't call hook with arguments. - (speedbar-stealthy-updates): Do all updates w/ the buffer writable. + (speedbar-stealthy-updates): Do all updates with the buffer + writable. 1998-08-19 Dan Nicolaescu diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9 index 469d0970f8..be6ba962cf 100644 --- a/lisp/ChangeLog.9 +++ b/lisp/ChangeLog.9 @@ -1418,13 +1418,13 @@ 2001-08-28 Thien-Thi Nguyen * progmodes/hideshow.el: Update first-line description. - Sync comments w/ maintainer version 5.31. + Sync comments with maintainer version 5.31. (hs-isearch-open): Default value now `code'. Fix docstring to use "code blocks" vs "comment blocks", as opposed to "block" vs "comment". (hs-flag-region): Accept `hs-isearch-open' value - of `block' as synonymous w/ `code'. + of `block' as synonymous with `code'. (hs-hide-block-at-point): For code blocks, pass `code' to `hs-flag-region' instead of `block'. @@ -11483,7 +11483,7 @@ 2000-09-23 Thien-Thi Nguyen * progmodes/hideshow.el: Update author email address. - Generally, sync w/ maintainer version 5.22. + Generally, sync with maintainer version 5.22. (hs-hide-all-non-comment-function): New var. (hs-hide-hook, hs-show-hook, hs-minor-mode): Update docstrings. (hs-hide-all): Use `hs-hide-all-non-comment-function'. @@ -17879,7 +17879,7 @@ (speedbar-make-button): Call `speedbar-insert-image-button-maybe'. (speedbar-directory-buttons): Update path search/expansion. (speedbar-make-tag-line): Pay attention to - `speedbar-indentation-width'. Use more care w/ invisible + `speedbar-indentation-width'. Use more care with invisible properties. (speedbar-change-expand-button-char): Call `speedbar-insert-image-button-maybe'. diff --git a/lisp/autorevert.el b/lisp/autorevert.el index e3d66c04bc..1ed3f693ab 100644 --- a/lisp/autorevert.el +++ b/lisp/autorevert.el @@ -718,7 +718,7 @@ auto-revert-notify-handler (string-equal (file-name-nondirectory file) (file-name-nondirectory buffer-file-name))) - ;; A buffer w/o a file, like dired. + ;; A buffer without a file, like dired. (null buffer-file-name)) (auto-revert-notify-rm-watch) ;; Restart the timer if it wasn't running. @@ -739,7 +739,7 @@ auto-revert-notify-handler (string-equal (file-name-nondirectory file1) (file-name-nondirectory buffer-file-name))))) - ;; A buffer w/o a file, like dired. + ;; A buffer without a file, like dired. (and (null buffer-file-name) (memq action '(created renamed deleted)))) ;; Mark buffer modified. diff --git a/lisp/comint.el b/lisp/comint.el index 93b97cb22b..4d9fc50187 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -78,7 +78,7 @@ ;; ;; Not bound by default in comint-mode (some are in shell mode) ;; comint-run Run a program under comint-mode -;; comint-send-invisible Read a line w/o echo, and send to proc +;; comint-send-invisible Read a line without echo, and send to proc ;; comint-dynamic-complete-filename Complete filename at point. ;; comint-dynamic-list-filename-completions List completions in help buffer. ;; comint-replace-by-expanded-filename Expand and complete filename at point; diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el index 9ff893b75b..16c2c34740 100644 --- a/lisp/emacs-lisp/chart.el +++ b/lisp/emacs-lisp/chart.el @@ -35,7 +35,7 @@ ;; anything encapsulated in a nice eieio object. ;; ;; Current example apps for chart can be accessed via these commands: -;; `chart-file-count' - count files w/ matching extensions +;; `chart-file-count' - count files with matching extensions ;; `chart-space-usage' - display space used by files/directories ;; `chart-emacs-storage' - Emacs storage units used/free (garbage-collect) ;; `chart-emacs-lists' - length of Emacs lists diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index f10dc91572..a9fd8c741e 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -3110,7 +3110,7 @@ package-list-unversioned "If non-nil, include packages that don't have a version in `list-packages'.") (defvar package-list-unsigned nil - "If non-nil, mention in the list which packages were installed w/o signature.") + "If non-nil, mention in the list which packages were installed without signature.") (defvar package--emacs-version-list (version-to-list emacs-version) "The value of variable `emacs-version' as a list.") diff --git a/lisp/epg.el b/lisp/epg.el index ceeb269b07..527ebfcc2b 100644 --- a/lisp/epg.el +++ b/lisp/epg.el @@ -482,7 +482,7 @@ epg-import-result-to-string (format " skipped new keys: %d\n" (epg-import-result-not-imported import-result))) (if (> (epg-import-result-no-user-id import-result) 0) - (format " w/o user IDs: %d\n" + (format " without user IDs: %d\n" (epg-import-result-no-user-id import-result))) (if (> (epg-import-result-imported import-result) 0) (concat (format " imported: %d" diff --git a/lisp/gnus/ChangeLog.3 b/lisp/gnus/ChangeLog.3 index c55d6225e3..3b41e9edc9 100644 --- a/lisp/gnus/ChangeLog.3 +++ b/lisp/gnus/ChangeLog.3 @@ -22675,7 +22675,8 @@ * nnspool.el (nnspool-spool-directory): Use news-directory instead of news-path. - * spam-stat.el (spam-stat-unload-hook): Set as a variable w/ add-hook. + * spam-stat.el (spam-stat-unload-hook): Set as a variable with + add-hook. * spam.el: Delete duplicate `provide'. (spam-unload-hook): Set as a variable with add-hook. diff --git a/lisp/gnus/gnus-cache.el b/lisp/gnus/gnus-cache.el index 449b73163f..13c9c0130e 100644 --- a/lisp/gnus/gnus-cache.el +++ b/lisp/gnus/gnus-cache.el @@ -137,7 +137,7 @@ gnus-cache-save-buffers ;; If possible, remove group's cache subdirectory. (condition-case nil ;; FIXME: we can detect the error type and warn the user - ;; of any inconsistencies (articles w/o nov entries?). + ;; of any inconsistencies (articles without nov entries?). ;; for now, just be conservative...delete only if safe -- sj (delete-directory (file-name-directory overview-file)) (error)))) diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 5589908764..e7d11b597b 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -2909,7 +2909,7 @@ message-mode-map "C-c C-f s" #'message-change-subject ;; "C-c C-f x" #'message-cross-post-followup-to - ;; prefix+message-cross-post-followup-to = same w/o cross-post + ;; prefix+message-cross-post-followup-to = same without cross-post "C-c C-f t" #'message-reduce-to-to-cc "C-c C-f a" #'message-add-archive-header ;; mark inserted text diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index d6d0fb9a25..6e17e417ea 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -218,7 +218,7 @@ ;; ange-ftp-smart-gateway and ange-ftp-smart-gateway-port. ;; ;; Otherwise, if there is an alternate ftp program that implements proxy in -;; a transparent way (i.e. w/o specifying the proxy host), that will +;; a transparent way (i.e. without specifying the proxy host), that will ;; connect you directly to the desired destination host: ;; Set ange-ftp-gateway-ftp-program-name to that program's name. ;; Set ange-ftp-local-host-regexp to a value as stated earlier on. diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 33e5e80d05..9b7117cb87 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -2949,7 +2949,7 @@ tramp-command-completion-p (tramp-tramp-file-p (tramp-get-default-directory buffer))) (defun tramp-connectable-p (vec-or-filename) - "Check, whether it is possible to connect the remote host w/o side-effects. + "Check if it is possible to connect the remote host without side-effects. This is true, if either the remote host is already connected, or if we are not in completion mode." (let ((tramp-verbose 0) @@ -3999,7 +3999,7 @@ tramp-handle-file-newer-than-file-p ((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. + ;; the timestamps to seconds without fractions. ;; `time-convert' has been introduced with Emacs 27.1. ((fboundp 'time-convert) (time-less-p diff --git a/lisp/obsolete/rfc2368.el b/lisp/obsolete/rfc2368.el index 5e7320a793..0a75296e7d 100644 --- a/lisp/obsolete/rfc2368.el +++ b/lisp/obsolete/rfc2368.el @@ -27,7 +27,7 @@ ;; ;; -repeat after me: "the colon is not part of the header name..." ;; -if w3 becomes part of emacs, then it may make sense to have this -;; file depend on w3 -- the maintainer of w3 says merging w/ Emacs +;; file depend on w3 -- the maintainer of w3 says merging with Emacs ;; is planned! ;; ;; historical note: @@ -36,8 +36,8 @@ ;; ;; acknowledgments: ;; -;; the functions that deal w/ unhexifying in this file were basically -;; taken from w3 -- i hope to replace them w/ something else soon OR +;; the functions that deal with unhexifying in this file were basically +;; taken from w3 -- i hope to replace them with something else soon OR ;; perhaps if w3 becomes a part of emacs soon, use the functions from w3. ;;; History: @@ -85,9 +85,9 @@ rfc2368-unhexify-string (defun rfc2368-parse-mailto-url (mailto-url) "Parse MAILTO-URL, and return an alist of header-name, header-value pairs. -MAILTO-URL should be a RFC 2368 (mailto) compliant url. A cons cell w/ a +MAILTO-URL should be a RFC 2368 (mailto) compliant url. A cons cell with a key of `Body' is a special case and is considered a header for this purpose. -The returned alist is intended for use w/ the `compose-mail' interface. +The returned alist is intended for use with the `compose-mail' interface. Note: make sure MAILTO-URL has been \"unhtmlized\" (e.g., & -> &), before calling this function." (let ((case-fold-search t) @@ -114,7 +114,7 @@ rfc2368-parse-mailto-url (rfc2368-unhexify-string header-value)))) (split-string query "&")))) - ;; deal w/ multiple 'To' recipients + ;; deal with multiple 'To' recipients (if prequery (progn (setq prequery (rfc2368-unhexify-string prequery)) diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1 index 1491a4645a..f79d8bf674 100644 --- a/lisp/org/ChangeLog.1 +++ b/lisp/org/ChangeLog.1 @@ -23889,7 +23889,7 @@ 2010-11-11 Eric Schulte * ob-sqlite.el (org-babel-sqlite-expand-vars): Now inserts string - arguments w/o quotes. + arguments without quotes. 2010-11-11 Bernt Hansen @@ -23909,7 +23909,7 @@ 2010-11-11 Eric Schulte * ob-lob.el (org-babel-lob-one-liner-regexp): Fix error in lob - regexp -- it wasn't matching lob lines w/o indices. + regexp -- it wasn't matching lob lines without indices. 2010-11-11 Eric Schulte diff --git a/lisp/play/zone.el b/lisp/play/zone.el index a470f23dfe..6e27ba5165 100644 --- a/lisp/play/zone.el +++ b/lisp/play/zone.el @@ -320,7 +320,7 @@ zone-pgm-explode (zone-pgm-jitter)) -;;;; putzing w/ case +;;;; putzing with case ;; Faster than `zone-pgm-putz-with-case', but not as good: all ;; instances of the same letter have the same case, which produces a diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el index b722790334..efee400681 100644 --- a/lisp/progmodes/antlr-mode.el +++ b/lisp/progmodes/antlr-mode.el @@ -1777,7 +1777,7 @@ antlr-insert-option-space (skip-chars-forward " \t") (if (looking-at "$\\|//") - ;; just comment after point => skip (+ lines w/ same col comment) + ;; just comment after point => skip (+ lines with same col comment) (let ((same (if (> (match-end 0) (match-beginning 0)) (current-column)))) (beginning-of-line 2) diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el index aaf063b517..2a63c10002 100644 --- a/lisp/progmodes/asm-mode.el +++ b/lisp/progmodes/asm-mode.el @@ -209,7 +209,7 @@ asm-comment (indent-according-to-mode) (insert asm-comment-char asm-comment-char ?\ )) - ;; Nonblank line w/o comment => start a comment at comment-column. + ;; Nonblank line without comment => start a comment at comment-column. ;; Also: point before the comment => jump inside. ((or (null comment) (< (point) comment)) (indent-for-comment)) diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 18c996e899..e8ada9388e 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -2807,7 +2807,7 @@ compilation-next-error-function (goto-char (point-min)) ;; Treat file's found lines in forward order, 1 by 1. (dolist (line (reverse (cddr (compilation--loc->file-struct loc)))) - (when (car line) ; else this is a filename w/o a line# + (when (car line) ; else this is a filename without a line# (compilation-beginning-of-line (- (car line) last -1)) (setq last (car line))) ;; Treat line's found columns and store/update a marker for each. diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el index e0453c3b2f..8454f24356 100644 --- a/lisp/progmodes/scheme.el +++ b/lisp/progmodes/scheme.el @@ -361,7 +361,7 @@ scheme-font-lock-keywords-2 ) t) "\\>") 1) ;; - ;; It wouldn't be Scheme w/o named-let. + ;; It wouldn't be Scheme without named-let. '("(let\\s-+\\(\\sw+\\)" (1 font-lock-function-name-face)) ;; diff --git a/lisp/shell.el b/lisp/shell.el index 7c3c925ab8..b396bc2b18 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -71,7 +71,7 @@ ;; c-c c-o comint-delete-output Delete last batch of process output ;; c-c c-r comint-show-output Show last batch of process output ;; c-c c-l comint-dynamic-list-input-ring List input history -;; comint-send-invisible Read line w/o echo & send to proc +;; comint-send-invisible Read line without echo & send to proc ;; comint-continue-subjob Useful if you accidentally suspend ;; top-level job ;; comint-mode-hook is the comint mode hook. diff --git a/lisp/strokes.el b/lisp/strokes.el index 0f84588a41..e5719dfd5d 100644 --- a/lisp/strokes.el +++ b/lisp/strokes.el @@ -1151,7 +1151,7 @@ strokes-xpm-for-stroke strokes-last-stroke) 31)))) (lift-flag t) - (rainbow-chars (list ?R ?O ?Y ?G ?B ?P))) ; ROYGBIV w/o indigo + (rainbow-chars (list ?R ?O ?Y ?G ?B ?P))) ; ROYGBIV without indigo (set-buffer buf) (erase-buffer) (insert strokes-xpm-header) diff --git a/lisp/term.el b/lisp/term.el index 755c220270..6f3306b088 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -278,7 +278,7 @@ ;; C-c C-h term-dynamic-list-input-ring List input history ;; ;; Not bound by default in term-mode -;; term-send-invisible Read a line w/o echo, and send to proc +;; term-send-invisible Read a line without echo, and send to proc ;; (These are bound in shell-mode) ;; term-dynamic-complete Complete filename at point. ;; term-dynamic-list-completions List completions in help buffer. diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index e72576cdc7..f815419ea4 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el @@ -2053,7 +2053,8 @@ reftex-fontify-select-label-buffer (newname (concat "Fontify-me-" oldname))) (unwind-protect (progn - ;; Rename buffer temporarily to start w/o space (because of font-lock) + ;; Rename buffer temporarily to start without space (because + ;; of font-lock) (rename-buffer newname t) ;; Good: we have the indirection functions (set (make-local-variable 'font-lock-fontify-region-function) diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index c41835e19f..bf1d847f1a 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -683,11 +683,11 @@ vc-rcs-annotate-command ;; *BEFORE* editing occurs) to start from, but line numbers ;; change as a result of edits. To DTRT, we apply edits in ;; order of descending buffer position so that edits further - ;; down in the buffer occur first w/o corrupting specified + ;; down in the buffer occur first without corrupting specified ;; buffer positions of edits occurring towards the beginning of ;; the buffer. In this way we avoid using markers. A pleasant ;; property of this approach is ability to push instructions - ;; onto `path' directly, w/o need to maintain rev boundaries. + ;; onto `path' directly, without need to maintain rev boundaries. (dolist (insn (cdr (assq :insn meta))) (goto-char (point-min)) (forward-line (1- (pop insn))) diff --git a/src/ChangeLog.11 b/src/ChangeLog.11 index a00ca453ca..77180262ac 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 @@ -14235,7 +14235,7 @@ ns_alternate_modifier. (Bug#1217) * nsmenu.m (EmacsMenu-parseKeyEquiv:, addItemWithWidgetValue:): - Display all shortcuts, including those w/o super modifier. + Display all shortcuts, including those without super modifier. * nsfns.m (ns-read-file-name): Fix typo in assignment statement. diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index 4b3675eaa8..d32e894fa5 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 @@ -14422,7 +14422,7 @@ * s-umips.h: Now include either s-usg5-2-2.h or s-bsd4-3.h and then override as needed. * m-mips.h: System dependence deleted. - LD_SWITCH_MACHINE remains w/ options needed on all systems. + LD_SWITCH_MACHINE remains with options needed on all systems. * m-pmax.h: A little of that (LIBS_DEBUG) moved here. No need to undef LIBS_MACHINE. diff --git a/src/xdisp.c b/src/xdisp.c index b09aa6ec96..171c6ccaa0 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -22616,7 +22616,8 @@ DEFUN ("trace-to-stderr", Ftrace_to_stderr, Strace_to_stderr, 1, MANY, "", ***********************************************************************/ /* Return a temporary glyph row holding the glyphs of an overlay arrow. - Used for non-window-redisplay windows, and for windows w/o left fringe. */ + Used for non-window-redisplay windows, and for windows without left + fringe. */ static struct glyph_row * get_overlay_arrow_glyph_row (struct window *w, Lisp_Object overlay_arrow_string) diff --git a/test/lisp/cedet/semantic-utest.el b/test/lisp/cedet/semantic-utest.el index b577b19808..4aaa4c5e3c 100644 --- a/test/lisp/cedet/semantic-utest.el +++ b/test/lisp/cedet/semantic-utest.el @@ -593,7 +593,7 @@ semantic-utest-Makefile ) (ert-deftest semantic-utest-Scheme() - (skip-unless nil) ;; There is a bug w/ scheme parser. Skip this for now. + (skip-unless nil) ;; There is a bug with scheme parser. Skip this for now. (semantic-utest-generic (semantic-utest-fname "tst.scm") semantic-utest-Scheme-buffer-contents semantic-utest-Scheme-name-contents '("fun2") ";1" ";deleted line") ) diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el b/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el index af19c122b9..05d24a8e35 100644 --- a/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el +++ b/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el @@ -308,7 +308,7 @@ eieio-test-method-order-list-8 (setq eieio-test-method-order-list (nreverse eieio-test-method-order-list)) (eieio-test-match ans))) -;;; Jan's methodinvoke order w/ multiple inheritance and :after methods. +;;; Jan's methodinvoke order with multiple inheritance and :after methods. ;; (defclass eitest-Ja () ()) diff --git a/test/lisp/erc/erc-join-tests.el b/test/lisp/erc/erc-join-tests.el index 8210defbfb..89521ba429 100644 --- a/test/lisp/erc/erc-join-tests.el +++ b/test/lisp/erc/erc-join-tests.el @@ -335,7 +335,7 @@ erc-autojoin-remove--server (start-process "true" (current-buffer) "true") erc-server-current-nick "tester" erc-server-announced-name "foo.gnu.chat" - ;; Assume special case w/o known network + ;; Assume special case without known network erc-networks--id (make-erc-networks--id)) (set-process-query-on-exit-flag erc-server-process nil) (should-not calls) diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el index d82e2dae7a..724cd63e22 100644 --- a/test/lisp/filenotify-tests.el +++ b/test/lisp/filenotify-tests.el @@ -1590,8 +1590,8 @@ file-notify-test11-symlinks (unwind-protect (progn (write-region "any text" nil file-notify--test-tmpfile1 nil 'no-message) - ;; Some systems, like MS Windows w/o sufficient privileges, do - ;; not allow creation of symbolic links. + ;; Some systems, like MS Windows without sufficient + ;; privileges, do not allow creation of symbolic links. (condition-case nil (make-symbolic-link file-notify--test-tmpfile1 file-notify--test-tmpfile) diff --git a/test/lisp/net/tramp-archive-tests.el b/test/lisp/net/tramp-archive-tests.el index f8a0aa03e3..d9eafc47ad 100644 --- a/test/lisp/net/tramp-archive-tests.el +++ b/test/lisp/net/tramp-archive-tests.el @@ -123,7 +123,7 @@ tramp-archive--test-delete (defun tramp-archive--test-emacs27-p () "Check for Emacs version >= 27.1. -Some semantics has been changed for there, w/o new functions or +Some semantics has been changed for there, without new functions or variables, so we check the Emacs version directly." (>= emacs-major-version 27)) diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 6ffb8a6529..79b2fc803d 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -6597,20 +6597,20 @@ tramp-test40-make-nearby-temp-file (defun tramp--test-emacs27-p () "Check for Emacs version >= 27.1. -Some semantics has been changed for there, w/o new functions or -variables, so we check the Emacs version directly." +Some semantics has been changed for there, without new functions +or variables, so we check the Emacs version directly." (>= emacs-major-version 27)) (defun tramp--test-emacs28-p () "Check for Emacs version >= 28.1. -Some semantics has been changed for there, w/o new functions or -variables, so we check the Emacs version directly." +Some semantics has been changed for there, without new functions +or variables, so we check the Emacs version directly." (>= emacs-major-version 28)) (defun tramp--test-emacs29-p () "Check for Emacs version >= 29.1. -Some semantics has been changed for there, w/o new functions or -variables, so we check the Emacs version directly." +Some semantics has been changed for there, without new functions +or variables, so we check the Emacs version directly." (>= emacs-major-version 29)) (defun tramp--test-adb-p () diff --git a/test/manual/cedet/cedet-utests.el b/test/manual/cedet/cedet-utests.el index b365908c63..2c5ba46855 100644 --- a/test/manual/cedet/cedet-utests.el +++ b/test/manual/cedet/cedet-utests.el @@ -333,7 +333,8 @@ cedet-utest-add-log-item-done "Add into the log that the last item is done. Apply NOTES to the doneness of the log. Apply ERR if there was an error in previous item. -Optional argument PRECR indicates to prefix the done msg w/ a newline." +Optional argument PRECR indicates to prefix the done message with +a newline." (if noninteractive ;; Non-interactive-mode - show a message. (if notes diff --git a/test/manual/cedet/semantic-tests.el b/test/manual/cedet/semantic-tests.el index dcdeb45b0a..1d0e668d96 100644 --- a/test/manual/cedet/semantic-tests.el +++ b/test/manual/cedet/semantic-tests.el @@ -87,7 +87,8 @@ semanticdb-test-gnu-global-startfile (defun semanticdb-test-gnu-global (searchfor &optional standardfile) "Test the GNU Global semanticdb. Argument SEARCHFOR is the text to search for. -If optional arg STANDARDFILE is non-nil, use a standard file w/ global enabled." +If optional arg STANDARDFILE is non-nil, use a standard file with +global enabled." (interactive "sSearch For Tag: \nP") (require 'data-debug) diff --git a/test/manual/cedet/tests/testpolymorph.cpp b/test/manual/cedet/tests/testpolymorph.cpp index ba64e39a7a..cfe44ecc4d 100644 --- a/test/manual/cedet/tests/testpolymorph.cpp +++ b/test/manual/cedet/tests/testpolymorph.cpp @@ -22,7 +22,7 @@ #include -// Test 1 - Functions w/ prototypes +// Test 1 - Functions with prototypes namespace proto { int pt_func1(int arg1); @@ -32,7 +32,7 @@ } -// Test 2 - Functions w/ different arg lists. +// Test 2 - Functions with different arg lists. namespace fcn_poly { int pm_func(void) { @@ -50,7 +50,7 @@ } -// Test 3 - Methods w/ different arg lists. +// Test 3 - Methods with different arg lists. class meth_poly { public: int pm_meth(void) { @@ -68,7 +68,7 @@ }; -// Test 4 - Templates w/ partial specifiers. +// Test 4 - Templates with partial specifiers. namespace template_partial_spec { template class test { @@ -83,7 +83,7 @@ }; } -// Test 5 - Templates w/ full specialization which may or may not share +// Test 5 - Templates with full specialization which may or may not share // common functions. namespace template_full_spec { template class test diff --git a/test/manual/cedet/tests/testsppreplace.c b/test/manual/cedet/tests/testsppreplace.c index 54ae3f0323..d255c202d3 100644 --- a/test/manual/cedet/tests/testsppreplace.c +++ b/test/manual/cedet/tests/testsppreplace.c @@ -66,7 +66,7 @@ #define MULTI_ARGS(name, field1, field2, field3) struct name { int field1; int f MULTI_ARGS(ma_struct, moose, penguin, emu); -/* TEST: Macro w/ args, but no body. */ +/* TEST: Macro with args, but no body. */ #define NO_BODY(name) NO_BODY(Moose); @@ -78,7 +78,7 @@ #define NOT_WITH_ARGS (moose) { } -/* TEST: macro w/ continuation. */ +/* TEST: macro with continuation. */ #define WITH_CONT \ continuation_symbol diff --git a/test/manual/cedet/tests/testsppreplaced.c b/test/manual/cedet/tests/testsppreplaced.c index c359fa7d69..c98349174e 100644 --- a/test/manual/cedet/tests/testsppreplaced.c +++ b/test/manual/cedet/tests/testsppreplaced.c @@ -55,14 +55,14 @@ /* TEST: Multiple args to a macro. */ struct ma_struct { int moose; int penguin; int emu; }; -/* TEST: Macro w/ args, but no body. */ +/* TEST: Macro with args, but no body. */ /* TEST: Not a macro with args, but close. */ int not_with_args_fcn (moose) { } -/* TEST: macro w/ continuation. */ +/* TEST: macro with continuation. */ int continuation_symbol () { }; /* TEST: macros in a macro - tail processing */ commit a86ccb5f9dd4a5fe8e6af974d7f577e7b5d0a8d4 Author: Eli Zaretskii Date: Thu Dec 1 17:25:28 2022 +0200 ; Fix recently added treesit documentation * lisp/treesit.el (treesit-defun-prefer-top-level): * doc/lispref/positions.texi (List Motion): Fix wording. diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi index c065cc11e2..7acf2d052a 100644 --- a/doc/lispref/positions.texi +++ b/doc/lispref/positions.texi @@ -836,35 +836,37 @@ List Motion @findex treesit-beginning-of-defun @findex treesit-end-of-defun -If Emacs is compiled with tree-sitter, it can use the tree-sitter parser -information to move across syntax constructs. A major mode can set -@code{treesit-defun-type-regexp} and get navigation functionality for -free, by using @code{treesit-beginning-of-defun} and -@code{treesit-end-of-defun}. +If Emacs is compiled with tree-sitter, it can use the tree-sitter +parser information to move across syntax constructs. Since what +exactly is considered a defun varies between languages, a major mode +should set @code{treesit-defun-type-regexp} to determine that. Then +the mode can get navigation-by-defun functionality for free, by using +@code{treesit-beginning-of-defun} and @code{treesit-end-of-defun}. @defvar treesit-defun-type-regexp The value of this variable is a regexp matching the node type of defun -nodes. (For ``node'', ``node type'', @pxref{Parsing Program Source}.) +nodes. (For ``node'' and ``node type'', @pxref{Parsing Program Source}.) For example, @code{python-mode} sets this variable to a regexp that matches either @code{function_definition} or @code{class_definition}. @end defvar @defvar treesit-defun-prefer-top-level -If this variable is non-@code{nil}, Emacs skips nested defun and -prefers the top-level defun. +If this variable is non-@code{nil}, Emacs skips nested defuns, when it +looks for beginning and end of a defun, and prefers to go to the +top-level defun instead. -In some languages, a defun could be nested in another one. Normally -Emacs stops at the first defun it encounters. If this variable's +In some languages, a defun could be nested in another one. By default, +Emacs stops at the first defun it encounters. But if this variable's value is @code{t}, whenever Emacs finds a defun node, it tries to go -up the parse tree and find the top-level defun. +up the parse tree until it finds the top-level defun. This variable can also be a list of cons cells of the form @w{@code{(@var{from} . @var{to}))}}, where @var{from} and @var{to} are -regexp matching tree-sitter node types. When Emacs finds a defun node -whose type matches any of the @var{from} regexp in the list, Emacs -then tries to go up the parse tree to find the top-level node matching -the corresponding @var{to} regexp. +regexps matching tree-sitter node types. When Emacs finds a defun +node whose type matches any of the @var{from} regexps in the list, it +then tries to go up the parse tree until it finds a higher-level node +matching the corresponding @var{to} regexp. @end defvar @node Skipping Characters diff --git a/lisp/treesit.el b/lisp/treesit.el index dd7895683f..0de0e283c3 100644 --- a/lisp/treesit.el +++ b/lisp/treesit.el @@ -1561,11 +1561,11 @@ treesit-defun-prefer-top-level variable's value is t, Emacs tries to find the top-level defun, and ignores nested ones. -This variable can also be a list of cons cells of the form (FROM -. TO), where FROM and TO are tree-sitter node type regexps. When -Emacs finds a defun node whose type matches any of the FROM -regexp in the list, Emacs then tries to find the top-level node -matching the corresponding TO regexp.") +This variable can also be a list of cons cells of the +form (FROM . TO), where FROM and TO are tree-sitter node type +regexps. When Emacs finds a defun node whose type matches any of +the FROM regexps in the list, it then tries to find a +higher-level node matching the corresponding TO regexp.") (defun treesit--defun-maybe-top-level (node) "Maybe return the top-level equivalent of NODE. commit 2d5cf7329e9af753651508cd13e03185a05f3f6a Author: Eli Zaretskii Date: Thu Dec 1 17:11:43 2022 +0200 ; * etc/NEWS: Fix wording and punctuation of recently added entries. diff --git a/etc/NEWS b/etc/NEWS index 04d8c6948e..a9d279fee5 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -2227,8 +2227,10 @@ it with new 'term-{faint,italic,slow-blink,fast-blink}' faces. ** Project +++ -*** 'project-find-file' and 'project-or-external-find-file' now accept -a prefix argument which is interpreted to mean "include all files". +*** 'project-find-file' and 'project-or-external-find-file' can include all. +The commands 'project-find-file' and 'project-or-external-find-file' +now accept a prefix argument, which is interpreted to mean "include +all files". +++ *** New command 'project-list-buffers' bound to 'C-x p C-b'. @@ -2239,7 +2241,7 @@ This command displays a list of buffers from the current project. Customize the user option 'project-kill-buffers-display-buffer-list' to enable the display of the buffer list. -*** New user option 'project-vc-extra-root-markers' +*** New user option 'project-vc-extra-root-markers'. Use it to add detection of nested projects (inside a VCS repository), or projects outside of VCS repositories. commit 05e336278e6a7efef5e4868cf9ee4f8c99cdb80f Author: Eli Zaretskii Date: Thu Dec 1 17:08:02 2022 +0200 ; * etc/NEWS.29: Resurrect Local variables that keep disappearing... diff --git a/etc/NEWS.29 b/etc/NEWS.29 index a9bf0eccd8..4e091a5fed 100644 --- a/etc/NEWS.29 +++ b/etc/NEWS.29 @@ -4427,3 +4427,11 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . + + +Local variables: +coding: utf-8 +mode: outline +mode: emacs-news +paragraph-separate: "[ ]" +end: commit 11ea333a5ae6a5718b0b441884645e8c67a5979a Merge: 9210eac585 f7c3abb8d2 Author: Eli Zaretskii Date: Thu Dec 1 17:07:59 2022 +0200 Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs commit 61311d68620094f6055c69f57f52bc9794498ba7 Author: Dmitry Gutov Date: Thu Dec 1 16:38:52 2022 +0200 ; Fix test failure on CI diff --git a/test/lisp/progmodes/project-tests.el b/test/lisp/progmodes/project-tests.el index 55f3f499b3..c3b886873d 100644 --- a/test/lisp/progmodes/project-tests.el +++ b/test/lisp/progmodes/project-tests.el @@ -123,8 +123,8 @@ project-vc-recognizes-git (project-vc-extra-root-markers nil) (project (project-current nil dir))) (should-not (null project)) - (should (equal - "test/lisp/progmodes/project-tests.el" + (should (string-match-p + "\\`test/lisp/progmodes/project-tests\\.elc?" (file-relative-name project-tests--this-file (project-root project)))))) commit 0a5ede014993bb6699c58a2c9d3631b4aff20847 Author: Stefan Kangas Date: Thu Dec 1 15:33:12 2022 +0100 ; Auto-commit of loaddefs files. diff --git a/lisp/cedet/semantic/grm-wy-boot.el b/lisp/cedet/semantic/grm-wy-boot.el index 7fff36a3d0..376fab89c2 100644 --- a/lisp/cedet/semantic/grm-wy-boot.el +++ b/lisp/cedet/semantic/grm-wy-boot.el @@ -396,12 +396,12 @@ semantic-grammar-wy--parse-table (let ((s $1)) (if - (string-match "^{[\^M\n ]*" s) + (string-match "^{[ \n ]*" s) (setq s (substring s (match-end 0)))) (if - (string-match "[\^M\n ]*}$" s) + (string-match "[ \n ]*}$" s) (setq s (substring s 0 (match-beginning 0)))) diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 3f36cfbba5..938859c691 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -1028,7 +1028,8 @@ 'command-apropos (autoload 'apropos "apropos" "\ Show all meaningful Lisp symbols whose names match PATTERN. Symbols are shown if they are defined as functions, variables, or -faces, or if they have nonempty property lists. +faces, or if they have nonempty property lists, or if they are +known keywords. PATTERN can be a word, a list of words (separated by spaces), or a regexp (using some regexp special characters). If it is a word, @@ -2308,7 +2309,7 @@ browse-url-browser-function Also see `browse-url-secondary-browser-function' and `browse-url-handlers'.") (custom-autoload 'browse-url-browser-function "browse-url" t) -(defvar browse-url-default-handlers '(("\\`mailto:" . browse-url--mailto) ("\\`man:" . browse-url--man) (browse-url--non-html-file-url-p . browse-url-emacs)) "\ +(defvar browse-url-default-handlers '(("\\`mailto:" . browse-url--mailto) ("\\`man:" . browse-url--man) ("\\`irc6?s?://" . browse-url--irc) (browse-url--non-html-file-url-p . browse-url-emacs)) "\ Like `browse-url-handlers' but populated by Emacs and packages. Emacs and external packages capable of browsing certain URLs @@ -2544,6 +2545,11 @@ browse-url-default-handlers used instead of `browse-url-new-window-flag'. (fn URL &optional NEW-BUFFER)" t) +(autoload 'browse-url-irc "browse-url" "\ +Call `url-irc' directly after parsing URL. +This function is a fit for options like `gnus-button-alist'. + +(fn URL &rest _)") (autoload 'browse-url-mail "browse-url" "\ Open a new mail message buffer within Emacs for the RFC 2368 URL. Default to using the mailto: URL around or before point as the @@ -2832,6 +2838,23 @@ "bytecomp" (register-definition-prefixes "semantic/bovine/c" '("semantic")) + +;;; Generated autoloads from progmodes/c-ts-mode.el + +(autoload 'c-ts-mode--base-mode "c-ts-mode" "\ +Major mode for editing C, powered by tree-sitter. + +(fn)" t) +(autoload 'c-ts-mode "c-ts-mode" "\ +Major mode for editing C, powered by tree-sitter. + +(fn)" t) +(autoload 'c++-ts-mode "c-ts-mode" "\ +Major mode for editing C++, powered by tree-sitter. + +(fn)" t) +(register-definition-prefixes "c-ts-mode" '("c-ts-")) + ;;; Generated autoloads from calendar/cal-bahai.el @@ -5497,9 +5520,51 @@ "crm" (register-definition-prefixes "semantic/symref/cscope" '("semantic-symref-cscope--line-re")) + +;;; Generated autoloads from progmodes/csharp-mode.el + +(add-to-list 'auto-mode-alist '("\\.cs\\'" . csharp-mode)) +(add-to-list 'auto-mode-alist '("\\.cs\\'" . csharp-mode)) +(autoload 'csharp-mode "csharp-mode" "\ +Major mode for editing Csharp code. + +Key bindings: +\\{csharp-mode-map} + +(fn)" t) +(autoload 'csharp-ts-mode "csharp-mode" "\ +Major mode for editing C# code. + +(fn)" t) +(register-definition-prefixes "csharp-mode" '("codedoc-font-lock-" "csharp-")) + ;;; Generated autoloads from textmodes/css-mode.el +(autoload 'css-ts-mode "css-mode" "\ +Major mode to edit Cascading Style Sheets (CSS). +\\ + +This mode provides syntax highlighting, indentation, completion, +and documentation lookup for CSS, based on the tree-sitter +library. + +Use `\\[completion-at-point]' to complete CSS properties, +property values, pseudo-elements, pseudo-classes, at-rules, +bang-rules, and HTML tags, classes and IDs. Completion +candidates for HTML class names and IDs are found by looking +through open HTML mode buffers. + +Use `\\[info-lookup-symbol]' to look up documentation of CSS +properties, at-rules, pseudo-classes, and pseudo-elements on the +Mozilla Developer Network (MDN). + +Use `\\[fill-paragraph]' to reformat CSS declaration blocks. It +can also be used to fill comments. + +\\{css-mode-map} + +(fn)" t) (autoload 'css-mode "css-mode" "\ Major mode to edit Cascading Style Sheets (CSS). \\ @@ -10003,13 +10068,16 @@ 'erc-select 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)" t) +(fn &key (SERVER (erc-compute-server)) (PORT (erc-compute-port \\='ircs-u)) (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. +Use ERC to IRC on HOST:PORT in CHANNEL. If ERC is already connected to HOST:PORT, simply /join CHANNEL. -Otherwise, connect to HOST:PORT as USER and /join CHANNEL. +Otherwise, connect to HOST:PORT as NICK and /join CHANNEL. -(fn HOST PORT CHANNEL USER PASSWORD)") +Beginning with ERC 5.5, new connections require human intervention. +Customize `erc-url-connect-function' to override this. + +(fn HOST PORT CHANNEL NICK PASSWORD &optional SCHEME)") (register-definition-prefixes "erc" '("erc-")) @@ -10154,6 +10222,11 @@ "erc-replace" (register-definition-prefixes "erc-ring" '("erc-")) + +;;; Generated autoloads from erc/erc-sasl.el + +(register-definition-prefixes "erc-sasl" '("erc-sasl-")) + ;;; Generated autoloads from erc/erc-services.el @@ -10222,7 +10295,7 @@ "erc-xdcc" 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. +in batch mode, an error is signaled. (fn NAME () [DOCSTRING] [:expected-result RESULT-TYPE] [:tags \\='(TAG...)] BODY...)" nil t) (function-put 'ert-deftest 'doc-string-elt 3) @@ -10649,6 +10722,8 @@ "etags" (autoload 'ethio-sera-to-fidel-buffer "ethio-util" "\ Convert the current buffer from SERA to FIDEL. +FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation +in ASCII) is the Latin representation of Ethiopic script. The variable `ethio-primary-language' specifies the primary language and `ethio-secondary-language' specifies the secondary. @@ -10666,6 +10741,8 @@ "etags" (autoload 'ethio-sera-to-fidel-region "ethio-util" "\ Convert the characters in region from SERA to FIDEL. +FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation +in ASCII) is the Latin representation of Ethiopic script. The variable `ethio-primary-language' specifies the primary language and `ethio-secondary-language' specifies the secondary. @@ -10681,13 +10758,17 @@ "etags" (fn BEGIN END &optional SECONDARY FORCE)" t) (autoload 'ethio-sera-to-fidel-marker "ethio-util" "\ -Convert the regions surrounded by \"\" and \"\" from SERA to FIDEL. +Convert regions surrounded by \"\" and \"\" from SERA to FIDEL. +FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation +in ASCII) is the Latin representation of Ethiopic script. Assume that each region begins with `ethio-primary-language'. The markers \"\" and \"\" themselves are not deleted. (fn &optional FORCE)" t) (autoload 'ethio-fidel-to-sera-buffer "ethio-util" "\ -Replace all the FIDEL characters in the current buffer to the SERA format. +Convert all the FIDEL characters in the current buffer to the SERA format. +FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation +in ASCII) is the Latin representation of Ethiopic script. The variable `ethio-primary-language' specifies the primary language and `ethio-secondary-language' specifies the secondary. @@ -10704,8 +10785,10 @@ "etags" (fn &optional SECONDARY FORCE)" t) (autoload 'ethio-fidel-to-sera-region "ethio-util" "\ -Replace all the FIDEL characters in the region to the SERA format. +Convert all the FIDEL characters in the region to the SERA format. +FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation +in ASCII) is the Latin representation of Ethiopic script. The variable `ethio-primary-language' specifies the primary language and `ethio-secondary-language' specifies the secondary. @@ -10723,11 +10806,14 @@ "etags" (fn BEGIN END &optional SECONDARY FORCE)" t) (autoload 'ethio-fidel-to-sera-marker "ethio-util" "\ Convert the regions surrounded by \"\" and \"\" from FIDEL to SERA. +FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation +in ASCII) is the Latin representation of Ethiopic script. The markers \"\" and \"\" themselves are not deleted. (fn &optional FORCE)" t) (autoload 'ethio-modify-vowel "ethio-util" "\ -Modify the vowel of the FIDEL that is under the cursor." t) +Modify the vowel of the FIDEL that is under the cursor. +FIDEL is the Amharic/Ethiopic alphabet." t) (autoload 'ethio-replace-space "ethio-util" "\ Replace ASCII spaces with Ethiopic word separators in the region. @@ -10747,11 +10833,13 @@ "etags" (fn ARG)" t) (autoload 'ethio-fidel-to-tex-buffer "ethio-util" "\ -Convert each fidel characters in the current buffer into a fidel-tex command." t) +Convert each FIDEL characters in the current buffer into a fidel-tex command. +FIDEL is the Amharic/Ethiopic alphabet." t) (autoload 'ethio-tex-to-fidel-buffer "ethio-util" "\ -Convert fidel-tex commands in the current buffer into fidel chars." t) +Convert fidel-tex commands in the current buffer into FIDEL chars. +FIDEL is the Amharic/Ethiopic alphabet." t) (autoload 'ethio-fidel-to-java-buffer "ethio-util" "\ -Convert Ethiopic characters into the Java escape sequences. +Convert Ethiopic characters in the buffer into the Java escape sequences. Each escape sequence is of the form \\uXXXX, where XXXX is the character's codepoint (in hex) in Unicode. @@ -10759,11 +10847,31 @@ "etags" If `ethio-java-save-lowercase' is non-nil, use [0-9a-f]. Otherwise, [0-9A-F].") (autoload 'ethio-java-to-fidel-buffer "ethio-util" "\ -Convert the Java escape sequences into corresponding Ethiopic characters.") +Convert the Java escape sequences in the buffer into Ethiopic characters.") (autoload 'ethio-find-file "ethio-util" "\ -Transliterate file content into Ethiopic depending on filename suffix.") +Transliterate file content into Ethiopic depending on filename suffix. +If the file-name extension is \".sera\", convert from SERA to FIDEL. +If the file-name extension is \".html\", convert regions enclosed +by \"..\" from SERA to FIDEL. +If the file-name extension is \".tex\", convert fidel-tex commands +to FIDEL characters. +If the file-name extension is \".java\", convert Java escape sequences +to FIDEL characters. + +FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation +in ASCII) is the Latin representation of Ethiopic script.") (autoload 'ethio-write-file "ethio-util" "\ -Transliterate Ethiopic characters in ASCII depending on the file extension.") +Transliterate Ethiopic characters to ASCII depending on the file extension. +If the file-name extension is \".sera\", convert from FIDEL to SERA. +If the file-name extension is \".html\", convert FIDEL characters to +SERA regions enclosed by \"..\". +If the file-name extension is \".tex\", convert FIDEL characters +to fidel-tex commands. +If the file-name extension is \".java\", convert FIDEL characters to +Java escape sequences. + +FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation +in ASCII) is the Latin representation of Ethiopic script.") (autoload 'ethio-insert-ethio-space "ethio-util" "\ Insert the Ethiopic word delimiter (the colon-like character). With ARG, insert that many delimiters. @@ -11352,7 +11460,11 @@ "f90" this are the `default' and `header-line' faces: they will both be scaled even if they have an explicit `:height' setting. -See also the related command `global-text-scale-adjust'. +See also the related command `global-text-scale-adjust'. Unlike +that command, which scales the font size with a increment, +`text-scale-adjust' scales the font size with a factor, +`text-scale-mode-step'. With a small `text-scale-mode-step' +factor, the two commands behave similarly. (fn INC)" t) (define-key global-map [pinch] 'text-scale-pinch) @@ -11389,7 +11501,10 @@ "f90" whether the frames are resized to keep the same number of lines and characters per line when the font size is adjusted. -See also the related command `text-scale-adjust'. +See also the related command `text-scale-adjust'. Unlike that +command, which scales the font size with a factor, +`global-text-scale-adjust' scales the font size with an +increment. (fn INCREMENT)" t) (autoload 'buffer-face-mode "face-remap" "\ @@ -14149,10 +14264,14 @@ "gomoku" ;;; Generated autoloads from net/goto-addr.el (autoload 'goto-address-at-point "goto-addr" "\ -Send to the e-mail address or load the URL at point. -Send mail to address at point. See documentation for -`goto-address-find-address-at-point'. If no address is found -there, then load the URL at or before point. +Compose a new message to the e-mail address or open URL at point. + +Compose message to address at point. See documentation for +`goto-address-find-address-at-point'. + +If no e-mail address is found at point, open the URL at or before +point using `browse-url'. With a prefix argument, open the URL +using `browse-url-secondary-browser-function' instead. (fn &optional EVENT)" t) (autoload 'goto-address "goto-addr" "\ @@ -15536,7 +15655,7 @@ hs-special-modes-alist defined as text surrounded by START and END. As a special case, START may be a list of the form (COMPLEX-START -MDATA-SELECTOR), where COMPLEX-START is a regexp w/ multiple parts and +MDATA-SELECTOR), where COMPLEX-START is a regexp with multiple parts and MDATA-SELECTOR an integer that specifies which sub-match is the proper place to adjust point, before calling `hs-forward-sexp-func'. Point is adjusted to the beginning of the specified match. For example, @@ -18305,6 +18424,15 @@ "semantic/java" (register-definition-prefixes "semantic/wisent/java-tags" '("semantic-" "wisent-java-parse-error")) + +;;; Generated autoloads from progmodes/java-ts-mode.el + +(autoload 'java-ts-mode "java-ts-mode" "\ +Major mode for editing Java, powered by tree-sitter. + +(fn)" t) +(register-definition-prefixes "java-ts-mode" '("java-ts-mode-")) + ;;; Generated autoloads from cedet/semantic/wisent/javascript.el @@ -18332,9 +18460,22 @@ "jka-compr" ;;; Generated autoloads from progmodes/js.el (push (purecopy '(js 9)) package--builtin-versions) +(autoload 'js-base-mode "js" "\ +Generic major mode for editing JavaScript. + +This mode is intended to be inherited by concrete major modes. +Currently there are `js-mode' and `js-ts-mode'. + +(fn)" t) (autoload 'js-mode "js" "\ Major mode for editing JavaScript. +(fn)" t) +(autoload 'js-ts-mode "js" "\ +Major mode for editing JavaScript. + +\\ + (fn)" t) (autoload 'js-json-mode "js" "\ @@ -18364,6 +18505,15 @@ "js" (push (purecopy '(json 1 5)) package--builtin-versions) (register-definition-prefixes "json" '("json-")) + +;;; Generated autoloads from progmodes/json-ts-mode.el + +(autoload 'json-ts-mode "json-ts-mode" "\ +Major mode for editing JSON, powered by tree-sitter. + +(fn)" t) +(register-definition-prefixes "json-ts-mode" '("json-ts-")) + ;;; Generated autoloads from jsonrpc.el @@ -21891,6 +22041,11 @@ "oc-basic" (register-definition-prefixes "oc-biblatex" '("org-cite-biblatex-")) + +;;; Generated autoloads from org/oc-bibtex.el + +(register-definition-prefixes "oc-bibtex" '("org-cite-bibtex-export-")) + ;;; Generated autoloads from org/oc-csl.el @@ -22050,7 +22205,7 @@ "opascal" ;;; Generated autoloads from org/org.el -(push (purecopy '(org 9 5 5)) package--builtin-versions) +(push (purecopy '(org 9 6)) package--builtin-versions) (autoload 'org-babel-do-load-languages "org" "\ Load the languages defined in `org-babel-load-languages'. @@ -22097,63 +22252,6 @@ "opascal" \\{org-mode-map} (fn)" t) -(autoload 'org-cycle "org" "\ -TAB-action and visibility cycling for Org mode. - -This is the command invoked in Org mode by the `TAB' key. Its main -purpose is outline visibility cycling, but it also invokes other actions -in special contexts. - -When this function is called with a `\\[universal-argument]' prefix, rotate the entire -buffer through 3 states (global cycling) - 1. OVERVIEW: Show only top-level headlines. - 2. CONTENTS: Show all headlines of all levels, but no body text. - 3. SHOW ALL: Show everything. - -With a `\\[universal-argument] \\[universal-argument]' prefix argument, switch to the startup visibility, -determined by the variable `org-startup-folded', and by any VISIBILITY -properties in the buffer. - -With a `\\[universal-argument] \\[universal-argument] \\[universal-argument]' prefix argument, show the entire buffer, including -any drawers. - -When inside a table, re-align the table and move to the next field. - -When point is at the beginning of a headline, rotate the subtree started -by this line through 3 different states (local cycling) - 1. FOLDED: Only the main headline is shown. - 2. CHILDREN: The main headline and the direct children are shown. - From this state, you can move to one of the children - and zoom in further. - 3. SUBTREE: Show the entire subtree, including body text. -If there is no subtree, switch directly from CHILDREN to FOLDED. - -When point is at the beginning of an empty headline and the variable -`org-cycle-level-after-item/entry-creation' is set, cycle the level -of the headline by demoting and promoting it to likely levels. This -speeds up creation document structure by pressing `TAB' once or several -times right after creating a new headline. - -When there is a numeric prefix, go up to a heading with level ARG, do -a `show-subtree' and return to the previous cursor position. If ARG -is negative, go up that many levels. - -When point is not at the beginning of a headline, execute the global -binding for `TAB', which is re-indenting the line. See the option -`org-cycle-emulate-tab' for details. - -As a special case, if point is at the very beginning of the buffer, if -there is no headline there, and if the variable `org-cycle-global-at-bob' -is non-nil, this function acts as if called with prefix argument (`\\[universal-argument] TAB', -same as `S-TAB') also when called without prefix argument. - -(fn &optional ARG)" t) -(autoload 'org-global-cycle "org" "\ -Cycle the global visibility. For details see `org-cycle'. -With `\\[universal-argument]' prefix ARG, switch to startup visibility. -With a numeric prefix, show all headlines up to that level. - -(fn &optional ARG)" t) (autoload 'org-run-like-in-org-mode "org" "\ Run a command, pretending that the current buffer is in Org mode. This will temporarily bind local variables that are typically bound in @@ -22442,7 +22540,7 @@ "org" When in a restricted subtree, remove it. The restriction will span over the entire file if TYPE is `file', -or if type is \\='(4), or if the cursor is before the first headline +or if TYPE is (4), or if the cursor is before the first headline in the file. Otherwise, only apply the restriction to the current subtree. @@ -22468,7 +22566,7 @@ "org" FILTER can also be an alist with the car of each cell being either `headline' or `category'. For example: - \\='((headline \"IMPORTANT\") + ((headline \"IMPORTANT\") (category \"Work\")) will only add headlines containing IMPORTANT or headlines @@ -22555,7 +22653,7 @@ "org-colview" ;;; Generated autoloads from org/org-compat.el -(register-definition-prefixes "org-compat" '("org-")) +(register-definition-prefixes "org-compat" '("org-" "outline-")) ;;; Generated autoloads from org/org-crypt.el @@ -22575,7 +22673,69 @@ "org-crypt" ;;; Generated autoloads from org/org-ctags.el -(register-definition-prefixes "org-ctags" '("org-ctags-")) +(register-definition-prefixes "org-ctags" '("org-")) + + +;;; Generated autoloads from org/org-cycle.el + +(autoload 'org-cycle "org-cycle" "\ +TAB-action and visibility cycling for Org mode. + +This is the command invoked in Org mode by the `TAB' key. Its main +purpose is outline visibility cycling, but it also invokes other actions +in special contexts. + +When this function is called with a `\\[universal-argument]' prefix, rotate the entire +buffer through 3 states (global cycling) + 1. OVERVIEW: Show only top-level headlines. + 2. CONTENTS: Show all headlines of all levels, but no body text. + 3. SHOW ALL: Show everything. + +With a `\\[universal-argument] \\[universal-argument]' prefix argument, switch to the startup visibility, +determined by the variable `org-startup-folded', and by any VISIBILITY +properties in the buffer. + +With a `\\[universal-argument] \\[universal-argument] \\[universal-argument]' prefix argument, show the entire buffer, including +any drawers. + +When inside a table, re-align the table and move to the next field. + +When point is at the beginning of a headline, rotate the subtree started +by this line through 3 different states (local cycling) + 1. FOLDED: Only the main headline is shown. + 2. CHILDREN: The main headline and the direct children are shown. + From this state, you can move to one of the children + and zoom in further. + 3. SUBTREE: Show the entire subtree, including body text. +If there is no subtree, switch directly from CHILDREN to FOLDED. + +When point is at the beginning of an empty headline and the variable +`org-cycle-level-after-item/entry-creation' is set, cycle the level +of the headline by demoting and promoting it to likely levels. This +speeds up creation document structure by pressing `TAB' once or several +times right after creating a new headline. + +When there is a numeric prefix, go up to a heading with level ARG, do +a `show-subtree' and return to the previous cursor position. If ARG +is negative, go up that many levels. + +When point is not at the beginning of a headline, execute the global +binding for `TAB', which is re-indenting the line. See the option +`org-cycle-emulate-tab' for details. + +As a special case, if point is at the very beginning of the buffer, if +there is no headline there, and if the variable `org-cycle-global-at-bob' +is non-nil, this function acts as if called with prefix argument (`\\[universal-argument] TAB', +same as `S-TAB') also when called without prefix argument. + +(fn &optional ARG)" t) +(autoload 'org-cycle-global "org-cycle" "\ +Cycle the global visibility. For details see `org-cycle'. +With `\\[universal-argument]' prefix ARG, switch to startup visibility. +With a numeric prefix, show all headlines up to that level. + +(fn &optional ARG)" t) +(register-definition-prefixes "org-cycle" '("org-cycle-")) ;;; Generated autoloads from org/org-datetree.el @@ -22607,6 +22767,16 @@ "org-faces" (register-definition-prefixes "org-feed" '("org-feed-")) + +;;; Generated autoloads from org/org-fold.el + +(register-definition-prefixes "org-fold" '("org-fold-")) + + +;;; Generated autoloads from org/org-fold-core.el + +(register-definition-prefixes "org-fold-core" '("org-fold-core-")) + ;;; Generated autoloads from org/org-footnote.el @@ -22670,7 +22840,7 @@ "org-mobile" ;;; Generated autoloads from org/org-mouse.el -(register-definition-prefixes "org-mouse" '("org-mouse-")) +(register-definition-prefixes "org-mouse" '("org-")) ;;; Generated autoloads from org/org-num.el @@ -22682,6 +22852,11 @@ "org-num" (register-definition-prefixes "org-pcomplete" '("org-" "pcomplete/org-mode/")) + +;;; Generated autoloads from org/org-persist.el + +(register-definition-prefixes "org-persist" '("org-persist-")) + ;;; Generated autoloads from org/org-plot.el @@ -22690,7 +22865,7 @@ "org-plot" ;;; Generated autoloads from org/org-protocol.el -(register-definition-prefixes "org-protocol" '("org-protocol-")) +(register-definition-prefixes "org-protocol" '("org-")) ;;; Generated autoloads from org/org-refile.el @@ -22777,12 +22952,19 @@ "org-timer" it is disabled. (fn &optional ARG)" t) +(autoload 'outline-search-level "outline" "\ +Search for the next text property `outline-level'. +The arguments are the same as in `outline-search-text-property', +except the hard-coded property name `outline-level'. +This function is intended to be used in `outline-search-function'. + +(fn &optional BOUND MOVE BACKWARD LOOKING-AT)") (register-definition-prefixes "outline" '("outline-")) ;;; Generated autoloads from org/ox.el -(register-definition-prefixes "ox" '("org-export-")) +(register-definition-prefixes "ox" '("org-")) ;;; Generated autoloads from org/ox-ascii.el @@ -22904,7 +23086,7 @@ "ox-koma-letter" ;;; Generated autoloads from org/ox-latex.el -(register-definition-prefixes "ox-latex" '("org-latex-")) +(register-definition-prefixes "ox-latex" '("org-")) ;;; Generated autoloads from org/ox-man.el @@ -23115,6 +23297,8 @@ "package" ;;; Generated autoloads from emacs-lisp/package-vc.el +(autoload 'package-vc-install-selected-packages "package-vc" "\ +Ensure packages specified in `package-vc-selected-packages' are installed." t) (defvar package-vc-selected-packages 'nil "\ List of packages that must be installed. Each member of the list is of the form (NAME . SPEC), where NAME @@ -23122,34 +23306,74 @@ package-vc-selected-packages - nil, if any package version can be installed; - a version string, if that specific revision is to be installed; -- a property list of the form described in - `package-vc-archive-spec-alist', giving a package - specification. +- a property list, describing a package specification. Valid + key/value pairs are + + `:url' (string) + The URL of the repository used to fetch the package source. + + `:branch' (string) + If given, the name of the branch to checkout after cloning the directory. + + `:lisp-dir' (string) + The repository-relative name of the directory to use for loading the Lisp + sources. If not given, the value defaults to the root directory + of the repository. + + `:main-file' (string) + The main file of the project, relevant to gather package metadata. + If not given, the assumed default is the package name with \".el\" + appended to it. + + `:vc-backend' (symbol) + A symbol of the VC backend to use for cloning the package. The + value ought to be a member of `vc-handled-backends'. If omitted, + `vc-clone' will fall back onto the archive default or on + `package-vc-default-backend'. + + All other keys are ignored. This user option differs from `package-selected-packages' in that -it is meant to be specified manually. You can also use the -function `package-vc-selected-packages' to apply the changes.") +it is meant to be specified manually. If you want to install all +the packages in the list, you cal also use +`package-vc-install-selected-packages'. + +Note that this option will not override an existing source +package installation or revert the checked out revision.") (custom-autoload 'package-vc-selected-packages "package-vc" nil) +(autoload 'package-vc-update-all "package-vc" "\ +Attempt to update all installed VC packages." t) +(autoload 'package-vc-update "package-vc" "\ +Attempt to update the package PKG-DESC. + +(fn PKG-DESC)" t) (autoload 'package-vc-install "package-vc" "\ -Fetch a package NAME-OR-URL and set it up for using with Emacs. -If NAME-OR-URL is a URL, download the package from the repository -at that URL; the function will try to guess the name of the package -from the URL. Otherwise NAME-OR-URL should be a symbol whose name -is the package name, and the URL for the package will be taken from -the package's metadata. +Fetch a PACKAGE and set it up for using with Emacs. + +If PACKAGE is a string containing an URL, download the package +from the repository at that URL; the function will try to guess +the name of the package from the URL. This can be overridden by +passing the optional argument NAME. If PACKAGE is a cons-cell, +it should have the form (NAME . SPEC), where NAME is a symbol +indicating the package name and SPEC is a plist as described in +`package-vc-selected-packages'. Otherwise PACKAGE should be a +symbol whose name is the package name, and the URL for the +package will be taken from the package's metadata. + By default, this function installs the last version of the package available from its repository, but if REV is given and non-nil, it specifies the revision to install. If REV has the special value `:last-release' (interactively, the prefix argument), that stands for the last released version of the package. -When calling from Lisp, optional argument NAME overrides the package -name as deduced from NAME-OR-URL. + Optional argument BACKEND specifies the VC backend to use for cloning the package's repository; this is only possible if NAME-OR-URL is a URL, a string. If BACKEND is omitted or nil, the function -uses `package-vc--guess-backend' to guess the backend. +uses `package-vc-heuristic-alist' to guess the backend. +Note that by default, a VC package will be prioritized over a +regular package, but it will not remove a VC package. -(fn NAME-OR-URL &optional NAME REV BACKEND)" t) +(fn PACKAGE &optional NAME REV BACKEND)" t) (autoload 'package-vc-checkout "package-vc" "\ Clone the sources for PKG-DESC into DIRECTORY and visit that directory. Unlike `package-vc-install', this does not yet set up the package @@ -23171,20 +23395,26 @@ package-vc-selected-packages name from the base name of DIR. (fn DIR NAME)" t) -(autoload 'package-vc-refresh "package-vc" "\ -Refresh the installation for package given by PKG-DESC. -Interactively, prompt for the name of the package to refresh. +(autoload 'package-vc-rebuild "package-vc" "\ +Rebuild the installation for package given by PKG-DESC. +Rebuilding an installation means scraping for new autoload +cookies, re-compiling Emacs Lisp files, building and installing +any documentation, downloading any missing dependencies. This +command does not fetch new revisions from a remote server. That +is the responsibility of `package-vc-update'. Interactively, +prompt for the name of the package to rebuild. (fn PKG-DESC)" t) (autoload 'package-vc-prepare-patch "package-vc" "\ Send patch for REVISIONS to maintainer of the package PKG using SUBJECT. -SUBJECT and REVISIONS are passed on to `vc-prepare-patch', which see. -PKG must be a package description. -Interactively, prompt for PKG, SUBJECT, and REVISIONS. However, -if the current buffer has marked commit log entries, REVISIONS -are the tags of the marked entries, see `log-view-get-marked'. - -(fn PKG SUBJECT REVISIONS)" t) +The function uses `vc-prepare-patch', passing SUBJECT and +REVISIONS directly. PKG-DESC must be a package description. +Interactively, prompt for PKG-DESC, SUBJECT, and REVISIONS. When +invoked with a numerical prefix argument, use the last N +revisions. When invoked interactively in a Log View buffer with +marked revisions, use those. + +(fn PKG-DESC SUBJECT REVISIONS)" t) (register-definition-prefixes "package-vc" '("package-vc-")) @@ -24740,7 +24970,7 @@ "ede/proj-shared" ;;; Generated autoloads from progmodes/project.el -(push (purecopy '(project 0 8 3)) package--builtin-versions) +(push (purecopy '(project 0 9 0)) package--builtin-versions) (autoload 'project-current "project" "\ Return the project instance in DIRECTORY, defaulting to `default-directory'. @@ -24752,14 +24982,14 @@ "ede/proj-shared" The \"transient\" project instance is a special kind of value which denotes a project rooted in that directory and includes all -the files under the directory except for those that should be -ignored (per `project-ignores'). +the files under the directory except for those that match entries +in `vc-directory-exclusion-list' or `grep-find-ignored-files'. See the doc string of `project-find-functions' for the general form of the project instance object. (fn &optional MAYBE-PROMPT DIRECTORY)") -(defvar project-prefix-map (let ((map (make-sparse-keymap))) (define-key map "!" 'project-shell-command) (define-key map "&" 'project-async-shell-command) (define-key map "f" 'project-find-file) (define-key map "F" 'project-or-external-find-file) (define-key map "b" 'project-switch-to-buffer) (define-key map "s" 'project-shell) (define-key map "d" 'project-find-dir) (define-key map "D" 'project-dired) (define-key map "v" 'project-vc-dir) (define-key map "c" 'project-compile) (define-key map "e" 'project-eshell) (define-key map "k" 'project-kill-buffers) (define-key map "p" 'project-switch-project) (define-key map "g" 'project-find-regexp) (define-key map "G" 'project-or-external-find-regexp) (define-key map "r" 'project-query-replace-regexp) (define-key map "x" 'project-execute-extended-command) map) "\ +(defvar project-prefix-map (let ((map (make-sparse-keymap))) (define-key map "!" 'project-shell-command) (define-key map "&" 'project-async-shell-command) (define-key map "f" 'project-find-file) (define-key map "F" 'project-or-external-find-file) (define-key map "b" 'project-switch-to-buffer) (define-key map "s" 'project-shell) (define-key map "d" 'project-find-dir) (define-key map "D" 'project-dired) (define-key map "v" 'project-vc-dir) (define-key map "c" 'project-compile) (define-key map "e" 'project-eshell) (define-key map "k" 'project-kill-buffers) (define-key map "p" 'project-switch-project) (define-key map "g" 'project-find-regexp) (define-key map "G" 'project-or-external-find-regexp) (define-key map "r" 'project-query-replace-regexp) (define-key map "x" 'project-execute-extended-command) (define-key map "\2" 'project-list-buffers) map) "\ Keymap for project commands.") (define-key ctl-x-map "p" project-prefix-map) (autoload 'project-other-window-command "project" "\ @@ -24899,6 +25129,15 @@ project-prefix-map displayed. (fn BUFFER-OR-NAME)" t) +(autoload 'project-list-buffers "project" "\ +Display a list of project buffers. +The list is displayed in a buffer named \"*Buffer List*\". + +By default, all project buffers are listed except those whose names +start with a space (which are for internal use). With prefix argument +ARG, show only buffers that are visiting files. + +(fn &optional ARG)" t) (autoload 'project-kill-buffers "project" "\ Kill the buffers belonging to the current project. Two buffers belong to the same project if their project @@ -25282,11 +25521,25 @@ "puny" Sort Python imports in the current buffer." t) (autoload 'python-fix-imports "python" "\ Add missing imports and remove unused ones from the current buffer." t) +(autoload 'python-base-mode "python" "\ +Generic major mode for editing Python files. + +This is a generic major mode intended to be inherited by +concrete implementations. Currently there are two concrete +implementations: `python-mode' and `python-ts-mode'. + +(fn)" t) (autoload 'python-mode "python" "\ Major mode for editing Python files. \\{python-mode-map} +(fn)" t) +(autoload 'python-ts-mode "python" "\ +Major mode for editing Python files, using tree-sitter library. + +\\{python-ts-mode-map} + (fn)" t) (register-definition-prefixes "python" '("inferior-python-mode" "python-" "run-python-internal")) @@ -26661,6 +26914,13 @@ "rmailsort" (autoload 'rmail-summary "rmailsum" "\ Display a summary of all messages, one line per message." t) +(autoload 'rmail-summary-by-thread "rmailsum" "\ +Display a summary of messages in the same discussion thread as MSGNUM. +Interactively, prompt for MSGNUM, defaulting to the current message. +Threads are based on the \"Subject\", \"References\" and \"In-reply-to\" +headers of the messages. + +(fn &optional MSGNUM)" t) (autoload 'rmail-summary-by-labels "rmailsum" "\ Display a summary of all messages with one or more LABELS. LABELS should be a string containing the desired labels, separated by commas. @@ -27990,6 +28250,14 @@ "sgml-mode" ;;; Generated autoloads from progmodes/sh-script.el (put 'sh-shell 'safe-local-variable 'symbolp) +(autoload 'sh-base-mode "sh-script" "\ +Generic major mode for editing shell scripts. + +This is a generic major mode intended to be inherited by concrete +implementations. Currently there are two: `sh-mode' and +`bash-ts-mode'. + +(fn)" t) (autoload 'sh-mode "sh-script" "\ Major mode for editing shell scripts. This mode works for many shells, since they all have roughly the same syntax, @@ -28044,6 +28312,12 @@ "sgml-mode" (fn)" t) (defalias 'shell-script-mode 'sh-mode) +(autoload 'bash-ts-mode "sh-script" "\ +Major mode for editing Bash shell scripts. +This mode automatically falls back to `sh-mode' if the buffer is +not written in Bash or sh. + +(fn)" t) (register-definition-prefixes "sh-script" '("sh-")) @@ -32188,14 +32462,13 @@ tramp-archive-compression-suffixes List of suffixes which indicate a compressed file. It must be supported by libarchive(3).") (defmacro tramp-archive-autoload-file-name-regexp nil "\ -Regular expression matching archive file names." `(rx bos (group (+ nonl) "." ,(cons '| tramp-archive-suffixes) (32 "." ,(cons '| tramp-archive-compression-suffixes))) (group "/" (* nonl)) eos)) -(autoload 'tramp-archive-file-name-handler "tramp-archive") +Regular expression matching archive file names." (if (<= emacs-major-version 26) '(concat "\\`" "\\(" ".+" "\\." (regexp-opt tramp-archive-suffixes) "\\(?:" "\\." (regexp-opt tramp-archive-compression-suffixes) "\\)*" "\\)" "\\(" "/" ".*" "\\)" "\\'") `(rx bos (group (+ nonl) "." (| ,@tramp-archive-suffixes) (32 "." (| ,@tramp-archive-compression-suffixes))) (group "/" (* nonl)) eos))) (defun tramp-archive-autoload-file-name-handler (operation &rest args) "\ Load Tramp archive file name handler, and perform OPERATION." (defvar tramp-archive-autoload) (let ((default-directory temporary-file-directory) (tramp-archive-autoload tramp-archive-enabled)) (apply #'tramp-autoload-file-name-handler operation args))) -(defun tramp-register-archive-file-name-handler nil "\ -Add archive file name handler to `file-name-handler-alist'." (when (and tramp-archive-enabled (not (rassq #'tramp-archive-file-name-handler file-name-handler-alist))) (add-to-list 'file-name-handler-alist (cons (tramp-archive-autoload-file-name-regexp) #'tramp-archive-autoload-file-name-handler)) (put #'tramp-archive-autoload-file-name-handler 'safe-magic t))) -(add-hook 'after-init-hook #'tramp-register-archive-file-name-handler) -(add-hook 'tramp-archive-unload-hook (lambda nil (remove-hook 'after-init-hook #'tramp-register-archive-file-name-handler))) +(defun tramp-register-archive-autoload-file-name-handler nil "\ +Add archive file name handler to `file-name-handler-alist'." (when (and tramp-archive-enabled (not (rassq 'tramp-archive-file-name-handler file-name-handler-alist))) (add-to-list 'file-name-handler-alist (cons (tramp-archive-autoload-file-name-regexp) #'tramp-archive-autoload-file-name-handler)) (put #'tramp-archive-autoload-file-name-handler 'safe-magic t))) +(add-hook 'after-init-hook #'tramp-register-archive-autoload-file-name-handler) +(add-hook 'tramp-archive-unload-hook (lambda nil (remove-hook 'after-init-hook #'tramp-register-archive-autoload-file-name-handler))) (register-definition-prefixes "tramp-archive" '("tramp-" "with-parsed-tramp-archive-file-name")) @@ -32382,6 +32655,11 @@ "transient" (register-definition-prefixes "tree-widget" '("tree-widget-")) + +;;; Generated autoloads from treesit.el + +(register-definition-prefixes "treesit" '("treesit-")) + ;;; Generated autoloads from tutorial.el @@ -32593,6 +32871,17 @@ type-break-mode (fn WPM &optional WORDLEN FRAC)" t) (register-definition-prefixes "type-break" '("type-break-")) + +;;; Generated autoloads from progmodes/typescript-ts-mode.el + +(add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-ts-mode)) +(add-to-list 'auto-mode-alist '("\\.tsx\\'" . typescript-ts-mode)) +(autoload 'typescript-ts-mode "typescript-ts-mode" "\ +Major mode for editing TypeScript. + +(fn)" t) +(register-definition-prefixes "typescript-ts-mode" '("typescript-ts-mode-")) + ;;; Generated autoloads from international/ucs-normalize.el @@ -32989,6 +33278,9 @@ "url-imap" (fn URL)") +(defconst url-ircs-default-port 6697 "\ +Default port for IRCS connections.") +(defalias 'url-ircs 'url-irc) (register-definition-prefixes "url-irc" '("url-irc-")) @@ -33792,16 +34084,17 @@ 'vc-update Request editing the next VC shell command before execution. This is a prefix command. It affects only a VC command executed immediately after this one." t) + (put 'vc-prepare-patches-separately 'safe-local-variable 'booleanp) (autoload 'vc-prepare-patch "vc" "\ Compose an Email sending patches for REVISIONS to ADDRESSEE. -If `vc-prepare-patches-separately' is nil, SUBJECT will be used -as the default subject for the message (and it will be prompted -for when called interactively). Otherwise a separate message -will be composed for each revision, with SUBJECT derived from the -invidividual commits. - -When invoked interactively in a Log View buffer with marked -revisions, those revisions will be used. +If `vc-prepare-patches-separately' is nil, use SUBJECT as the +default subject for the message, or prompt a subject when invoked +interactively. Otherwise compose a separate message for each +revision, with SUBJECT derived from each revision subject. +When invoked with a numerical prefix argument, use the last N +revisions. +When invoked interactively in a Log View buffer with +marked revisions, use those these. (fn ADDRESSEE SUBJECT REVISIONS)" t) (register-definition-prefixes "vc" '("vc-" "with-vc-properties")) @@ -36143,7 +36436,7 @@ "xmltok" ;;; Generated autoloads from progmodes/xref.el -(push (purecopy '(xref 1 5 1)) package--builtin-versions) +(push (purecopy '(xref 1 6 0)) package--builtin-versions) (autoload 'xref-find-backend "xref") (define-obsolete-function-alias 'xref-pop-marker-stack #'xref-go-back "29.1") (autoload 'xref-go-back "xref" "\ commit 91a9598baf1717f3a504bfa0dc0f180aa04e1def Author: Dmitry Gutov Date: Thu Dec 1 16:24:10 2022 +0200 Update project docs and NEWS * doc/emacs/maintaining.texi (Projects): Update the name. * etc/NEWS: Mention new option (bug#41572). diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 44e9e1896f..9ebb044652 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -1673,16 +1673,16 @@ Projects @cindex project back-end Whether a given directory is a root of some project is determined by the project-specific infrastructure, known as @dfn{project back-end}. -Emacs currently supports two such back-ends: VC (@pxref{Version +Emacs currently supports two such back-ends: VC-aware (@pxref{Version Control}), whereby a VCS repository is considered a project; and EDE (@pxref{EDE}). This is expected to be extended in the future to support additional types of projects. Which files do or don't belong to a project is also determined by -the project back-end. For example, the VC back-end doesn't consider -``ignored'' files (@pxref{VC Ignore}) to be part of the project. -Also, the VC Project back-end considers ``untracked'' files by default. -That behavior is controllable with the variable +the project back-end. For example, the VC-aware back-end doesn't +consider ``ignored'' files (@pxref{VC Ignore}) to be part of the +project. Also, the VC-aware Project back-end considers ``untracked'' +files by default. That behavior is controllable with the variable @code{project-vc-include-untracked}. @menu diff --git a/etc/NEWS b/etc/NEWS index 4e091a5fed..04d8c6948e 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -2224,7 +2224,7 @@ underlying shell instead of using the normal Emacs bindings. also handle ANSI codes for faint, italic and blinking text, displaying it with new 'term-{faint,italic,slow-blink,fast-blink}' faces. -** Xref +** Project +++ *** 'project-find-file' and 'project-or-external-find-file' now accept @@ -2239,6 +2239,15 @@ This command displays a list of buffers from the current project. Customize the user option 'project-kill-buffers-display-buffer-list' to enable the display of the buffer list. +*** New user option 'project-vc-extra-root-markers' +Use it to add detection of nested projects (inside a VCS repository), +or projects outside of VCS repositories. + +As a consequence, the 'VC project backend' is formally renamed to +'VC-aware project backend'. + +** Xref + +++ *** New command 'xref-go-forward'. It is bound to 'C-M-,' and jumps to the location where 'xref-go-back' commit b7b2455c5f656a42e08cf8c9d66cfda4406dd2f2 Author: Stefan Kangas Date: Thu Dec 1 06:01:28 2022 +0100 Update publicsuffix.txt from upstream * etc/publicsuffix.txt: Update from https://publicsuffix.org/list/public_suffix_list.dat dated 2022-11-29 18:15:27 UTC. (cherry picked from commit de00aef3e151e0eefe20feda74cf90578e8ff109) diff --git a/etc/publicsuffix.txt b/etc/publicsuffix.txt index 025cf47274..60d72fd0d5 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-10-29T15:16:24Z +// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2022-11-29T15:14:18Z // This list is auto-generated, don't edit it manually. // aaa : 2015-02-26 American Automobile Association, Inc. aaa @@ -7221,9 +7221,6 @@ aco // actor : 2013-12-12 Dog Beach, LLC actor -// adac : 2015-07-16 Allgemeiner Deutscher Automobil-Club e.V. (ADAC) -adac - // ads : 2014-12-04 Charleston Road Registry Inc. ads @@ -8511,7 +8508,7 @@ hisamitsu // hitachi : 2014-10-31 Hitachi, Ltd. hitachi -// hiv : 2014-03-13 UNR Corp. +// hiv : 2014-03-13 Internet Naming Company LLC hiv // hkt : 2015-05-14 PCCW-HKT DataCom Services Limited @@ -8715,7 +8712,7 @@ jpmorgan // jprs : 2014-09-18 Japan Registry Services Co., Ltd. jprs -// juegos : 2014-03-20 UNR Corp. +// juegos : 2014-03-20 Internet Naming Company LLC juegos // juniper : 2015-07-30 JUNIPER NETWORKS, INC. @@ -9441,7 +9438,7 @@ promo // properties : 2013-12-05 Binky Moon, LLC properties -// property : 2014-05-22 UNR Corp. +// property : 2014-05-22 Internet Naming Company LLC property // protection : 2015-04-23 XYZ.COM LLC @@ -9717,7 +9714,7 @@ sew // sex : 2014-11-13 ICM Registry SX LLC sex -// sexy : 2013-09-11 UNR Corp. +// sexy : 2013-09-11 Internet Naming Company LLC sexy // sfr : 2015-08-13 Societe Francaise du Radiotelephone - SFR @@ -10065,7 +10062,7 @@ travelers // travelersinsurance : 2015-03-26 Travelers TLD, LLC travelersinsurance -// trust : 2014-10-16 UNR Corp. +// trust : 2014-10-16 Internet Naming Company LLC trust // trv : 2015-03-26 Travelers TLD, LLC @@ -10658,6 +10655,10 @@ graphox.us // Submitted by Craig Jellick *.on-acorn.io +// ActiveTrail: https://www.activetrail.biz/ +// Submitted by Ofer Kalaora +activetrail.biz + // Adobe : https://www.adobe.com/ // Submitted by Ian Boston and Lars Trieloff adobeaemcloud.com @@ -10702,6 +10703,10 @@ altervista.org // Submitted by Cyril alwaysdata.net +// Amaze Software : https://amaze.co +// Submitted by Domain Admin +myamaze.net + // Amazon : https://www.amazon.com/ // Submitted by AWS Security // Subsections of Amazon/subsidiaries will appear until "concludes" tag @@ -11178,8 +11183,11 @@ cloudcontrolapp.com // Cloudflare, Inc. : https://www.cloudflare.com/ // Submitted by Cloudflare Team -pages.dev +cf-ipfs.com +cloudflare-ipfs.com trycloudflare.com +pages.dev +r2.dev workers.dev // Clovyr : https://clovyr.io @@ -12447,7 +12455,6 @@ herokussl.com // Hibernating Rhinos // Submitted by Oren Eini ravendb.cloud -myravendb.com ravendb.community ravendb.me development.run @@ -13809,6 +13816,8 @@ direct.quickconnect.to // Tabit Technologies Ltd. : https://tabit.cloud/ // Submitted by Oren Agiv tabitorder.co.il +mytabit.co.il +mytabit.com // TAIFUN Software AG : http://taifun-software.de // Submitted by Bjoern Henke @@ -13841,10 +13850,6 @@ telebit.app telebit.io *.telebit.xyz -// The Gwiddle Foundation : https://gwiddlefoundation.org.uk -// Submitted by Joshua Bayfield -gwiddle.co.uk - // Thingdust AG : https://thingdust.com/ // Submitted by Adrian Imboden *.firenet.ch @@ -13879,10 +13884,6 @@ pages.torproject.net bloxcms.com townnews-staging.com -// TradableBits: https://tradablebits.com -// Submitted by Dmitry Khrisanov dmitry@tradablebits.com -tbits.me - // TrafficPlex GmbH : https://www.trafficplex.de/ // Submitted by Phillipp Röll 12hp.at commit f7c3abb8d2d3a3d26a1198fed8157111bed41d6c Merge: ff64a85b2d 5d1a1019c6 Author: Stefan Kangas Date: Thu Dec 1 14:38:29 2022 +0100 Merge from origin/emacs-29 5d1a1019c6 Add highlighting Python operators (bug#59629) 8b3baadf67 Fix compilation of Org 9.6 on MS-Windows 3b5b99ac91 * doc/lispref/frames.texi (Input Focus): Clarify for XInpu... 4b2f5425d7 Fix types in various defcustom declarations commit 5d1a1019c61769e99782cc963a61673a194444d3 Author: kobarity Date: Sun Nov 27 18:52:32 2022 +0900 Add highlighting Python operators (bug#59629) * lisp/progmodes/python.el (python-rx): Remove "is" and "not" from operator. (python-font-lock-keywords-maximum-decoration): Add highlighting operators. * test/lisp/progmodes/python-tests.el (python-font-lock-assignment-statement-1) (python-font-lock-assignment-statement-2) (python-font-lock-assignment-statement-3) (python-font-lock-assignment-statement-4) (python-font-lock-assignment-statement-5) (python-font-lock-assignment-statement-6) (python-font-lock-assignment-statement-7) (python-font-lock-assignment-statement-8) (python-font-lock-assignment-statement-9) (python-font-lock-assignment-statement-10) (python-font-lock-assignment-statement-11) (python-font-lock-assignment-statement-12) (python-font-lock-assignment-statement-13) (python-font-lock-assignment-statement-14) (python-font-lock-assignment-statement-15) (python-font-lock-assignment-statement-16) (python-font-lock-assignment-statement-17) (python-font-lock-assignment-statement-18) (python-font-lock-assignment-statement-multiline-1) (python-font-lock-assignment-statement-multiline-2) (python-font-lock-assignment-statement-multiline-3) (python-font-lock-assignment-statement-multiline-4) (python-font-lock-assignment-statement-multiline-5) (python-font-lock-assignment-statement-multiline-6) (python-font-lock-escape-sequence-multiline-string): Modify expectations to include faces for operators. (python-font-lock-operator-1, python-font-lock-operator-2): New tests. diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index fc80c755e4..eb34b93e2f 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -454,7 +454,7 @@ python-rx (close-paren (or "}" "]" ")")) (simple-operator (any ?+ ?- ?/ ?& ?^ ?~ ?| ?* ?< ?> ?= ?%)) (not-simple-operator (not (or simple-operator ?\n))) - (operator (or "==" ">=" "is" "not" + (operator (or "==" ">=" "**" "//" "<<" ">>" "<=" "!=" "+" "-" "/" "&" "^" "~" "|" "*" "<" ">" "=" "%")) @@ -791,6 +791,7 @@ python-font-lock-keywords-maximum-decoration (? (or ")" "]") (* sp-bsnl)) (group assignment-operator))) (1 font-lock-variable-name-face) + (2 'font-lock-operator-face) (,(python-rx grouped-assignment-target) (progn (goto-char (match-end 1)) ; go back after the first symbol @@ -806,8 +807,9 @@ python-font-lock-keywords-maximum-decoration (python-rx (or line-start ?\;) (* sp-bsnl) grouped-assignment-target (* sp-bsnl) (? ?: (* sp-bsnl) (+ not-simple-operator) (* sp-bsnl)) - assignment-operator)) - (1 font-lock-variable-name-face)) + (group assignment-operator))) + (1 font-lock-variable-name-face) + (2 'font-lock-operator-face)) ;; special cases ;; (a) = 5 ;; [a] = 5, @@ -817,8 +819,11 @@ python-font-lock-keywords-maximum-decoration (or "[" "(") (* sp-nl) grouped-assignment-target (* sp-nl) (or ")" "]") (* sp-bsnl) - assignment-operator)) - (1 font-lock-variable-name-face)) + (group assignment-operator))) + (1 font-lock-variable-name-face) + (2 'font-lock-operator-face)) + ;; Operators. + (,(python-rx operator) . 'font-lock-operator-face) ;; escape sequences within bytes literals ;; "\\" "\'" "\a" "\b" "\f" "\n" "\r" "\t" "\v" ;; "\ooo" character with octal value ooo diff --git a/test/lisp/progmodes/python-tests.el b/test/lisp/progmodes/python-tests.el index 3efc28c7ed..17d6d8aa70 100644 --- a/test/lisp/progmodes/python-tests.el +++ b/test/lisp/progmodes/python-tests.el @@ -280,28 +280,33 @@ python-font-lock-assignment-statement-1 "a, b, c = 1, 2, 3" '((1 . font-lock-variable-name-face) (2) (4 . font-lock-variable-name-face) (5) - (7 . font-lock-variable-name-face) (8)))) + (7 . font-lock-variable-name-face) (8) + (9 . font-lock-operator-face) (10)))) (ert-deftest python-font-lock-assignment-statement-2 () (python-tests-assert-faces "a, *b, c = 1, 2, 3, 4, 5" '((1 . font-lock-variable-name-face) (2) + (4 . font-lock-operator-face) (5 . font-lock-variable-name-face) (6) - (8 . font-lock-variable-name-face) (9)))) + (8 . font-lock-variable-name-face) (9) + (10 . font-lock-operator-face) (11)))) (ert-deftest python-font-lock-assignment-statement-3 () (python-tests-assert-faces "[a, b] = (1, 2)" '((1) (2 . font-lock-variable-name-face) (3) - (5 . font-lock-variable-name-face) (6)))) + (5 . font-lock-variable-name-face) (6) + (8 . font-lock-operator-face) (9)))) (ert-deftest python-font-lock-assignment-statement-4 () (python-tests-assert-faces "(l[1], l[2]) = (10, 11)" '((1) (2 . font-lock-variable-name-face) (3) - (8 . font-lock-variable-name-face) (9)))) + (8 . font-lock-variable-name-face) (9) + (14 . font-lock-operator-face) (15)))) (ert-deftest python-font-lock-assignment-statement-5 () (python-tests-assert-faces @@ -310,22 +315,29 @@ python-font-lock-assignment-statement-5 (2 . font-lock-variable-name-face) (3) (5 . font-lock-variable-name-face) (6) (8 . font-lock-variable-name-face) (9) + (11 . font-lock-operator-face) (12 . font-lock-variable-name-face) (13) + (15 . font-lock-operator-face) (16) + (17 . font-lock-operator-face) (18 . font-lock-variable-name-face) (19) - (21 . font-lock-variable-name-face) (22)))) + (21 . font-lock-variable-name-face) (22) + (23 . font-lock-operator-face) (24)))) (ert-deftest python-font-lock-assignment-statement-6 () (python-tests-assert-faces "(a,) = 'foo'," '((1) (2 . font-lock-variable-name-face) (3) + (6 . font-lock-operator-face) (7) (8 . font-lock-string-face) (13)))) (ert-deftest python-font-lock-assignment-statement-7 () (python-tests-assert-faces "(*a,) = ['foo', 'bar', 'baz']" '((1) + (2 . font-lock-operator-face) (3 . font-lock-variable-name-face) (4) + (7 . font-lock-operator-face) (8) (10 . font-lock-string-face) (15) (17 . font-lock-string-face) (22) (24 . font-lock-string-face) (29)))) @@ -334,6 +346,7 @@ python-font-lock-assignment-statement-8 (python-tests-assert-faces "d = D('a', ['b'], 'c')" '((1 . font-lock-variable-name-face) (2) + (3 . font-lock-operator-face) (4) (7 . font-lock-string-face) (10) (13 . font-lock-string-face) (16) (19 . font-lock-string-face) (22)))) @@ -344,7 +357,9 @@ python-font-lock-assignment-statement-9 '((1) (3 . font-lock-variable-name-face) (4) (8 . font-lock-variable-name-face) (9) + (14 . font-lock-operator-face) (15) (17 . font-lock-variable-name-face) (18) + (19 . font-lock-operator-face) (20) (21 . font-lock-string-face) (24) (26 . font-lock-string-face) (29) (31 . font-lock-string-face) (34) @@ -355,7 +370,8 @@ python-font-lock-assignment-statement-10 (python-tests-assert-faces "a: int = 5" '((1 . font-lock-variable-name-face) (2) - (4 . font-lock-builtin-face) (7)))) + (4 . font-lock-builtin-face) (7) + (8 . font-lock-operator-face) (9)))) (ert-deftest python-font-lock-assignment-statement-11 () (python-tests-assert-faces @@ -364,13 +380,15 @@ python-font-lock-assignment-statement-11 (19 . font-lock-builtin-face) (22) (40 . font-lock-builtin-face) (43) (46 . font-lock-builtin-face) (49) + (52 . font-lock-operator-face) (53) (55 . font-lock-constant-face) (59) (61 . font-lock-string-face) (66)))) (ert-deftest python-font-lock-assignment-statement-12 () (python-tests-assert-faces "c: Collection = {1, 2, 3}" - '((1 . font-lock-variable-name-face) (2)))) + '((1 . font-lock-variable-name-face) (2) + (15 . font-lock-operator-face) (16)))) (ert-deftest python-font-lock-assignment-statement-13 () (python-tests-assert-faces @@ -378,6 +396,7 @@ python-font-lock-assignment-statement-13 '((1 . font-lock-variable-name-face) (2) (12 . font-lock-builtin-face) (15) (17 . font-lock-builtin-face) (20) + (22 . font-lock-operator-face) (23) (28 . font-lock-string-face) (33) (38 . font-lock-string-face) (43)))) @@ -386,28 +405,38 @@ python-font-lock-assignment-statement-14 "(a) = 5; (b) = 6" '((1) (2 . font-lock-variable-name-face) (3) - (11 . font-lock-variable-name-face) (12)))) + (5 . font-lock-operator-face) (6) + (11 . font-lock-variable-name-face) (12) + (14 . font-lock-operator-face) (15)))) (ert-deftest python-font-lock-assignment-statement-15 () (python-tests-assert-faces "[a] = 5,; [b] = 6," '((1) (2 . font-lock-variable-name-face) (3) - (12 . font-lock-variable-name-face) (13)))) + (5 . font-lock-operator-face) (6) + (12 . font-lock-variable-name-face) (13) + (15 . font-lock-operator-face) (16)))) (ert-deftest python-font-lock-assignment-statement-16 () (python-tests-assert-faces "[*a] = 5, 6; [*b] = 7, 8" '((1) + (2 . font-lock-operator-face) (3 . font-lock-variable-name-face) (4) - (16 . font-lock-variable-name-face) (17)))) + (6 . font-lock-operator-face) (7) + (15 . font-lock-operator-face) + (16 . font-lock-variable-name-face) (17) + (19 . font-lock-operator-face) (20)))) (ert-deftest python-font-lock-assignment-statement-17 () (python-tests-assert-faces "(a) = (b) = 1" - `((1) + '((1) (2 . font-lock-variable-name-face) (3) - (8 . font-lock-variable-name-face) (9)))) + (5 . font-lock-operator-face) (6) + (8 . font-lock-variable-name-face) (9) + (11 . font-lock-operator-face) (12)))) (ert-deftest python-font-lock-assignment-statement-18 () (python-tests-assert-faces @@ -420,13 +449,21 @@ python-font-lock-assignment-statement-18 return res " '((1 . font-lock-variable-name-face) (10) + (11 . font-lock-operator-face) (12) (13 . font-lock-builtin-face) (16) (18 . font-lock-keyword-face) (21) (22 . font-lock-function-name-face) (23) + (38 . font-lock-operator-face) (40) (56 . font-lock-variable-name-face) (57) + (58 . font-lock-operator-face) (59) + (62 . font-lock-operator-face) (63) (70 . font-lock-variable-name-face) (72) + (94 . font-lock-operator-face) (95) + (102 . font-lock-operator-face) (103) (111 . font-lock-variable-name-face) (114) + (126 . font-lock-operator-face) (127) (128 . font-lock-builtin-face) (131) + (136 . font-lock-operator-face) (137) (144 . font-lock-keyword-face) (150)))) (ert-deftest python-font-lock-assignment-statement-multiline-1 () @@ -442,7 +479,8 @@ python-font-lock-assignment-statement-multiline-1 " '((1) (8 . font-lock-variable-name-face) (9) - (15 . font-lock-variable-name-face) (16)) + (15 . font-lock-variable-name-face) (16) + (19 . font-lock-operator-face) (20)) "#" "=")) (ert-deftest python-font-lock-assignment-statement-multiline-2 () @@ -453,7 +491,9 @@ python-font-lock-assignment-statement-multiline-2 ] # 5, 6 " '((1) - (9 . font-lock-variable-name-face) (10)) + (8 . font-lock-operator-face) + (9 . font-lock-variable-name-face) (10) + (13 . font-lock-operator-face) (14)) "#" "=")) (ert-deftest python-font-lock-assignment-statement-multiline-3 () @@ -471,7 +511,8 @@ python-font-lock-assignment-statement-multiline-3 3" '((1 . font-lock-variable-name-face) (2) (15 . font-lock-variable-name-face) (16) - (29 . font-lock-variable-name-face) (30)) + (29 . font-lock-variable-name-face) (30) + (36 . font-lock-operator-face) (37)) "#" "=")) (ert-deftest python-font-lock-assignment-statement-multiline-4 () @@ -482,7 +523,8 @@ python-font-lock-assignment-statement-multiline-4 #\\ 5" '((1 . font-lock-variable-name-face) (2) - (15 . font-lock-builtin-face) (18)) + (15 . font-lock-builtin-face) (18) + (24 . font-lock-operator-face) (25)) "#" "=")) (ert-deftest python-font-lock-assignment-statement-multiline-5 () @@ -500,7 +542,9 @@ python-font-lock-assignment-statement-multiline-5 6" '((1) (8 . font-lock-variable-name-face) (9) - (46 . font-lock-variable-name-face) (47)) + (18 . font-lock-operator-face) (19) + (46 . font-lock-variable-name-face) (47) + (60 . font-lock-operator-face) (61)) "#" "=")) (ert-deftest python-font-lock-assignment-statement-multiline-6 () @@ -518,9 +562,33 @@ python-font-lock-assignment-statement-multiline-6 6" '((1) (7 . font-lock-variable-name-face) (8) - (43 . font-lock-variable-name-face) (44)) + (16 . font-lock-operator-face) (17) + (43 . font-lock-variable-name-face) (44) + (56 . font-lock-operator-face) (57)) "#" "=")) +(ert-deftest python-font-lock-operator-1 () + (python-tests-assert-faces + "1 << 2 ** 3 == +4%-5|~6&7^8%9" + '((1) + (3 . font-lock-operator-face) (5) + (8 . font-lock-operator-face) (10) + (13 . font-lock-operator-face) (15) + (16 . font-lock-operator-face) (17) + (18 . font-lock-operator-face) (20) + (21 . font-lock-operator-face) (23) + (24 . font-lock-operator-face) (25) + (26 . font-lock-operator-face) (27) + (28 . font-lock-operator-face) (29)))) + +(ert-deftest python-font-lock-operator-2 () + "Keyword operators are font-locked as keywords." + (python-tests-assert-faces + "is_ is None" + '((1) + (5 . font-lock-keyword-face) (7) + (8 . font-lock-constant-face)))) + (ert-deftest python-font-lock-escape-sequence-string-newline () (python-tests-assert-faces "'\\n' @@ -603,12 +671,16 @@ python-font-lock-escape-sequence-multiline-string (196 . font-lock-constant-face) (215 . font-lock-string-face) (218) (221 . font-lock-string-face) (254) + (259 . font-lock-operator-face) (260) (271 . font-lock-string-face) (274) (277 . font-lock-string-face) (310) + (315 . font-lock-operator-face) (316) (327 . font-lock-string-face) (330) (333 . font-lock-string-face) (366) + (371 . font-lock-operator-face) (372) (383 . font-lock-string-face) (386) (389 . font-lock-string-face) (422) + (427 . font-lock-operator-face) (428) (439 . font-lock-string-face) (442) (444 . font-lock-string-face) (497) (499 . font-lock-string-face) (552) commit 8b3baadf671b7b3d5058808c4655eca8bd46015e Author: Eli Zaretskii Date: Thu Dec 1 14:40:47 2022 +0200 Fix compilation of Org 9.6 on MS-Windows * lisp/org/org-clock.el (org-x11idle-exists-p): Don't try to invoke "command x11idle" on MS-Windows and MS-DOS. This fixes a hang during byte-compilation of Org. diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el index 2758aeed40..f28805d5e6 100644 --- a/lisp/org/org-clock.el +++ b/lisp/org/org-clock.el @@ -1198,8 +1198,11 @@ org-mac-idle-seconds (string-to-number (shell-command-to-string "ioreg -c IOHIDSystem | perl -ane 'if (/Idle/) {$idle=(pop @F)/1000000000; print $idle; last}'"))) (defvar org-x11idle-exists-p - ;; Check that x11idle exists - (and (eq 0 (call-process-shell-command + ;; Check that x11idle exists. But don't do that on DOS/Windows, + ;; since the command definitely does NOT exist there, and invoking + ;; COMMAND.COM on MS-Windows is a bad idea -- it hangs. + (and (null (memq system-type '(windows-nt ms-dos))) + (eq 0 (call-process-shell-command (format "command -v %s" org-clock-x11idle-program-name))) ;; Check that x11idle can retrieve the idle time ;; FIXME: Why "..-shell-command" rather than just `call-process'? commit 3b5b99ac919eff05374d74b4a052d33c34c56742 Author: Po Lu Date: Thu Dec 1 19:15:28 2022 +0800 * doc/lispref/frames.texi (Input Focus): Clarify for XInput 2 support. diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index b3f1a29ae8..a656964198 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -2854,10 +2854,18 @@ Input Focus Emacs itself has only one selected frame, Emacs can have frames on many different terminals (recall that a connection to a window system counts as a terminal), and each terminal has its own idea of which -frame has input focus. When you set the input focus to a frame, you -set the focus for that frame's terminal, but frames on other terminals +frame has input focus. Under the X Window System, where user input is +organized into individual ``seats'' of input, each seat in turn can +have its own specific input focus. When you set the input focus to a +frame, you set the focus for that frame's terminal on the last seat +which interacted with Emacs, but frames on other terminals and seats may still remain focused. +If the input focus is set before any user interaction has occurred on +the specified terminal, then the X server picks a random seat +(normally the one with the lowest number) and sets the input focus +there. + Lisp programs can switch frames temporarily by calling the function @code{select-frame}. This does not alter the window system's concept of focus; rather, it escapes from the window manager's control until commit 9210eac58525f79e6cc6e6ae749c7a84e2897984 Author: Manuel Giraud Date: Fri Nov 25 15:50:41 2022 +0100 Make sure the menu-bar height is updated on X when fonts change * src/xdisp.c (display_menu_bar) [HAVE_X_WINDOWS]: Update menu_bar_window height in non-toolkit X builds. (Bug#59351) diff --git a/src/xdisp.c b/src/xdisp.c index b09aa6ec96..17fff71fda 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -26310,11 +26310,11 @@ display_menu_bar (struct window *w) it.first_visible_x = 0; it.last_visible_x = FRAME_PIXEL_WIDTH (f); #elif defined (HAVE_X_WINDOWS) /* X without toolkit. */ + struct window *menu_w; if (FRAME_WINDOW_P (f)) { /* Menu bar lines are displayed in the desired matrix of the dummy window menu_bar_window. */ - struct window *menu_w; menu_w = XWINDOW (f->menu_bar_window); init_iterator (&it, menu_w, -1, -1, menu_w->desired_matrix->rows, MENU_FACE_ID); @@ -26373,6 +26373,22 @@ display_menu_bar (struct window *w) /* Compute the total height of the lines. */ compute_line_metrics (&it); + +#if defined (HAVE_X_WINDOWS) && !defined (USE_X_TOOLKIT) && !defined (USE_GTK) + /* With the non-toolkit version, modify the menu bar window height + accordingly. */ + if (FRAME_WINDOW_P (it.f)) + { + struct glyph_row *row = it.glyph_row; + int delta_height = ((row->y + row->height) + - WINDOW_BOX_HEIGHT_NO_MODE_LINE (menu_w)); + if (delta_height != 0) + { + FRAME_MENU_BAR_HEIGHT (it.f) += delta_height; + adjust_frame_size (it.f, -1, -1, 3, false, Qmenu_bar_lines); + } + } +#endif } /* Deep copy of a glyph row, including the glyphs. */ commit 4b2f5425d7af1a6f992ad8ce0a4452a2e778815a Author: Mattias Engdegård Date: Thu Dec 1 12:40:28 2022 +0100 Fix types in various defcustom declarations * lisp/org/ob-clojure.el (ob-clojure-babashka-command, ob-clojure-nbb-command): Account for the possibility of nil (commands absent). * lisp/org/org.el (org-safe-remote-resources): * lisp/org/ox-md.el (org-md-toplevel-hlevel): * lisp/progmodes/project.el (project-vc-extra-root-markers): Fix incorrect or invalid types. diff --git a/lisp/org/ob-clojure.el b/lisp/org/ob-clojure.el index 6f1425a842..b424cf48ff 100644 --- a/lisp/org/ob-clojure.el +++ b/lisp/org/ob-clojure.el @@ -101,13 +101,13 @@ org-babel-clojure-default-ns (defcustom ob-clojure-babashka-command (executable-find "bb") "Path to the babashka executable." - :type 'file + :type '(choice file (const nil)) :group 'org-babel :package-version '(Org . "9.6")) (defcustom ob-clojure-nbb-command (executable-find "nbb") "Path to the nbb executable." - :type 'file + :type '(choice file (const nil)) :group 'org-babel :package-version '(Org . "9.6")) diff --git a/lisp/org/org.el b/lisp/org/org.el index be922a5da0..ab6212dacc 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -1408,7 +1408,7 @@ org-safe-remote-resources remote resources." :group 'org :package-version '(Org . "9.6") - :type '(list regexp)) + :type '(repeat regexp)) (defcustom org-open-non-existing-files nil "Non-nil means `org-open-file' opens non-existing files. diff --git a/lisp/org/ox-md.el b/lisp/org/ox-md.el index dee6dbf1fc..01e0aa0491 100644 --- a/lisp/org/ox-md.el +++ b/lisp/org/ox-md.el @@ -87,7 +87,7 @@ org-md-toplevel-hlevel headings for its own use." :group 'org-export-md :package-version '(Org . "9.6") - :type 'string) + :type 'natnum) diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index dfd3d5c7ab..1cf50df036 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el @@ -453,7 +453,7 @@ project-vc-extra-root-markers In either case, their behavior will still obey the relevant variables, such as `project-vc-ignores' or `project-vc-name'." - :type 'list + :type '(repeat string) :version "29.1" :package-version '(project . "0.9.0") :safe (lambda (val) (and (listp val) (cl-every #'stringp val))))