From: Stefan Kangas <stefan@marxist.se>
To: 44471@debbugs.gnu.org
Subject: bug#44471: [PATCH] Simplify text-quoting-style
Date: Thu, 5 Nov 2020 08:18:21 -0800 [thread overview]
Message-ID: <CADwFkmnyBmC8k1BneOi96QAphLEek18bEvbdXy8KiikKdaYBBA@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 296 bytes --]
I found an opportunity to simplify the code for text-quoting-style. See
the attached patch.
The patch also improves the name of the defun `get-quoting-style' by
changing it to `text-quoting-style'. (This new name matches the old C
function name and the existing variable name.)
Any comments?
[-- Attachment #2: 0001-Simplify-text-quoting-style.patch --]
[-- Type: text/x-diff, Size: 6474 bytes --]
From 6631890cc74c0c79a2ae20fe9f0b1bd66706b4c9 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Thu, 5 Nov 2020 15:32:45 +0100
Subject: [PATCH] Simplify text-quoting-style
* src/doc.c (text_quoting_style): Remove function by merging it...
(Ftext_quoting_style): ...here. Rename from Fget_quoting_style.
(syms_of_doc): Update defsubr for Ftext_quoting_style.
* src/lisp.h (enum text_quoting_style): Remove enum.
* src/doprnt.c (doprnt):
* src/editfns.c (styled_format):
* lisp/help.el (substitute-command-keys): Update callers to use
text-quoting-style.
---
lisp/help.el | 4 ++--
src/doc.c | 40 ++++++++++++++--------------------------
src/doprnt.c | 8 ++++----
src/editfns.c | 6 +++---
src/lisp.h | 12 ------------
5 files changed, 23 insertions(+), 47 deletions(-)
diff --git a/lisp/help.el b/lisp/help.el
index 466ff21eb2..32ee84b5f9 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1103,13 +1103,13 @@ substitute-command-keys
(describe-map-tree this-keymap t (nreverse earlier-maps)
nil nil t nil nil t))))))))
;; 2. Handle quotes.
- ((and (eq (get-quoting-style) 'curve)
+ ((and (eq (text-quoting-style) 'curve)
(or (and (= (following-char) ?\`)
(prog1 t (insert "‘")))
(and (= (following-char) ?')
(prog1 t (insert "’")))))
(delete-char 1))
- ((and (eq (get-quoting-style) 'straight)
+ ((and (eq (text-quoting-style) 'straight)
(= (following-char) ?\`))
(insert "'")
(delete-char 1))
diff --git a/src/doc.c b/src/doc.c
index f1ce266d39..5f23e3d0bb 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -682,37 +682,25 @@ default_to_grave_quoting_style (void)
&& EQ (AREF (dv, 0), make_fixnum ('`')));
}
-/* Return the current effective text quoting style. */
-enum text_quoting_style
-text_quoting_style (void)
+DEFUN ("text-quoting-style", Ftext_quoting_style,
+ Stext_quoting_style, 0, 0, 0,
+ doc: /* Return the current effective text quoting style.
+See variable `text-quoting-style'. */)
+ (void)
{
+ /* Use grave accent and apostrophe `like this'. */
if (NILP (Vtext_quoting_style)
? default_to_grave_quoting_style ()
: EQ (Vtext_quoting_style, Qgrave))
- return GRAVE_QUOTING_STYLE;
+ return Qgrave;
+
+ /* Use apostrophes 'like this'. */
else if (EQ (Vtext_quoting_style, Qstraight))
- return STRAIGHT_QUOTING_STYLE;
- else
- return CURVE_QUOTING_STYLE;
-}
+ return Qstraight;
-/* This is just a Lisp wrapper for text_quoting_style above. */
-DEFUN ("get-quoting-style", Fget_quoting_style,
- Sget_quoting_style, 0, 0, 0,
- doc: /* Return the current effective text quoting style.
-See variable `text-quoting-style'. */)
- (void)
-{
- switch (text_quoting_style ())
- {
- case STRAIGHT_QUOTING_STYLE:
- return Qstraight;
- case CURVE_QUOTING_STYLE:
- return Qcurve;
- case GRAVE_QUOTING_STYLE:
- default:
- return Qgrave;
- }
+ /* Use curved single quotes ‘like this’. */
+ else
+ return Qcurve;
}
\f
@@ -755,5 +743,5 @@ syms_of_doc (void)
defsubr (&Sdocumentation);
defsubr (&Sdocumentation_property);
defsubr (&Ssnarf_documentation);
- defsubr (&Sget_quoting_style);
+ defsubr (&Stext_quoting_style);
}
diff --git a/src/doprnt.c b/src/doprnt.c
index ce259d07cf..9316497720 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -199,7 +199,7 @@ doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
/* Buffer we have got with malloc. */
char *big_buffer = NULL;
- enum text_quoting_style quoting_style = text_quoting_style ();
+ Lisp_Object quoting_style = Ftext_quoting_style ();
bufsize--;
@@ -482,13 +482,13 @@ doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
char const *src;
ptrdiff_t srclen;
- if (quoting_style == CURVE_QUOTING_STYLE && fmtchar == '`')
+ if (EQ (quoting_style, Qcurve) && fmtchar == '`')
src = uLSQM, srclen = sizeof uLSQM - 1;
- else if (quoting_style == CURVE_QUOTING_STYLE && fmtchar == '\'')
+ else if (EQ (quoting_style, Qcurve) && fmtchar == '\'')
src = uRSQM, srclen = sizeof uRSQM - 1;
else
{
- if (quoting_style == STRAIGHT_QUOTING_STYLE && fmtchar == '`')
+ if (EQ (quoting_style, Qstraight) && fmtchar == '`')
fmtchar = '\'';
eassert (ASCII_CHAR_P (fmtchar));
*bufptr++ = fmtchar;
diff --git a/src/editfns.c b/src/editfns.c
index ca6b8981eb..320fbdc669 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3147,7 +3147,7 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
if (STRINGP (args[i]) && STRING_MULTIBYTE (args[i]))
multibyte = true;
- int quoting_style = message ? text_quoting_style () : -1;
+ Lisp_Object quoting_style = message ? Ftext_quoting_style () : Qnil;
ptrdiff_t ispec;
ptrdiff_t nspec = 0;
@@ -3767,7 +3767,7 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
unsigned char str[MAX_MULTIBYTE_LENGTH];
if ((format_char == '`' || format_char == '\'')
- && quoting_style == CURVE_QUOTING_STYLE)
+ && EQ (quoting_style, Qcurve))
{
if (! multibyte)
{
@@ -3778,7 +3778,7 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
convbytes = 3;
new_result = true;
}
- else if (format_char == '`' && quoting_style == STRAIGHT_QUOTING_STYLE)
+ else if (format_char == '`' && EQ (quoting_style, Qstraight))
{
convsrc = "'";
new_result = true;
diff --git a/src/lisp.h b/src/lisp.h
index a3cfb5044d..c6eb44d74e 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4495,18 +4495,6 @@ #define DAEMON_RUNNING (w32_daemon_event != INVALID_HANDLE_VALUE)
extern void syms_of_callproc (void);
/* Defined in doc.c. */
-enum text_quoting_style
- {
- /* Use curved single quotes ‘like this’. */
- CURVE_QUOTING_STYLE,
-
- /* Use grave accent and apostrophe `like this'. */
- GRAVE_QUOTING_STYLE,
-
- /* Use apostrophes 'like this'. */
- STRAIGHT_QUOTING_STYLE
- };
-extern enum text_quoting_style text_quoting_style (void);
extern Lisp_Object read_doc_string (Lisp_Object);
extern Lisp_Object get_doc_string (Lisp_Object, bool, bool);
extern void syms_of_doc (void);
--
2.28.0
next reply other threads:[~2020-11-05 16:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-05 16:18 Stefan Kangas [this message]
2020-11-09 15:56 ` bug#44471: [PATCH] Simplify text-quoting-style Lars Ingebrigtsen
2020-11-09 20:13 ` Stefan Kangas
2020-11-10 14:30 ` Lars Ingebrigtsen
2020-11-10 16:12 ` Eli Zaretskii
2020-11-11 19:12 ` Stefan Kangas
2020-11-11 19:24 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CADwFkmnyBmC8k1BneOi96QAphLEek18bEvbdXy8KiikKdaYBBA@mail.gmail.com \
--to=stefan@marxist.se \
--cc=44471@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).