From 08bb4e9393611607190c495bc34ad1738b8e0da1 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 25 Jun 2015 07:21:20 -0700 Subject: [PATCH] =?UTF-8?q?Translate=20undisplayable=20=E2=80=98=20to=20`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/lispref/help.texi (Keys in Documentation): * lisp/international/mule-cmds.el (set-locale-environment): * lisp/term/w32console.el (terminal-init-w32console): * src/doc.c (Fsubstitute_command_keys, Vhelp_quote_translation): If ‘ is not displayable, transliterate it to `, not to '. See: http://lists.gnu.org/archive/html/emacs-devel/2015-06/msg00542.html --- doc/lispref/help.texi | 2 +- lisp/international/mule-cmds.el | 4 ++-- lisp/term/w32console.el | 2 +- src/doc.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi index 44a680c..fde985d 100644 --- a/doc/lispref/help.texi +++ b/doc/lispref/help.texi @@ -357,7 +357,7 @@ quotes. If the value is @code{?'} (apostrophe), the style is @t{'like this'} with apostrophes. If the value is @code{?`} (grave accent), the style is @t{`like this'} with grave accent and apostrophe. The default value @code{nil} means to use curved single quotes if -displayable and apostrophes otherwise. +displayable, and grave accent and apostrophe otherwise. @end defvar @defun substitute-command-keys string diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 16c1003..248c89c 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -2731,9 +2731,9 @@ See also `locale-charset-language-names', `locale-language-names', (set-terminal-coding-system 'utf-8) (set-keyboard-coding-system 'utf-8))) - ;; If curved quotes don't work, display straight ASCII approximations. + ;; If curved quotes don't work, display ASCII approximations. (unless frame - (dolist (char-repl '((?‘ . [?\']) (?’ . [?\']) (?“ . [?\"]) (?” . [?\"]))) + (dolist (char-repl '((?‘ . [?\`]) (?’ . [?\']) (?“ . [?\"]) (?” . [?\"]))) (when (not (char-displayable-p (car char-repl))) (or standard-display-table (setq standard-display-table (make-display-table))) diff --git a/lisp/term/w32console.el b/lisp/term/w32console.el index 29ab2f1..2df1378 100644 --- a/lisp/term/w32console.el +++ b/lisp/term/w32console.el @@ -69,7 +69,7 @@ ;; Since we changed the terminal encoding, we need to repeat ;; the test for Unicode quotes being displayable. (dolist (char-repl - '((?‘ . [?\']) (?’ . [?\']) (?“ . [?\"]) (?” . [?\"]))) + '((?‘ . [?\`]) (?’ . [?\']) (?“ . [?\"]) (?” . [?\"]))) (when (not (char-displayable-p (car char-repl))) (or standard-display-table (setq standard-display-table (make-display-table))) diff --git a/src/doc.c b/src/doc.c index d2d3c8d..655b911 100644 --- a/src/doc.c +++ b/src/doc.c @@ -761,8 +761,8 @@ Otherwise, return a new string. */) Lisp_Object dv = DISP_CHAR_VECTOR (XCHAR_TABLE (Vstandard_display_table), LEFT_SINGLE_QUOTATION_MARK); if (VECTORP (dv) && ASIZE (dv) == 1 - && EQ (AREF (dv, 0), make_number ('\''))) - quote_translation = apostrophe; + && EQ (AREF (dv, 0), make_number ('`'))) + quote_translation = grave_accent; } multibyte = STRING_MULTIBYTE (string); @@ -1040,7 +1040,7 @@ Quote \\=‘like this\\=’ if the value is ?\\=‘ (left single quotation mark) Quote 'like this' if the value is ?' (apostrophe). Quote \\=`like this' if the value is ?\\=` (grave accent). The default value is nil, which means quote with left single quotation mark -if displayable, and with apostrophe otherwise. */); +if displayable, and with grave accent otherwise. */); Vhelp_quote_translation = Qnil; defsubr (&Sdocumentation); -- 2.1.0