diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-01-01 01:13:04 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-01-01 01:13:04 -0800 |
| commit | bb267f17f9e1e593d8dee379aceee22d7fa42680 (patch) | |
| tree | 466dfb3f8ef7587ebcb652709bd1cc05d18a92f3 /lisp/man.el | |
| parent | a5835dfee139322de7aa071f1c87ef015acbecad (diff) | |
| parent | 63b04c11d530f4a6a41f112d1b3ba1ed1eb81195 (diff) | |
| download | emacs-bb267f17f9e1e593d8dee379aceee22d7fa42680.tar.gz | |
Merge from origin/emacs-26
63b04c11d5 Fix copyright years by hand
5c7dd8a783 Update copyright year to 2018
220a9ecba1 Merge from Gnulib
312c565566 Don't add empty keyboard macro to macro ring (Bug#24992)
39ca289a7a Allow customization of decoding of "man" command
f8240815ea * etc/NEWS: Add security consideration note on passphrase ...
0c78822c70 Fix subtle problem with scroll-down when scroll-margin is ...
acd289c5a4 Fix problems with indexing in User manual
b240c7846b * lisp/help.el (describe-key): Only (copy-sequence elt) wh...
e879a5444a * src/buffer.c (Frestore_buffer_modified_p): Fix bug#29846
81b1028b63 Improve documentation of 'inhibit-modification-hooks' and ...
7175496d7a Fix doc string of 'enable-recursive-minibuffers'
5b38406491 Fix documentation of delsel and of killing text
# Conflicts:
# etc/NEWS
# etc/refcards/ru-refcard.tex
Diffstat (limited to 'lisp/man.el')
| -rw-r--r-- | lisp/man.el | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/lisp/man.el b/lisp/man.el index 798e78bbe76..1a6eda13b7f 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -1,6 +1,6 @@ ;;; man.el --- browse UNIX manual pages -*- lexical-binding: t -*- -;; Copyright (C) 1993-1994, 1996-1997, 2001-2017 Free Software +;; Copyright (C) 1993-1994, 1996-1997, 2001-2018 Free Software ;; Foundation, Inc. ;; Author: Barry A. Warsaw <bwarsaw@cen.com> @@ -268,6 +268,16 @@ Used in `bookmark-set' to get the default bookmark name." :type 'string :group 'man) +;; This is for people who have UTF-8 encoded man pages in non-UTF-8 +;; locales, or who use Cygwin 'man' command from a native MS-Windows +;; build of Emacs. +(defcustom Man-coding-system nil + "Coding-system to decode output from the commands run by `man'. +If this is nil, `man' will use `locale-coding-system'." + :type 'coding-system + :group 'man + :version "26.1") + (defcustom Man-mode-hook nil "Hook run when Man mode is enabled." :type 'hook @@ -1003,7 +1013,10 @@ names or descriptions. The pattern argument is usually an (coding-system-for-write 'raw-text-unix) ;; We must decode the output by a coding system that the ;; system's locale suggests in multibyte mode. - (coding-system-for-read locale-coding-system) + (coding-system-for-read + (or coding-system-for-read ; allow overriding with "C-x RET c" + Man-coding-system + locale-coding-system)) ;; Avoid possible error by using a directory that always exists. (default-directory (if (and (file-directory-p default-directory) |