mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-28 02:40:46 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Michael Albinus 2020-10-29 16:55:12 +01:00
commit f5e080fb1f
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/gnus/gnus-art.el
View file

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

4
lisp/menu-bar.el
View file

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