From e3bba63ecb9302d5a30c7ec55fa564aa9aba2b11 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Tue, 16 Jul 2024 03:35:59 +0200 Subject: [PATCH 01/10] Checkdoc fixes in transient.el * lisp/transient.el (transient-format-description): Checkdoc fixes. --- lisp/transient.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lisp/transient.el b/lisp/transient.el index 05ad0ed8a0b..8788fbc834f 100644 --- a/lisp/transient.el +++ b/lisp/transient.el @@ -4001,9 +4001,9 @@ and its value is returned to the caller." set " "))))) (cl-defmethod transient-format-description ((obj transient-group)) - "Format the description by calling the next method. If the result -doesn't use the `face' property at all, then apply the face -`transient-heading' to the complete string." + "Format the description by calling the next method. +If the result doesn't use the `face' property at all, then apply the +face `transient-heading' to the complete string." (and-let* ((desc (transient--get-description obj))) (cond ((oref obj inapt) (propertize desc 'face 'transient-inapt-suffix)) @@ -4012,8 +4012,9 @@ doesn't use the `face' property at all, then apply the face ((propertize desc 'face 'transient-heading))))) (cl-defmethod transient-format-description :around ((obj transient-suffix)) - "Format the description by calling the next method. If the result -is nil, then use \"(BUG: no description)\" as the description. + "Format the description by calling the next method. +If the result is nil, then use \"(BUG: no description)\" as the +description. If the OBJ's `key' is currently unreachable, then apply the face `transient-unreachable' to the complete string." (let ((desc (or (cl-call-next-method obj) From 719d5753ca661d5ab264383a2a3ca5932c595b41 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 16 Jul 2024 17:35:42 +0300 Subject: [PATCH 02/10] ; * doc/lispref/help.texi (Keys in Documentation): Add cross-reference. --- doc/lispref/help.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi index f3d12feefc6..268ae08bc46 100644 --- a/doc/lispref/help.texi +++ b/doc/lispref/help.texi @@ -375,7 +375,7 @@ as a link in the @file{*Help*} buffer. @end table @strong{Please note:} Each @samp{\} must be doubled when written in a -string in Emacs Lisp. +string in Emacs Lisp (@pxref{Syntax for Strings}). @defun substitute-command-keys string &optional no-face include-menus @vindex help-key-binding@r{ (face)} From 3ccebbe17b73488d2d0ba73fda3b70cb6034cc7d Mon Sep 17 00:00:00 2001 From: Robert Pluim Date: Wed, 17 Jul 2024 09:38:43 +0200 Subject: [PATCH 03/10] Fix 'toggle-window-dedicated' documentation * doc/emacs/windows.texi (Displaying Buffers): Fix the cross reference to the elisp manual. Add missing 'toggle-window-dedicated'. * doc/lispref/windows.texi (Dedicated Windows): Mention 'toggle-window-dedicated'. --- doc/emacs/windows.texi | 8 ++++---- doc/lispref/windows.texi | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi index 60599d42020..7b9c4146700 100644 --- a/doc/emacs/windows.texi +++ b/doc/emacs/windows.texi @@ -418,7 +418,7 @@ these commands are bound in the @kbd{C-x 5} prefix key. @cindex dedicated window Sometimes, a window is ``dedicated'' to its current buffer. -@xref{Dedicated Windows,, elisp, The Emacs Lisp Reference Manual}. +@xref{Dedicated Windows,,, elisp, The Emacs Lisp Reference Manual}. @code{display-buffer} will avoid reusing dedicated windows most of the time. This is indicated by a @samp{d} in the mode line (@pxref{Mode Line}). A window can also be strongly dedicated, which prevents any @@ -434,9 +434,9 @@ you dedicate a window to that buffer, the command (through @kindex C-x w d @findex toggle-window-dedicated - Toggle whether the selected window is dedicated to the current -buffer. With a prefix argument, make the window strongly dedicated -instead. + You can use the command @code{toggle-window-dedicated} to toggle +whether the selected window is dedicated to the current buffer. With a +prefix argument, make the window strongly dedicated instead. @menu * Window Choice:: How @code{display-buffer} works. diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 01ec2a6ecd5..9e47d12c42b 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -4450,6 +4450,7 @@ selected window. @defun set-window-dedicated-p window flag This function marks @var{window} as dedicated to its buffer if @var{flag} is non-@code{nil}, and non-dedicated otherwise. +Interactively you can use the @code{toggle-window-dedicated} command. As a special case, if @var{flag} is @code{t}, @var{window} becomes @dfn{strongly} dedicated to its buffer. @code{set-window-buffer} From 504bdd560affd9173f0b406bcc830afca8648e20 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 17 Jul 2024 14:10:50 +0300 Subject: [PATCH 04/10] ; Fix last change * doc/lispref/windows.texi (Dedicated Windows): * doc/emacs/windows.texi (Displaying Buffers): Mention keybinding. --- doc/emacs/windows.texi | 6 +++--- doc/lispref/windows.texi | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi index 7b9c4146700..69f24ec192f 100644 --- a/doc/emacs/windows.texi +++ b/doc/emacs/windows.texi @@ -434,9 +434,9 @@ you dedicate a window to that buffer, the command (through @kindex C-x w d @findex toggle-window-dedicated - You can use the command @code{toggle-window-dedicated} to toggle -whether the selected window is dedicated to the current buffer. With a -prefix argument, make the window strongly dedicated instead. + You can use the command @kbd{C-x w d} (@code{toggle-window-dedicated}) +to toggle whether the selected window is dedicated to the current +buffer. With a prefix argument, it makes the window strongly dedicated. @menu * Window Choice:: How @code{display-buffer} works. diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 9e47d12c42b..2b1b0d704a0 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -4447,10 +4447,12 @@ the value assigned by the last call of @code{set-window-dedicated-p} for selected window. @end defun +@findex toggle-window-dedicated @defun set-window-dedicated-p window flag This function marks @var{window} as dedicated to its buffer if @var{flag} is non-@code{nil}, and non-dedicated otherwise. -Interactively you can use the @code{toggle-window-dedicated} command. +Interactively you can use the @kbd{C-x w d} +(@code{toggle-window-dedicated}) command to do the same. As a special case, if @var{flag} is @code{t}, @var{window} becomes @dfn{strongly} dedicated to its buffer. @code{set-window-buffer} From 85d2d7982d41d7c8ea31dd7150c78428a968944a Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 17 Jul 2024 17:57:20 +0200 Subject: [PATCH 05/10] Update Tramp manual * doc/misc/tramp.texi (Remote processes): Add another reason why a direct asynchronous process could fail. --- doc/misc/tramp.texi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index e1130917f0c..69572a139ff 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -4580,6 +4580,11 @@ It does not report the remote terminal name via @code{process-tty-name}. @item It does not set process property @code{remote-pid}. + +@item +It fails, when the command is too long. This can happen on +directories with a long directory name, or when the remote @env{PATH} +and/or other environment variables, which must be set, are too long. @end itemize In order to gain even more performance, it is recommended to bind From 8c7c4f4baaa1cb9f6d5d355c03dddc3dd1e0a747 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 17 Jul 2024 18:05:02 +0200 Subject: [PATCH 06/10] New Tramp tests * test/lisp/net/tramp-tests.el (tramp-test41-special-characters-direct-async) (tramp-test42-utf8-direct-async): New tests. --- test/lisp/net/tramp-tests.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 8074bed7a47..786700c727e 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -7623,6 +7623,8 @@ This requires restrictions of file name syntax." (tramp--test-deftest-without-file-attributes tramp-test41-special-characters) +(tramp--test-deftest-direct-async-process tramp-test41-special-characters) + (ert-deftest tramp-test42-utf8 () "Check UTF8 encoding in file names and file contents." (skip-unless (tramp--test-enabled)) @@ -7691,6 +7693,8 @@ This requires restrictions of file name syntax." (tramp--test-deftest-without-file-attributes tramp-test42-utf8) +(tramp--test-deftest-direct-async-process tramp-test42-utf8) + (ert-deftest tramp-test43-file-system-info () "Check that `file-system-info' returns proper values." (skip-unless (tramp--test-enabled)) From 7093504da2d7267cec1f6530b3cb234a5301012d Mon Sep 17 00:00:00 2001 From: john muhl Date: Mon, 15 Jul 2024 15:08:41 -0500 Subject: [PATCH 07/10] ; Fix typos (bug#72167) * lisp/minibuffer.el (completion-auto-deselect): Correct spelling of "minibuffer". * lisp/progmodes/peg.el (peg--actions): Correct spelling of "post-processing". * lisp/progmodes/php-ts-mode.el: Correct spelling of "taken". --- lisp/minibuffer.el | 2 +- lisp/progmodes/peg.el | 2 +- lisp/progmodes/php-ts-mode.el | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 0a0b17b3850..0f6e3518758 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -2529,7 +2529,7 @@ any completion candidate highlighted in *Completions* window (to indicate that it is the selected candidate) will be un-highlighted, and point in the *Completions* window will be moved off such a candidate. This means that `RET' (`minibuffer-choose-completion-or-exit') will exit -the minubuffer with the minibuffer's current contents, instead of the +the minibuffer with the minibuffer's current contents, instead of the selected completion candidate." :type '(choice (const :tag "Candidates in *Completions* stay selected as you type" nil) (const :tag "Typing deselects any completion candidate in *Completions*" t)) diff --git a/lisp/progmodes/peg.el b/lisp/progmodes/peg.el index 6dedb6e4895..d19a48c3294 100644 --- a/lisp/progmodes/peg.el +++ b/lisp/progmodes/peg.el @@ -274,7 +274,7 @@ "Actions collected along the current parse. Used at runtime for backtracking. It's a list ((POS . THUNK)...). Each THUNK is executed at the corresponding POS. Thunks are -executed in a postprocessing step, not during parsing.") +executed in a post-processing step, not during parsing.") (defvar peg--errors nil "Data keeping track of the rightmost parse failure location. diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el index 1298b39311b..89444f0208e 100644 --- a/lisp/progmodes/php-ts-mode.el +++ b/lisp/progmodes/php-ts-mode.el @@ -209,7 +209,7 @@ symbol." (when (derived-mode-p 'php-ts-mode) (php-ts-mode-set-style val))))) -;; teken from c-ts-mode +;; taken from c-ts-mode (defun php-ts-indent-style-safep (style) "Non-nil if STYLE's value is safe for file-local variables." (and (symbolp style) (not (functionp style)))) From 765cfaed775567afde3607b87f2657f0c0179f28 Mon Sep 17 00:00:00 2001 From: john muhl Date: Wed, 17 Jul 2024 15:48:37 -0500 Subject: [PATCH 08/10] ; * doc/emacs/anti.texi (Antinews): Fix typos (bug#72167). --- doc/emacs/anti.texi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi index 42c656ac852..bf355ff1fea 100644 --- a/doc/emacs/anti.texi +++ b/doc/emacs/anti.texi @@ -42,9 +42,9 @@ explicitly at configure time. This makes the default Emacs build process much faster. @item -JSON interfaces are slowly move into oblivion as past years come closer, -so we have removed our internal implementation of JSON; you will now -need to build Emacs with the libjansson library, if you need JSON. +JSON interfaces slowly move into oblivion as past years come closer, so +we have removed our internal implementation of JSON; you will now need +to build Emacs with the libjansson library, if you need JSON. Eventually, we plan on removing JSON support from Emacs altogether; this move will make the removal much simpler. @@ -52,7 +52,7 @@ move will make the removal much simpler. Tree-sitter based modes are now completely independent of their non-Tree-Sitter counterparts. We decided that keeping the settings separate and independent goes a long way toward simplicity, which is one -of our main motivation for removing stuff from Emacs. +of our main motivations for removing stuff from Emacs. @item Various Help commands no longer turn on Outline minor mode. With less From 34882d524328638e2198952578638e0ffe0697c5 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Tue, 16 Jul 2024 10:14:30 +0800 Subject: [PATCH 09/10] Port better to Android 3.0 * java/org/gnu/emacs/EmacsNoninteractive.java (main): Use the old getPackageInfo calling convention if it exists rather than on Android 2.3.3 and earlier. --- java/org/gnu/emacs/EmacsNoninteractive.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java/org/gnu/emacs/EmacsNoninteractive.java b/java/org/gnu/emacs/EmacsNoninteractive.java index 9f2b9fa8b56..8a1ad98d8f9 100644 --- a/java/org/gnu/emacs/EmacsNoninteractive.java +++ b/java/org/gnu/emacs/EmacsNoninteractive.java @@ -120,11 +120,11 @@ public final class EmacsNoninteractive } /* Get a LoadedApk or ActivityThread.PackageInfo. How to do - this varies by Android version. On Android 2.3.3 and - earlier, there is no ``compatibilityInfo'' argument to + this varies by Android version. On Android 3.0 and earlier, + there is no ``compatibilityInfo'' argument to getPackageInfo. */ - if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1) + try { method = activityThreadClass.getMethod ("getPackageInfo", @@ -134,7 +134,7 @@ public final class EmacsNoninteractive (Context.CONTEXT_INCLUDE_CODE | Context.CONTEXT_IGNORE_SECURITY)); } - else + catch (NoSuchMethodException exception) { compatibilityInfoClass = Class.forName ("android.content.res.CompatibilityInfo"); From 4c35382e98308843dce79438844fb5a796b7032b Mon Sep 17 00:00:00 2001 From: Po Lu Date: Thu, 18 Jul 2024 13:35:47 +0800 Subject: [PATCH 10/10] ; * src/emacs.c (syms_of_emacs) : Fix doc string indentation. --- src/emacs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/emacs.c b/src/emacs.c index 7b315310873..3017063bec4 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -3603,7 +3603,7 @@ Special values: `windows-nt' compiled as a native W32 application. `cygwin' compiled using the Cygwin library. `haiku' compiled for a Haiku system. - `android' compiled for Android. + `android' compiled for Android. Anything else (in Emacs 26, the possibilities are: aix, berkeley-unix, hpux, usg-unix-v) indicates some sort of Unix system. */); Vsystem_type = intern_c_string (SYSTEM_TYPE);