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
This commit is contained in:
Glenn Morris 2020-09-27 09:37:10 -07:00
commit f2a6bbefa9
4 changed files with 11 additions and 5 deletions

View file

@ -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

View file

@ -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)

View file

@ -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

View file

@ -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))))