2 files changed, 32 insertions, 5 deletions

diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi
index ce29f3f5bc3..44a680c4a22 100644
--- a/doc/lispref/help.texi
+++ b/doc/lispref/help.texi
@@ -319,10 +319,22 @@ specifies @var{mapvar}'s value as the keymap for any following
 @samp{\[@var{command}]} sequences in this documentation string.
 
 @item `
-(grave accent) stands for a left single quotation mark (@samp{‘}).
+(grave accent) stands for a left quote, and alters the interpretation
+of the next unmatched apostrophe.
 
 @item '
-(apostrophe) stands for a right single quotation mark (@samp{’}) if
+(apostrophe) stands for a right quote if preceded by grave accent and
+there are no intervening apostrophes.  Otherwise, apostrophe stands
+for itself.
+
+@item ‘
+(left single quotation mark) stands for a left quote.
+
+@item ’
+(right single quotation mark) stands for a right quote.
+
+@item '
+(apostrophe) stands for a right quote if
 preceded by grave accent and there are no intervening apostrophes.
 Otherwise, apostrophe stands for itself.
 
@@ -335,6 +347,19 @@ and @samp{\=\=} puts @samp{\=} into the output.
 @strong{Please note:} Each @samp{\} must be doubled when written in a
 string in Emacs Lisp.
 
+@defvar help-quote-translation
+@cindex curved quotes
+The value of this variable specifies the style
+@code{substitute-command-keys} uses when generating left and right
+quotes.  If the variable's value is @code{?‘} (U+2018 LEFT SINGLE
+QUOTATION MARK), the style is @t{‘like this’} with curved single
+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.
+@end defvar
+
 @defun substitute-command-keys string
 This function scans @var{string} for the above special sequences and
 replaces them by what they stand for, returning the result as a string.
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index 9144497d5f1..7107bb45872 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -671,9 +671,11 @@ Documentation strings can also use an older single-quoting convention,
 which quotes symbols with grave accent @t{`} and apostrophe
 @t{'}: @t{`like-this'} rather than @t{‘like-this’}.  This
 older convention was designed for now-obsolete displays in which grave
-accent and apostrophe were mirror images.  Documentation in this older
-convention is converted to the standard convention when it is copied
-into a help buffer.  @xref{Keys in Documentation}.
+accent and apostrophe were mirror images.
+
+Documentation using either convention is converted to the user's
+preferred format when it is copied into a help buffer.  @xref{Keys in
+Documentation}.
 
 @cindex hyperlinks in documentation strings
 Help mode automatically creates a hyperlink when a documentation string