From 4bb7532163ffb84a75d59997a43e48bf10d8a33a Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 26 Sep 2020 00:31:17 -0700 Subject: [PATCH 1/4] Fix soap-client URL * lisp/net/soap-client.el (soap-create-envelope): Fix URL that I broke in 2019-09-23T06:53:30Z!eggert@cs.ucla.edu. Problem reported by Thomas Fitzsimmons. --- lisp/net/soap-client.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el index 7425e8763fb..e3c38052a51 100644 --- a/lisp/net/soap-client.el +++ b/lisp/net/soap-client.el @@ -3027,7 +3027,7 @@ SERVICE-URL should be provided when WS-Addressing is being used." (insert "\n Date: Sat, 26 Sep 2020 11:50:15 +0300 Subject: [PATCH 2/4] Enable "Continue Tags Search" menu item only when it can be used * lisp/menu-bar.el (menu-bar-search-menu) : Enable only when there was a previous tags search. (Bug#43569) (menu-bar-replace-menu) : Enable only when there was a previous tags-replace. --- lisp/menu-bar.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 37e046ffddf..ef64c74acda 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -333,6 +333,8 @@ (bindings--define-key menu [tags-continue] '(menu-item "Continue Tags Search" fileloop-continue + :enable (and (featurep 'fileloop) + (not (eq fileloop--operate-function 'ignore))) :help "Continue last tags search operation")) (bindings--define-key menu [tags-srch] '(menu-item "Search Tagged Files..." tags-search @@ -382,6 +384,8 @@ (let ((menu (make-sparse-keymap "Replace"))) (bindings--define-key menu [tags-repl-continue] '(menu-item "Continue Replace" fileloop-continue + :enable (and (featurep 'fileloop) + (not (eq fileloop--operate-function 'ignore))) :help "Continue last tags replace operation")) (bindings--define-key menu [tags-repl] '(menu-item "Replace in Tagged Files..." tags-query-replace From 0dfc6fdc1f15cf234c3efc4152275ed1c8441df5 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 26 Sep 2020 18:35:00 +0300 Subject: [PATCH 3/4] Followup to a recent change in menu-bar.el * lisp/fileloop.el (fileloop--operate-function): Mention in a comment that menu-bar.el relies on the default value. --- lisp/fileloop.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lisp/fileloop.el b/lisp/fileloop.el index 833bb0401cb..668b9d4cd16 100644 --- a/lisp/fileloop.el +++ b/lisp/fileloop.el @@ -55,6 +55,9 @@ (defvar fileloop--iterator iter-empty) (defvar fileloop--scan-function (lambda () (user-error "No operation in progress"))) +;; If the default value below is changed, the :enable form of +;; tags-continue and tags-repl-continue in menu-bar.el will have to be +;; updated accordingly. (defvar fileloop--operate-function #'ignore) (defvar fileloop--freshly-initialized nil) From 0b78785a9b5ff475ea65c67b686a1ac19e5d858a Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 27 Sep 2020 09:09:27 +0300 Subject: [PATCH 4/4] Minor copyedits in the Emacs user manual * doc/emacs/emacs.texi (Top): Remove "real-time" from the Emacs description; add "advanced", to be consistent with what we say in the Introduction section. (Bug#43633) --- doc/emacs/emacs.texi | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 6b82aeb8234..a28b16aa39e 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -108,10 +108,9 @@ Cover art by Etienne Suvasa; cover design by Matt Lee. @node Top @top The Emacs Editor -Emacs is the extensible, customizable, self-documenting real-time -display editor. This manual describes how to edit with Emacs and -some of the ways to customize it; it corresponds to GNU Emacs version -@value{EMACSVER}. +Emacs is the advanced, extensible, customizable, self-documenting +editor. This manual describes how to edit with Emacs and some of the +ways to customize it; it corresponds to GNU Emacs version @value{EMACSVER}. @c See 'manual-html-mono' and 'manual-html-node' in admin/admin.el. @ifset WWW_GNU_ORG