From ada9b7c9cecdbc2dd6cbd08553d8f83cb80f793a Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Thu, 29 Oct 2020 12:38:13 +0100 Subject: [PATCH 1/2] Tweak previous article-treat-ansi-sequences fix * lisp/gnus/gnus-art.el (article-treat-ansi-sequences): Redo the previous fix to avoid a compilation warning (bug#44299). --- lisp/gnus/gnus-art.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index f9a6dd64427..1efc1d6f7d9 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. From be59466be711b573f7c9a9643af08bbfc05289f6 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Thu, 29 Oct 2020 15:45:07 +0100 Subject: [PATCH 2/2] Fix CUA Mode menu entry to be less confusing Note that the old text was incorrect; shift-selection is controlled by the variable shift-select-mode. * lisp/menu-bar.el (menu-bar-options-menu): Make CUA Mode menu entry less confusing when cua-enable-cua-keys is nil. (Bug#43322) --- lisp/menu-bar.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index f9afc8a5f31..c6ced689a67 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)))))