Merge from origin/emacs-27

0b78785a9b (origin/emacs-27) Minor copyedits in the Emacs user manual
0dfc6fdc1f Followup to a recent change in menu-bar.el
767713682c Enable "Continue Tags Search" menu item only when it can b...
4bb7532163 Fix soap-client URL

4 files changed, 11 insertions, 5 deletions

diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 566229b2f32..bd40e10052d 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
diff --git a/lisp/fileloop.el b/lisp/fileloop.el
index 458c25a49b0..b778eca8e9b 100644
--- a/lisp/fileloop.el
+++ b/lisp/fileloop.el
@@ -57,6 +57,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)
 
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 1556ee290f1..d3e434aec90 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
diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el
index bb74f47a8b9..81bbc336dc3 100644
--- a/lisp/net/soap-client.el
+++ b/lisp/net/soap-client.el
@@ -3028,7 +3028,7 @@ SERVICE-URL should be provided when WS-Addressing is being used."
       (insert "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<soap:Envelope\n")
       (when (eq use 'encoded)
         (insert "    soapenc:encodingStyle=\"\
-https://schemas.xmlsoap.org/soap/encoding/\"\n"))
+http://schemas.xmlsoap.org/soap/encoding/\"\n"))
       (dolist (nstag soap-encoded-namespaces)
         (insert "    xmlns:" nstag "=\"")
         (let ((nsname (cdr (assoc nstag soap-well-known-xmlns))))