'text-quoting-style' now affects only ` and '

Change 'text-quoting-style' so that it no longer affects
formatting of curved quotes in format arguments to functions like
'message'.  In particular, when this variable's value is 'grave',
all quotes in formats are output as-is.
* doc/lispref/help.texi (Keys in Documentation):
* doc/lispref/strings.texi (Formatting Strings):
* doc/lispref/tips.texi (Documentation Tips):
* etc/NEWS:
* src/doc.c (syms_of_doc): Document this.
* lisp/help-fns.el (describe-function-1):
* src/doc.c (text_quoting_style, Fsubstitute_command_keys)
(syms_of_doc):
* src/editfns.c (styled_format): Omit now-unnecessary code.
* src/lisp.h (LEAVE_QUOTING_STYLE): Remove.

3 files changed, 11 insertions, 55 deletions

diff --git a/src/doc.c b/src/doc.c
index 53264334ed5..017dd173d0a 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -704,8 +704,6 @@ text_quoting_style (void)
       ? default_to_grave_quoting_style ()
       : EQ (Vtext_quoting_style, Qgrave))
     return GRAVE_QUOTING_STYLE;
-  else if (EQ (Vtext_quoting_style, Qleave))
-    return LEAVE_QUOTING_STYLE;
   else if (EQ (Vtext_quoting_style, Qstraight))
     return STRAIGHT_QUOTING_STYLE;
   else
@@ -982,29 +980,12 @@ Otherwise, return a new string.  */)
           nchars++;
           changed = true;
         }
-      else if (! multibyte)
-        *bufp++ = *strp++, nchars++;
       else
         {
-          int len;
-          int ch = STRING_CHAR_AND_LENGTH (strp, len);
-          if ((ch == LEFT_SINGLE_QUOTATION_MARK
-               || ch == RIGHT_SINGLE_QUOTATION_MARK)
-              && quoting_style != CURVE_QUOTING_STYLE
-              && quoting_style != LEAVE_QUOTING_STYLE)
-            {
-              *bufp++ = ((ch == LEFT_SINGLE_QUOTATION_MARK
-                          && quoting_style == GRAVE_QUOTING_STYLE)
-                         ? '`' : '\'');
-              strp += len;
-              changed = true;
-            }
-          else
-            {
-              do
-                *bufp++ = *strp++;
-              while (--len != 0);
-            }
+          *bufp++ = *strp++;
+          if (multibyte)
+            while (! CHAR_HEAD_P (*strp))
+              *bufp++ = *strp++;
           nchars++;
         }
     }
@@ -1036,7 +1017,6 @@ void
 syms_of_doc (void)
 {
   DEFSYM (Qfunction_documentation, "function-documentation");
-  DEFSYM (Qleave, "leave");
   DEFSYM (Qgrave, "grave");
   DEFSYM (Qstraight, "straight");
 
@@ -1051,15 +1031,16 @@ syms_of_doc (void)
   DEFVAR_LISP ("text-quoting-style", Vtext_quoting_style,
                doc: /* Style to use for single quotes in help and messages.
 Its value should be a symbol.  It works by substituting certain single
-quotes for certain other single quotes.  This is done in help output and
-`message' output.  It is not done in `format'.
+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'.
 
-`leave' means do not do any substitutions.
 `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\\='.
-The default value nil acts like `curve' if curved single quotes are
-displayable, and like `grave' otherwise.  */);
+`grave' means quote with grave accent and apostrophe \\=`like this\\=';
+i.e., do not alter quote marks.  The default value nil acts like
+`curve' if curved single quotes are displayable, and like `grave'
+otherwise.  */);
   Vtext_quoting_style = Qnil;
 
   DEFVAR_BOOL ("internal--text-quoting-flag", text_quoting_flag,
diff --git a/src/editfns.c b/src/editfns.c
index afcf1cab72b..6b0996d65eb 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3977,8 +3977,6 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
       multibyte = true;
 
   int quoting_style = message ? text_quoting_style () : -1;
-  if (quoting_style == LEAVE_QUOTING_STYLE)
-    quoting_style = -1;
 
   /* If we start out planning a unibyte result,
      then discover it has to be multibyte, we jump back to retry.  */
@@ -4457,14 +4455,6 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
         }
       else
         {
-          /* Named constants for the UTF-8 encodings of U+2018 LEFT SINGLE
-             QUOTATION MARK and U+2019 RIGHT SINGLE QUOTATION MARK.  */
-          enum
-          {
-            uLSQM0 = 0xE2, uLSQM1 = 0x80, uLSQM2 = 0x98,
-            /* uRSQM0 = 0xE2, uRSQM1 = 0x80, */ uRSQM2 = 0x99
-          };
-
           unsigned char str[MAX_MULTIBYTE_LENGTH];
 
           if ((format_char == '`' || format_char == '\'')
@@ -4480,18 +4470,6 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
             }
           else if (format_char == '`' && quoting_style == STRAIGHT_QUOTING_STYLE)
             convsrc = "'";
-          else if (format_char == uLSQM0 && CURVE_QUOTING_STYLE < quoting_style
-                   && multibyte_format
-                   && (unsigned char) format[0] == uLSQM1
-                   && ((unsigned char) format[1] == uLSQM2
-                       || (unsigned char) format[1] == uRSQM2))
-            {
-              convsrc = (((unsigned char) format[1] == uLSQM2
-                          && quoting_style == GRAVE_QUOTING_STYLE)
-                         ? "`" : "'");
-              format += 2;
-              memset (&discarded[format0 + 1 - format_start], 2, 2);
-            }
           else
             {
               /* Copy a single character from format to buf.  */
diff --git a/src/lisp.h b/src/lisp.h
index de74a47e3d3..1fc6130be0b 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4198,9 +4198,6 @@ extern void syms_of_callproc (void);
 /* Defined in doc.c.  */
 enum text_quoting_style
   {
-    /* Leave quotes unchanged.  */
-    LEAVE_QUOTING_STYLE,
-
     /* Use curved single quotes ‘like this’.  */
     CURVE_QUOTING_STYLE,