From de54d922b5c239a474adb41c84ea316b266f1838 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 13 Oct 2024 16:01:38 +0200 Subject: [PATCH 01/12] * doc/emacs/mini.texi (Passwords): Mention password visibility. --- doc/emacs/mini.texi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi index a6d2a17ed50..3be9b76ad88 100644 --- a/doc/emacs/mini.texi +++ b/doc/emacs/mini.texi @@ -970,10 +970,14 @@ action with Emacs until you have submitted the password. backwards, removing the last character entered. @kbd{C-u} deletes everything you have typed so far. @kbd{C-g} quits the password prompt (@pxref{Quitting}). @kbd{C-y} inserts the current kill into the -password (@pxref{Killing}). You may type either @key{RET} or -@key{ESC} to submit the password. Any other self-inserting character -key inserts the associated character into the password, and all other -input is ignored. +password (@pxref{Killing}). @key{TAB} toggles the visibility of the +password. You may type either @key{RET} or @key{ESC} to submit the +password. Any other self-inserting character key inserts the associated +character into the password, and all other input is ignored. + + There is also an icon at the front of the mode line indicating the +password visibility. Clicking @kbd{mouse-1} on it toggles the password +visibility as well. @node Yes or No Prompts @section Yes or No Prompts From ae75ea62324598654b32ed28bf644ec2bc4c04b2 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 13 Oct 2024 18:29:34 +0300 Subject: [PATCH 02/12] ; * src/fileio.c (Ffile_newer_than_file_p): Fix wording (bug#73709). --- lisp/net/dictionary.el | 8 ++++++-- src/fileio.c | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lisp/net/dictionary.el b/lisp/net/dictionary.el index f17dc160997..3343d29da0f 100644 --- a/lisp/net/dictionary.el +++ b/lisp/net/dictionary.el @@ -320,7 +320,11 @@ Otherwise, `dictionary-search' displays definitions in a *Dictionary* buffer." :version "30.1") (defface dictionary-word-definition-face - '((((supports (:family "DejaVu Serif"))) + ;; w32 first, because 'supports' doesn't really tell whether the font + ;; family exists, and MS-Windows selects an ugly font as result. + '((((type w32)) + (:font "Sans Serif")) + (((supports (:family "DejaVu Serif"))) (:family "DejaVu Serif")) (((type x)) (:font "Sans Serif")) @@ -328,7 +332,7 @@ Otherwise, `dictionary-search' displays definitions in a *Dictionary* buffer." (:font "default"))) "The face that is used for displaying the definition of the word." :group 'dictionary -:version "28.1") +:version "31.1") (defface dictionary-word-entry-face '((((type x)) diff --git a/src/fileio.c b/src/fileio.c index 2db2760916b..1b1060d899f 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -3787,8 +3787,8 @@ DEFUN ("unix-sync", Funix_sync, Sunix_sync, 0, 0, "", DEFUN ("file-newer-than-file-p", Ffile_newer_than_file_p, Sfile_newer_than_file_p, 2, 2, 0, doc: /* Return t if file FILE1 is newer than file FILE2. -If FILE1 does not exist, the answer is nil; -otherwise, if FILE2 does not exist, the answer is t. +If FILE1 does not exist, the return value is nil; +if FILE2 does not exist, the return value is t. For existing files, this compares their last-modified times. */) (Lisp_Object file1, Lisp_Object file2) { From b87fda63dd4a29c3c28e235904405f2d6709239e Mon Sep 17 00:00:00 2001 From: Earl Hyatt Date: Sun, 13 Oct 2024 13:44:18 -0400 Subject: [PATCH 03/12] Fix formatting of long keyboard macros by 'list-keyboard-macros'. * lisp/kmacro.el (kmacro-menu--refresh): Include the second argument of 'format-kbd-macro' so that the formatted keyboard macro is on a single line. (Bug#73797) --- lisp/kmacro.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/kmacro.el b/lisp/kmacro.el index 50ff875de52..6d43a3f680c 100644 --- a/lisp/kmacro.el +++ b/lisp/kmacro.el @@ -1576,7 +1576,7 @@ To customize possible responses, change the \"bindings\" in ,(format "%d" cnt) ,fmt ,(format fmt cnt) - ,(format-kbd-macro (kmacro--keys km))]))) + ,(format-kbd-macro (kmacro--keys km) 1)]))) (kmacro-menu--kmacros)) kmacro-menu--deletion-flags nil kmacro-menu--marks nil) From c154047c46ae833a114e84d72e62269d12c3249d Mon Sep 17 00:00:00 2001 From: Yuan Fu Date: Mon, 14 Oct 2024 19:31:12 -0700 Subject: [PATCH 04/12] Fix c-ts-mode--anchor-prev-sibling (bug#73661) * lisp/progmodes/c-ts-mode.el: (c-ts-mode--anchor-prev-sibling): Fix parentheses and use a slightly more efficient function. * test/lisp/progmodes/c-ts-mode-resources/indent.erts: Replace the tab in the test code with spaces. --- lisp/progmodes/c-ts-mode.el | 17 +++++++++-------- .../progmodes/c-ts-mode-resources/indent.erts | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el index 576d715510d..12003ff4727 100644 --- a/lisp/progmodes/c-ts-mode.el +++ b/lisp/progmodes/c-ts-mode.el @@ -321,16 +321,17 @@ characters of the current line." ((or "#elif" "#else") (setq prev-sibling (treesit-node-prev-sibling (treesit-node-parent prev-sibling) t))) - ;; If the start of the previous sibling isn't at the - ;; beginning of a line, something's probably not quite - ;; right, go a step further. (E.g., comment after a - ;; statement.) If the previous sibling is the first named - ;; node then anchor to that, e.g. when returning an aggregate - ;; and starting the items on the same line as {. + ;; If the start of the previous sibling isn't at the beginning + ;; of a line, something's probably not quite right, go a step + ;; further. (E.g., comment after a statement.) If the + ;; previous sibling is the first named node, then anchor to + ;; that, e.g. when returning an aggregate and starting the + ;; items on the same line as {. (_ (goto-char (treesit-node-start prev-sibling)) (if (or (looking-back (rx bol (* whitespace)) - (line-beginning-position))) - (null (treesit-node-prev-sibling prev-sibling t)) + (line-beginning-position)) + (treesit-node-eq (treesit-node-child parent 0 t) + prev-sibling)) (setq continue nil) (setq prev-sibling (treesit-node-prev-sibling prev-sibling))))))) diff --git a/test/lisp/progmodes/c-ts-mode-resources/indent.erts b/test/lisp/progmodes/c-ts-mode-resources/indent.erts index a13a74cf8b3..f97ceac61f5 100644 --- a/test/lisp/progmodes/c-ts-mode-resources/indent.erts +++ b/test/lisp/progmodes/c-ts-mode-resources/indent.erts @@ -214,7 +214,7 @@ Name: Return Compund Literal struct pair { int fst, snd; }; struct pair make_pair(int long_identifier_a[], int long_identifier_b[], - int offset_a, int offset_b) + int offset_a, int offset_b) { int base_offset = 10; return (struct pair) { long_identifier_a[base_offset + offset_b], From 4d90a1d820916985e5e135254926f5554ddd3e46 Mon Sep 17 00:00:00 2001 From: Robert Pluim Date: Tue, 15 Oct 2024 10:16:22 +0200 Subject: [PATCH 05/12] ; * doc/emacs/search.texi (Word Search): Spelling fixes. --- doc/emacs/search.texi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index f23dc1fdb51..af069bbe194 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -807,21 +807,21 @@ look up, using the word at point as the default, then asks the @sc{dict} server to provide the definitions of that word in one or more dictionaries. By default, the command first tries to connect to the @sc{dict} server installed on the local host, and if that fails, it -tries @file{dict.org} after your confirmation; customize the variable +tries @file{dict.org} after asking for confirmation; customize the variable @code{dictionary-server} to specify, as a string, the URL of a single server to use (use @samp{localhost} if you want to query only the local server). Normally, @code{dictionary-search} tells the server to look up the word in all the dictionaries available to the server, but if you invoke the command with a prefix argument, it will prompt for a single -dictionary to look. The list of dictionaries available to a server can +dictionary to use. The list of dictionaries available to a server can be displayed by pressing the @samp{Select dictionary} button shown in the @file{*Dictionary*} buffer, described below. - First time you use @code{dictionary-search}, it creates a new + The first time you use @code{dictionary-search}, it creates a new @file{*Dictionary*} buffer and turns on a special mode in it. The buffer shows buttons for selecting a dictionary, searching a definition of another word, etc. Subsequent @code{dictionary-search} commands -reuse this buffer. To create another such buffer (e.g., too look up +reuse this buffer. To create another such buffer (e.g., to look up other words, perhaps in another dictionary), type @w{@kbd{M-x dictionary @key{RET}}}. From 94d0e9c4018cf948bd1ebabb118c02699c77c037 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 15 Oct 2024 15:39:11 +0300 Subject: [PATCH 06/12] : Revert a mistaken change * lisp/net/dictionary.el (dictionary-word-definition-face): Revert a mistakenly installed change. --- lisp/net/dictionary.el | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lisp/net/dictionary.el b/lisp/net/dictionary.el index 3343d29da0f..f17dc160997 100644 --- a/lisp/net/dictionary.el +++ b/lisp/net/dictionary.el @@ -320,11 +320,7 @@ Otherwise, `dictionary-search' displays definitions in a *Dictionary* buffer." :version "30.1") (defface dictionary-word-definition-face - ;; w32 first, because 'supports' doesn't really tell whether the font - ;; family exists, and MS-Windows selects an ugly font as result. - '((((type w32)) - (:font "Sans Serif")) - (((supports (:family "DejaVu Serif"))) + '((((supports (:family "DejaVu Serif"))) (:family "DejaVu Serif")) (((type x)) (:font "Sans Serif")) @@ -332,7 +328,7 @@ Otherwise, `dictionary-search' displays definitions in a *Dictionary* buffer." (:font "default"))) "The face that is used for displaying the definition of the word." :group 'dictionary -:version "31.1") +:version "28.1") (defface dictionary-word-entry-face '((((type x)) From 3d30905b0223f07cba74297ba032d71b8fe2632c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Tue, 15 Oct 2024 14:06:49 +0200 Subject: [PATCH 07/12] * lisp/calc/calc-ext.el (math-approx-sqrt-e): Doc fix (bug#73817). --- lisp/calc/calc-ext.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el index 191149892a8..25d2492b277 100644 --- a/lisp/calc/calc-ext.el +++ b/lisp/calc/calc-ext.el @@ -2069,7 +2069,7 @@ calc-kill calc-kill-region calc-yank)))) (defconst math-approx-sqrt-e (math-read-number-simple "1.648721270700128146849") - "An approximation for sqrt(3).") + "An approximation for sqrt(e).") (math-defcache math-sqrt-e math-approx-sqrt-e (math-add-float '(float 1 0) (math-exp-minus-1-raw '(float 5 -1)))) From 0085e48f917b4ddd0c698ecea1b30684b904b666 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 15 Oct 2024 17:36:56 +0200 Subject: [PATCH 08/12] * admin/notes/emba: Docker builds do not run in a worktree. --- admin/notes/emba | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/notes/emba b/admin/notes/emba index 2e61ec49ae5..59cbe687f95 100644 --- a/admin/notes/emba +++ b/admin/notes/emba @@ -89,7 +89,7 @@ As usual in GitLab, the tests run in containers, which could be applied also locally. Unfortunately, the Emba container registry, emba.gnu.org:5050, is not accessible publicly. Instead, the container images must be build locally. Change the current directory to a -recent Emacs branch, and apply the command +recent Emacs branch (not a worktree), and apply the command docker build --target emacs-inotify --tag emacs-inotify \ -f test/infra/Dockerfile.emba . From d5723fc4f03924cabc504ab6f0a537efc8cd9479 Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Tue, 15 Oct 2024 21:27:47 +0200 Subject: [PATCH 09/12] * lisp/progmodes/c-ts-mode.el (treesit-node-eq): Declare to silence warning. --- lisp/progmodes/c-ts-mode.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el index 12003ff4727..73ec3f2bb2d 100644 --- a/lisp/progmodes/c-ts-mode.el +++ b/lisp/progmodes/c-ts-mode.el @@ -82,6 +82,7 @@ (declare-function treesit-node-prev-sibling "treesit.c") (declare-function treesit-node-first-child-for-pos "treesit.c") (declare-function treesit-node-next-sibling "treesit.c") +(declare-function treesit-node-eq "treesit.c") (declare-function treesit-query-compile "treesit.c") ;;; Custom variables From 569186c36e3bce06e69c8c037553789ee21d722b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 16 Oct 2024 07:59:59 +0300 Subject: [PATCH 10/12] ; * doc/lispref/display.texi (Face Attributes): Fix typo (bug#73824). --- doc/lispref/display.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 9075ff678e0..1d5ba98f062 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -2767,7 +2767,7 @@ Draw a box with lines of width 1, in the foreground color. Draw a box with lines of width 1, in color @var{color}. @item @code{(:line-width (@var{vwidth} . @var{hwidth}) :color @var{color} :style @var{style})} -You can explicitly specify all aspects of the box with a plist on this +You can explicitly specify all aspects of the box with a plist of this form. Any element in this plist can be omitted. The values of @var{vwidth} and @var{hwidth} specify respectively the From c5eba443ae72b94024574d56a0dfdf11f339c1aa Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 16 Oct 2024 08:32:02 +0300 Subject: [PATCH 11/12] ; * lisp/icomplete.el (icomplete-in-buffer): Doc fix (bug#73820). --- lisp/icomplete.el | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/icomplete.el b/lisp/icomplete.el index 2ea5e36fa88..f3569789e64 100644 --- a/lisp/icomplete.el +++ b/lisp/icomplete.el @@ -139,9 +139,17 @@ See `icomplete-delay-completions-threshold'." :type 'integer) (defcustom icomplete-in-buffer nil - "If non-nil, also use Icomplete when completing in non-mini buffers. + "If non-nil, use Icomplete when completing in buffers other than minibuffer. This affects commands like `completion-in-region', but not commands -that use their own completions setup." +that use their own completions setup. + +If you would prefer to see only Icomplete's in-buffer display, but do +not want the \"*Completions*\" buffer to pop up in those cases, add +this advice to your init file: + + (advice-add \\='completion-at-point + :after #\\='minibuffer-hide-completions) +" :type 'boolean) (defcustom icomplete-minibuffer-setup-hook nil From 78e6328fafddd4f39ed06d6ac4cecfb2f88d2fa4 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 16 Oct 2024 09:04:02 +0300 Subject: [PATCH 12/12] ; (select-safe-coding-system-interactively): Say "safely encode". --- lisp/international/mule-cmds.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 7d784ef3b1b..42b4f0034f1 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -737,7 +737,7 @@ DEFAULT is the coding system to use by default in the query." (format "string \"%s\"." from) (format-message "buffer `%s'." bufname))) (insert - "These default coding systems were tried to encode" + "These default coding systems were tried to safely encode" (if (stringp from) (concat " \"" (if (> (length from) 10) (concat (substring from 0 10) "...\"") @@ -758,9 +758,9 @@ e.g., for sending an email message.\n ") (insert (if rejected "The other coding systems" "However, each of them") (substitute-command-keys - " encountered characters it couldn't encode:\n")) + " encountered characters it couldn't encode safely:\n")) (dolist (coding unsafe) - (insert (format " %s cannot encode these:" (car coding))) + (insert (format " %s cannot safely encode these:" (car coding))) (let ((i 0) (func1 (lambda (bufname pos)