diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-02-13 07:50:24 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-02-13 07:50:24 -0800 |
| commit | 56ce263f506fede328888a321a12b1f85f46d0d5 (patch) | |
| tree | 1d881d6ca6c46b62cffaa93e25ff4b88f3bcc2c7 /lisp/allout.el | |
| parent | 5b160b39c43b7e3d4e377832c306e2e48b53e7e1 (diff) | |
| parent | ad5e350ab764f3a420d29f24ab3222f671b2e8c0 (diff) | |
| download | emacs-56ce263f506fede328888a321a12b1f85f46d0d5.tar.gz | |
Merge from origin/emacs-27
ad5e350ab7 c-end-of-macro: Handle block coment lines with unescaped N...
06c302d425 Fix set-fontset-font with ADD arg non-nil
530067463b Correct "different than" to "different from" where appropr...
56b8768b32 More accurate documentation of 'package-menu-hide-package'
Diffstat (limited to 'lisp/allout.el')
| -rw-r--r-- | lisp/allout.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/allout.el b/lisp/allout.el index 408a2a9a0cc..dedad45f827 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -5926,7 +5926,7 @@ See `allout-toggle-current-subtree-encryption' for more details." (setq buffer-file-coding-system (select-safe-coding-system subtree-beg subtree-end)) ;; if the coding system for the text being encrypted is different - ;; than that prevailing, then there a real risk that the coding + ;; from that prevailing, then there a real risk that the coding ;; system can't be noticed by emacs when the file is visited. to ;; mitigate that, offer to preserve the coding system using a file ;; local variable. |