From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 12 Oct 2021 13:20:47 +0000 (+0300)
Subject: ; Fix last change related to shorthands
X-Git-Tag: emacs-28.0.90~309
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=66b8dfd0602c2175a0296ce6a844d77c94813429;p=emacs.git

; Fix last change related to shorthands

* src/lread.c (read1): Minor stylistic fixes of the last change,
including the wording of the comment.

* doc/lispref/symbols.texi (Shorthands): Fix wording and typos.
---

diff --git a/doc/lispref/symbols.texi b/doc/lispref/symbols.texi
index ed7dce1c091..32590d4f99e 100644
--- a/doc/lispref/symbols.texi
+++ b/doc/lispref/symbols.texi
@@ -742,13 +742,12 @@ There are two exceptions to rules governing Shorthand transformations:
 
 @itemize @bullet
 @item
-Symbol forms comprised entirely of symbol constituents (@pxref{Syntax
-Class Table}) are exempt not transform.  For example, it's possible to
-use @code{-} or @code{/=} as shorthand prefixes, but that won't shadow
-the arithmetic @emph{functions} that have exactly that prefix as their
-full name.;
+Symbol forms comprised entirely of symbol and punctuation characters
+(@pxref{Syntax Class Table}) are not transformed.  For example,
+it's possible to use @code{-} or @code{/=} as shorthand prefixes, but
+that won't shadow the arithmetic @emph{functions} of those names.
 
 @item
-Symbol forms whose name starts with the the characters @code{#_} are
-also exempted.
+Symbol forms whose names start with @samp{#} or @samp{_} are not
+transformed.
 @end itemize
diff --git a/src/lread.c b/src/lread.c
index 128b46aefef..b3f9e6ff527 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -3805,12 +3805,13 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list)
 	      ptrdiff_t longhand_bytes = 0;
 
 	      Lisp_Object tem;
-	      if (skip_shorthand ||
+	      if (skip_shorthand
 		  /* The following ASCII characters are used in the
-		     only "core" Emacs Lisp symbols that are
-		     exclusively comprised of 'symbol constituent'
-		     syntax. */
-		  strspn(read_buffer, "^*+-/<=>_|") >= nbytes)
+		     only "core" Emacs Lisp symbols that are comprised
+		     entirely of characters that have the 'symbol
+		     constituent' syntax.  We exempt them from
+		     transforming according to shorthands.  */
+		  || strspn (read_buffer, "^*+-/<=>_|") >= nbytes)
 		tem = oblookup (obarray, read_buffer, nchars, nbytes);
 	      else
 		tem = oblookup_considering_shorthand (obarray, read_buffer,