master f5e080f 2/3: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Michael Albinus]

branch: master
commit f5e080fb1f90f74cd43ff1fa46280a107fbf7757
Merge: 1fb85fb be59466
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 lisp/gnus/gnus-art.el | 7 ++++---
 lisp/menu-bar.el      | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index f9a6dd6..1efc1d6 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2169,9 +2169,10 @@ MAP is an alist where the elements are on the form 
(\"from\" \"to\")."
   (interactive)
   (save-excursion
     (when (article-goto-body)
-      (let ((inhibit-read-only t))
-       (ansi-color-apply-on-region (point) (point-max)))))
-  (setq ansi-color-context-region nil))
+      (require 'ansi-color)
+      (let ((inhibit-read-only t)
+           (ansi-color-context-region nil))
+       (ansi-color-apply-on-region (point) (point-max))))))
 
 (defun gnus-article-treat-unfold-headers ()
   "Unfold folded message headers.
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index f9afc8a..c6ced68 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1570,8 +1570,8 @@ mail status in mode line"))
     (bindings--define-key menu [cua-emulation-mode]
       (menu-bar-make-mm-toggle
        cua-mode
-       "Shift movement mark region (CUA)"
-       "Use shifted movement keys to set and extend the region"
+       "CUA Mode (without C-x/C-c/C-v)"
+       "Enable CUA Mode without rebinding C-x/C-c/C-v keys"
        (:visible (and (boundp 'cua-enable-cua-keys)
                      (not cua-enable-cua-keys)))))