From 51f391998b19a94d35d743952006afd71ad7f545 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Sat, 13 Jan 2024 20:11:21 +0200 Subject: [PATCH 1/7] Add @kindex in manuals for existing keybindings on 'C-x x/w' (bug#13167) * doc/emacs/buffers.texi (Misc Buffer): Add @kindex for 'C-x x r', 'C-x x u', 'C-x x i'. * doc/emacs/display.texi (Line Truncation): Add @kindex for 'C-x x t'. * doc/emacs/files.texi (Reverting): Add @kindex for 'C-x x g'. * doc/emacs/windows.texi (Change Window): Use new keybinding 'C-x w 0' instead of 'M-x delete-windows-on'. * doc/misc/info.texi (Create Info buffer): Add @kindex for 'C-x x n'. --- doc/emacs/buffers.texi | 3 +++ doc/emacs/display.texi | 1 + doc/emacs/files.texi | 1 + doc/emacs/windows.texi | 2 +- doc/misc/info.texi | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi index c592eec555d..8542243dadf 100644 --- a/doc/emacs/buffers.texi +++ b/doc/emacs/buffers.texi @@ -262,12 +262,14 @@ non-@code{nil}. If you change the option @code{view-read-only} to a non-@code{nil} value, making the buffer read-only with @kbd{C-x C-q} also enables View mode in the buffer (@pxref{View Mode}). +@kindex C-x x r @findex rename-buffer @kbd{C-x x r} (@code{rename-buffer} changes the name of the current buffer. You specify the new name as a minibuffer argument; there is no default. If you specify a name that is in use for some other buffer, an error happens and no renaming is done. +@kindex C-x x u @findex rename-uniquely @kbd{C-x x u} (@code{rename-uniquely}) renames the current buffer to a similar name with a numeric suffix added to make it both different @@ -282,6 +284,7 @@ buffers with particular names. (With some of these features, such as buffer before using the command again, otherwise it will reuse the current buffer despite the name change.) +@kindex C-x x i The commands @kbd{M-x append-to-buffer} and @kbd{C-x x i} (@code{insert-buffer}) can also be used to copy text from one buffer to another. @xref{Accumulating Text}. diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index e6a43bf74a8..6db9e8344c6 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -1986,6 +1986,7 @@ the fringe indicates truncation at either end of the line. On text terminals, this is indicated with @samp{$} signs in the rightmost and/or leftmost columns. +@kindex C-x x t @vindex truncate-lines @findex toggle-truncate-lines Horizontal scrolling automatically causes line truncation diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 44c58800197..36f72d42ba2 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -1062,6 +1062,7 @@ revert it automatically if it has changed---provided the buffer itself is not modified. (If you have edited the text, it would be wrong to discard your changes.) +@kindex C-x x g @vindex revert-buffer-quick-short-answers @findex revert-buffer-quick The @kbd{C-x x g} keystroke is bound to the diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi index db3dea1d06e..302d3dcbf8c 100644 --- a/doc/emacs/windows.texi +++ b/doc/emacs/windows.texi @@ -287,7 +287,7 @@ Delete all windows in the selected frame except the selected window Delete the selected window and kill the buffer that was showing in it (@code{kill-buffer-and-window}). The last character in this key sequence is a zero. -@item M-x delete-windows-on @key{RET} @var{buffer} @key{RET} +@item C-x w 0 @key{RET} @var{buffer} @key{RET} Delete windows showing the specified @var{buffer}. @item C-x ^ Make selected window taller (@code{enlarge-window}). diff --git a/doc/misc/info.texi b/doc/misc/info.texi index 31b314cb9a0..01c7f614e7d 100644 --- a/doc/misc/info.texi +++ b/doc/misc/info.texi @@ -1148,6 +1148,7 @@ move between menu items. @section @kbd{M-n} creates a new independent Info buffer in Emacs @kindex M-n @r{(Info mode)} +@kindex C-x x n @findex clone-buffer @cindex multiple Info buffers If you are reading Info in Emacs, you can select a new independent From 1f97a8787957e49f1893b9ac73c95228f6ac1a13 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 13 Jan 2024 20:38:34 +0200 Subject: [PATCH 2/7] Fix info-xref-tests * doc/lispintro/emacs-lisp-intro.texi (How let Binds Variables): Fix cross-reference. (Bug#68428) * test/lisp/info-xref-tests.el (info-xref-test-write-file): Fix test on MS-Windows when run from MSYS Bash. --- doc/lispintro/emacs-lisp-intro.texi | 2 +- test/lisp/info-xref-tests.el | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index b3fe8ce4589..a06822ce539 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -3769,7 +3769,7 @@ the first line of your Emacs Lisp file: ;;; -*- lexical-binding: t -*- @end example -For more information about this, @pxref{Selecting Lisp Dialect, , , +For more information about this, @pxref{Variable Scoping, , , elisp, The Emacs Lisp Reference Manual}. @menu diff --git a/test/lisp/info-xref-tests.el b/test/lisp/info-xref-tests.el index 72b6706a22c..c8eb18501f3 100644 --- a/test/lisp/info-xref-tests.el +++ b/test/lisp/info-xref-tests.el @@ -92,7 +92,15 @@ text. " ) (write-region nil nil file nil 'silent)) - (should (equal 0 (call-process "makeinfo" file)))) + (if (and (eq system-type 'windows-nt) + (executable-find "sh")) + ;; If we are running from MSYS Bash, makeinfo.bat might find the + ;; wrong version of Perl, so make sure to run the shell script + ;; named just 'makeinfo' instead, because it names the correct + ;; Perl. + (should (equal 0 (call-process "sh" nil t nil + "-c" (format "makeinfo '%s'" file)))) + (should (equal 0 (call-process "makeinfo" file))))) (ert-deftest info-xref-test-makeinfo () "Test that info-xref can parse basic makeinfo output." From 7d869a04029798410773fe6071e76b556d3a9ee2 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sun, 14 Jan 2024 14:47:39 +0100 Subject: [PATCH 3/7] Doc fix in auth-source-read-char-choice * lisp/auth-source.el (auth-source-read-char-choice): Don't document 'dropdown-list', which was removed in 2011. --- lisp/auth-source.el | 1 - 1 file changed, 1 deletion(-) diff --git a/lisp/auth-source.el b/lisp/auth-source.el index 5776b6acb8c..5969cdbf9f8 100644 --- a/lisp/auth-source.el +++ b/lisp/auth-source.el @@ -330,7 +330,6 @@ If the value is not a list, symmetric encryption will be used." (defun auth-source-read-char-choice (prompt choices) "Read one of CHOICES by `read-char-choice', or `read-char'. -`dropdown-list' support is disabled because it doesn't work reliably. Only one of CHOICES will be returned. The PROMPT is augmented with \"[a/b/c] \" if CHOICES is \(?a ?b ?c)." (when choices From 6653ee66ca5ebd42322613a09d4c0d2e35af924b Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sun, 14 Jan 2024 14:52:17 +0100 Subject: [PATCH 4/7] Improve two docstrings in ox-latex * lisp/org/ox-latex.el (org-latex-src-block-backend) (org-latex-engraved-theme): Improve docstring; mention that engrave-faces is a GNU ELPA package. --- lisp/org/ox-latex.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el index 9989a9bae5c..f44b50c99ea 100644 --- a/lisp/org/ox-latex.el +++ b/lisp/org/ox-latex.el @@ -978,7 +978,7 @@ The most comprehensive option can be set with, which causes source code to be run through `engrave-faces-latex-buffer', which generates colorings using Emacs' font-lock information. This requires the Emacs package -engrave-faces (available from ELPA), and the LaTeX package +engrave-faces (available from GNU ELPA), and the LaTeX package fvextra be installed. The styling of the engraved result can be customized with @@ -1262,9 +1262,10 @@ block-specific options, you may use the following syntax: (defcustom org-latex-engraved-theme nil "The theme that should be used for engraved code, when non-nil. -This can be set to any theme defined in `engrave-faces-themes' or -loadable by Emacs. When set to t, the current Emacs theme is -used. When nil, no theme is applied." +This can be set to any theme defined in `engrave-faces-themes' +(from the engrave-faces package) or loadable by Emacs. When set +to t, the current Emacs theme is used. When nil, no theme is +applied." :group 'org-export-latex :package-version '(Org . "9.6") :type 'symbol) From 725a3f32f8ba78ac5fffcd03be5b82cbc2c1b275 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sun, 14 Jan 2024 14:56:06 +0100 Subject: [PATCH 5/7] ; Fix typos in symbol names --- admin/cus-test.el | 2 +- lisp/abbrev.el | 2 +- lisp/calendar/todo-mode.el | 2 +- lisp/erc/erc.el | 2 +- lisp/jsonrpc.el | 2 +- lisp/leim/quail/cyrillic.el | 4 ++-- lisp/org/org-element.el | 2 +- lisp/org/org-fold-core.el | 2 +- lisp/org/org-macs.el | 2 +- lisp/org/ox-latex.el | 2 +- lisp/progmodes/eglot.el | 2 +- lisp/term.el | 2 +- lisp/term/pc-win.el | 2 +- lisp/treesit.el | 2 +- lisp/window.el | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/admin/cus-test.el b/admin/cus-test.el index 62fec77c16f..64c742ea855 100644 --- a/admin/cus-test.el +++ b/admin/cus-test.el @@ -146,7 +146,7 @@ Names should be as they appear in loaddefs.el.") (defvar cus-test-errors nil "List of problematic variables found by `cus-test-apropos'. -Each element is (VARIABLE . PROBLEM); see `cus-test--format-problem'.") +Each element is (VARIABLE . PROBLEM); see `cus-test--format-errors'.") (defvar cus-test-tested-variables nil "List of options tested by last call of `cus-test-apropos'.") diff --git a/lisp/abbrev.el b/lisp/abbrev.el index c4eac8c5c39..9afa617908e 100644 --- a/lisp/abbrev.el +++ b/lisp/abbrev.el @@ -1275,7 +1275,7 @@ which see." (setq font-lock-multiline nil)) (defun abbrev--possibly-save (query &optional arg) - "Hook function for use by `save-some-buffer-functions'. + "Hook function for use by `save-some-buffers-functions'. Maybe save abbrevs, and record whether we either saved them or asked to." ;; Query mode. diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el index 20e056c2521..9ef473b1b43 100644 --- a/lisp/calendar/todo-mode.el +++ b/lisp/calendar/todo-mode.el @@ -1516,7 +1516,7 @@ the archive of the file moved to, creating it if it does not exist." (prin1 todo-categories (current-buffer))) ;; If archive was just created, save it to avoid "File ;; no longer exists!" message on invoking - ;; `todo-view-archived-items'. + ;; `todo-find-archive'. (unless (file-exists-p (buffer-file-name)) (save-buffer)) (todo-category-number (or new cat)) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 4171ba3cb1d..88e41e96a82 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -2192,7 +2192,7 @@ parameters SERVER and NICK." ;; (bug#60428). (defun erc--warn-unencrypted () ;; Remove unconditionally to avoid wrong context due to races from - ;; simultaneous dialing or aborting (e.g., via `keybaord-quit'). + ;; simultaneous dialing or aborting (e.g., via `keyboard-quit'). (remove-hook 'erc--server-post-connect-hook #'erc--warn-unencrypted) (when (and (process-contact erc-server-process :nowait) (equal erc-session-server erc-default-server) diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el index 2ccb528fee9..f2060d3faa1 100644 --- a/lisp/jsonrpc.el +++ b/lisp/jsonrpc.el @@ -555,7 +555,7 @@ With optional CLEANUP, kill any associated buffers." "Called when new data STRING has arrived for PROC." (when jsonrpc--in-process-filter ;; Problematic recursive process filters may happen if - ;; `jsonrpc--connection-receive', called by us, eventually calls + ;; `jsonrpc-connection-receive', called by us, eventually calls ;; client code which calls `process-send-string' (which see) to, ;; say send a follow-up message. If that happens to writes enough ;; bytes for pending output to be received, we will lose JSONRPC diff --git a/lisp/leim/quail/cyrillic.el b/lisp/leim/quail/cyrillic.el index 577898f82bd..60c88221a65 100644 --- a/lisp/leim/quail/cyrillic.el +++ b/lisp/leim/quail/cyrillic.el @@ -1101,9 +1101,9 @@ as follows. ;; Ognyan Kulev wrote: ;; I would suggest future `cyrillic-translit' to be with the -;; modification of `cyrillic-translit-bulgarian' applied and the +;; modification of `cyrillic-translit-bulgarian' (now deleted) applied and the ;; latter to disappear. It could be used by people who write -;; bulgarian e-mails with latin letters for kick start (phonetic input +;; Bulgarian e-mails with latin letters for kick start (phonetic input ;; method is not so obvious as translit input method but each letter ;; is one keypress and a *lot* of people know it). diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el index ff587bba38c..796191dd386 100644 --- a/lisp/org/org-element.el +++ b/lisp/org/org-element.el @@ -6556,7 +6556,7 @@ the expected result." (error "org-element: Parsing aborted by user. Cache has been cleared. If you observe Emacs hangs frequently, please report this to Org mode mailing list (M-x org-submit-bug-report).")) (message (substitute-command-keys - "`org-element--parse-buffer': Suppressed `\\[keyboard-quit]'. Press `\\[keyboard-quit]' %d more times to force interruption.") + "`org-element--parse-to': Suppressed `\\[keyboard-quit]'. Press `\\[keyboard-quit]' %d more times to force interruption.") (- org-element--cache-interrupt-C-g-max-count org-element--cache-interrupt-C-g-count))) (unless element diff --git a/lisp/org/org-fold-core.el b/lisp/org/org-fold-core.el index 73b3c9bbf8c..be90ca398a1 100644 --- a/lisp/org/org-fold-core.el +++ b/lisp/org/org-fold-core.el @@ -433,7 +433,7 @@ Return nil when there is no matching folding spec." (org-fold-core-get-folding-spec-from-alias spec-or-alias)) (defsubst org-fold-core--check-spec (spec-or-alias) - "Throw an error if SPEC-OR-ALIAS is not in `org-fold-core--spec-priority-list'." + "Throw an error if SPEC-OR-ALIAS is not in `org-fold-core-folding-spec-list'." (unless (org-fold-core-folding-spec-p spec-or-alias) (error "%s is not a valid folding spec" spec-or-alias))) diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el index 55541834784..b891284a8bb 100644 --- a/lisp/org/org-macs.el +++ b/lisp/org/org-macs.el @@ -1072,7 +1072,7 @@ Return width in pixels when PIXELS is non-nil." ;; FIXME: Fallback to old limited version, because ;; `window-pixel-width' is buggy in older Emacs. (org--string-width-1 string) - ;; Wrap/line prefix will make `window-text-pizel-size' return too + ;; Wrap/line prefix will make `window-text-pixel-size' return too ;; large value including the prefix. (remove-text-properties 0 (length string) '(wrap-prefix t line-prefix t) diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el index f44b50c99ea..c83728a8f09 100644 --- a/lisp/org/ox-latex.el +++ b/lisp/org/ox-latex.el @@ -3667,7 +3667,7 @@ CONTENTS is the contents of the object." ;; takes care of tables with a "verbatim" mode. Otherwise, it ;; delegates the job to either `org-latex--table.el-table', ;; `org-latex--org-table', `org-latex--math-table' or -;; `org-latex--org-tabbing' functions, +;; `org-latex--org-align-string-tabbing' functions, ;; depending of the type of the table and the mode requested. ;; ;; `org-latex--align-string' is a subroutine used to build alignment diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 64fd548e824..1e90e26a537 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -1592,7 +1592,7 @@ If optional MARKER, return a marker instead" (let ((vec (copy-sequence url-path-allowed-chars))) (aset vec ?: nil) ;; see github#639 vec) - "Like `url-path-allows-chars' but more restrictive.") + "Like `url-path-allowed-chars' but more restrictive.") (defun eglot--path-to-uri (path) "URIfy PATH." diff --git a/lisp/term.el b/lisp/term.el index e3dedf247d1..647938c3b86 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -1109,7 +1109,7 @@ variable `term-input-autoexpand', and addition is controlled by the variable `term-input-ignoredups'. Input to, and output from, the subprocess can cause the window to scroll to -the end of the buffer. See variables `term-scroll-to-bottom-on-input', +the end of the buffer. See variables `term-scroll-snap-to-bottom', and `term-scroll-to-bottom-on-output'. If you accidentally suspend your process, use \\[term-continue-subjob] diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el index 02ad6b85c37..92d65c75816 100644 --- a/lisp/term/pc-win.el +++ b/lisp/term/pc-win.el @@ -47,7 +47,7 @@ ;; This was copied from etc/rgb.txt, except that some values were changed ;; a bit to make them consistent with DOS console colors, and the RGB -;; values were scaled up to 16 bits, as `tty-define-color' requires. +;; values were scaled up to 16 bits, as `tty-color-define' requires. ;;; ;; The mapping between the 16 standard EGA/VGA colors and X color names ;; was done by running a Unix version of Emacs inside an X client and a diff --git a/lisp/treesit.el b/lisp/treesit.el index c63bf510a24..2676ed932dc 100644 --- a/lisp/treesit.el +++ b/lisp/treesit.el @@ -1422,7 +1422,7 @@ no-node comment-end - Matches if text after point matches `treesit-comment-end'. + Matches if text after point matches `comment-end-skip'. catch-all diff --git a/lisp/window.el b/lisp/window.el index c7cd32e6200..13fe1feba10 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -8528,7 +8528,7 @@ buffer. ALIST is a buffer display action alist as compiled by canonical frame lines. If it is the constant `full-height', prefer a full-height window. -If ALIST contains a non-nil `inhibit-same--window' entry, do not +If ALIST contains a non-nil `inhibit-same-window' entry, do not return the selected window." (let ((windows (window-list-1 nil 'nomini (cdr (assq 'lru-frames alist)))) From 78ddb32fadb61b3e78047400e257d57b2cff7cd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Sun, 14 Jan 2024 15:36:16 +0100 Subject: [PATCH 6/7] Fix documentation of icon-elements * lisp/emacs-lisp/icons.el (icon-elements): The plist key it returns is `image', not `display'. (Bug#68451) --- lisp/emacs-lisp/icons.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/icons.el b/lisp/emacs-lisp/icons.el index 1fc0e39f9fe..f9591661688 100644 --- a/lisp/emacs-lisp/icons.el +++ b/lisp/emacs-lisp/icons.el @@ -164,7 +164,7 @@ If OBJECT is an icon, return the icon properties." (defun icon-elements (name) "Return the elements of icon NAME. The elements are represented as a plist where the keys are -`string', `face' and `display'. The `image' element is only +`string', `face' and `image'. The `image' element is only present if the icon is represented by an image." (let ((string (icon-string name))) (list 'face (get-text-property 0 'face string) From 5bb5590dec95e813ed120b3f09734451b4ebb18f Mon Sep 17 00:00:00 2001 From: Gregory Heytings Date: Thu, 11 Jan 2024 23:38:22 +0000 Subject: [PATCH 7/7] Fix blunder in labeled_narrow_to_region * src/editfns.c (labeled_narrow_to_region): Record point before, instead of after, calling narrow-to-region; otherwise point may already have been changed. Fixes bug#66764. --- src/editfns.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/editfns.c b/src/editfns.c index 063dfc6d131..6ddee0840c2 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -2870,9 +2870,9 @@ void labeled_narrow_to_region (Lisp_Object begv, Lisp_Object zv, Lisp_Object label) { - Finternal__labeled_narrow_to_region (begv, zv, label); record_unwind_protect (restore_point_unwind, Fpoint_marker ()); record_unwind_protect (unwind_labeled_narrow_to_region, label); + Finternal__labeled_narrow_to_region (begv, zv, label); } DEFUN ("widen", Fwiden, Swiden, 0, 0, "",