From 6f40b8b23a7c4dcc1ad07e0ad9d32609d21c9f79 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 30 Aug 2016 19:44:41 -0700 Subject: [PATCH] Minor doc quoting fixes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * doc/misc/htmlfontify.texi (Interactive): * lisp/htmlfontify.el (htmlfontify-buffer): Spell out character names, for clarity. The old doc string generated the *Help* text ‘^L ([FF]) or ¤ (244)’, where ‘[FF]’ stands for a form feed character; this was confusing. * lisp/electric.el (electric-quote-mode): * src/doc.c (syms_of_doc): * src/editfns.c (Fformat_message): Remove no-longer-necessary ‘\=’s in doc strings. --- doc/misc/htmlfontify.texi | 3 ++- lisp/electric.el | 2 +- lisp/htmlfontify.el | 5 +++-- src/doc.c | 2 +- src/editfns.c | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/doc/misc/htmlfontify.texi b/doc/misc/htmlfontify.texi index 20cde7124d1..9cb1d6f4317 100644 --- a/doc/misc/htmlfontify.texi +++ b/doc/misc/htmlfontify.texi @@ -126,7 +126,8 @@ entities, so you should even be able to do html-within-html fontified display. You should, however, note that random control or non-ASCII characters -such as ^L (\x0c) or ¤ (\xa4) won't get mapped yet. +such as ^L (U+000C FORM FEED (FF)) or ¤ (U+00A4 CURRENCY SIGN) won't +get mapped yet. If the @var{srcdir} and @var{file} arguments are set, lookup etags derived entries in the @ref{hfy-tags-cache} and add html anchors diff --git a/lisp/electric.el b/lisp/electric.el index e2896010405..0ec0a1efba1 100644 --- a/lisp/electric.el +++ b/lisp/electric.el @@ -491,7 +491,7 @@ With a prefix argument ARG, enable Electric Quote mode if ARG is positive, and disable it otherwise. If called from Lisp, enable the mode if ARG is omitted or nil. -When enabled, as you type this replaces \\=` with \\=‘, \\=' with \\=’, +When enabled, as you type this replaces \\=` with ‘, \\=' with ’, \\=`\\=` with “, and \\='\\=' with ”. This occurs only in comments, strings, and text paragraphs, and these are selectively controlled with `electric-quote-comment', `electric-quote-string', and diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 431300c81c2..8cbe3c1dc9e 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -1849,8 +1849,9 @@ Dangerous characters in the existing buffer are turned into HTML entities, so you should even be able to do HTML-within-HTML fontified display. -You should, however, note that random control or eight-bit -characters such as ^L (\x0c) or ¤ (\xa4) won't get mapped yet. +You should, however, note that random control or non-ASCII +characters such as ^L (U+000C FORM FEED (FF)) or ¤ (U+00A4 +CURRENCY SIGN) won't get mapped yet. If the SRCDIR and FILE arguments are set, lookup etags derived entries in the `hfy-tags-cache' and add HTML anchors and diff --git a/src/doc.c b/src/doc.c index 6376398cc22..ce4f89b94dd 100644 --- a/src/doc.c +++ b/src/doc.c @@ -1014,7 +1014,7 @@ quotes for grave accent and apostrophe. This is done in help output and in functions like `message' and `format-message'. It is not done in `format'. -`curve' means quote with curved single quotes \\=‘like this\\=’. +`curve' means quote with curved single quotes ‘like this’. `straight' means quote with straight apostrophes \\='like this\\='. `grave' means quote with grave accent and apostrophe \\=`like this\\='; i.e., do not alter quote marks. The default value nil acts like diff --git a/src/editfns.c b/src/editfns.c index 26a86c7fab1..a46e33bee9e 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -3907,8 +3907,8 @@ The first argument is a format control string. The other arguments are substituted into it to make the result, a string. This acts like `format', except it also replaces each left single -quotation mark (\\=‘) and grave accent (\\=`) by a left quote, and each -right single quotation mark (\\=’) and apostrophe (\\=') by a right quote. +quotation mark (‘) and grave accent (\\=`) by a left quote, and each +right single quotation mark (’) and apostrophe (\\=') by a right quote. The left and right quote replacement characters are specified by `text-quoting-style'. -- 2.39.2