[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master f2a6bbe 3/3: Merge from origin/emacs-27
From: |
Glenn Morris |
Subject: |
master f2a6bbe 3/3: Merge from origin/emacs-27 |
Date: |
Sun, 27 Sep 2020 12:37:24 -0400 (EDT) |
branch: master
commit f2a6bbefa919c0fcde66c0a8fb54aa5fb499de65
Merge: c8f295f 0b78785
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>
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
---
doc/emacs/emacs.texi | 7 +++----
lisp/fileloop.el | 3 +++
lisp/menu-bar.el | 4 ++++
lisp/net/soap-client.el | 2 +-
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 566229b..bd40e10 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 458c25a..b778eca 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 1556ee2..d3e434a 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 bb74f47..81bbc33 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))))