From 93912baefd10ccb3e6e2e9696cda3b813c056c87 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Mon, 15 Apr 2019 18:49:57 -0400 Subject: [PATCH 1/4] Be more careful about indent-sexp going over eol (Bug#35286) * lisp/emacs-lisp/lisp-mode.el (indent-sexp): Only go over multiple sexps if the end of line is within a sexp. * test/lisp/emacs-lisp/lisp-mode-tests.el (indent-sexp-stop-before-eol-comment) (indent-sexp-stop-before-eol-non-lisp): New tests. --- lisp/emacs-lisp/lisp-mode.el | 22 ++++++++++++------- test/lisp/emacs-lisp/lisp-mode-tests.el | 28 +++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 57f57175c51..74bf0c87c53 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -1205,19 +1205,25 @@ ENDPOS is encountered." ;; Get error now if we don't have a complete sexp ;; after point. (save-excursion + (forward-sexp 1) (let ((eol (line-end-position))) - (forward-sexp 1) ;; We actually look for a sexp which ends ;; after the current line so that we properly ;; indent things like #s(...). This might not ;; be needed if Bug#15998 is fixed. - (condition-case () - (while (and (< (point) eol) (not (eobp))) - (forward-sexp 1)) - ;; But don't signal an error for incomplete - ;; sexps following the first complete sexp - ;; after point. - (scan-error nil))) + (when (and (< (point) eol) + ;; Check if eol is within a sexp. + (> (nth 0 (save-excursion + (parse-partial-sexp + (point) eol))) + 0)) + (condition-case () + (while (< (point) eol) + (forward-sexp 1)) + ;; But don't signal an error for incomplete + ;; sexps following the first complete sexp + ;; after point. + (scan-error nil)))) (point))))) (save-excursion (while (let ((indent (lisp-indent-calc-next parse-state)) diff --git a/test/lisp/emacs-lisp/lisp-mode-tests.el b/test/lisp/emacs-lisp/lisp-mode-tests.el index a6370742ab4..63632449ca5 100644 --- a/test/lisp/emacs-lisp/lisp-mode-tests.el +++ b/test/lisp/emacs-lisp/lisp-mode-tests.el @@ -136,6 +136,34 @@ noindent\" 3 (indent-sexp) (should (equal (buffer-string) "(())")))) +(ert-deftest indent-sexp-stop-before-eol-comment () + "`indent-sexp' shouldn't look for more sexps after an eol comment." + ;; See https://debbugs.gnu.org/35286. + (with-temp-buffer + (emacs-lisp-mode) + (let ((str "() ;;\n x")) + (insert str) + (goto-char (point-min)) + (indent-sexp) + ;; The "x" is in the next sexp, so it shouldn't get indented. + (should (equal (buffer-string) str))))) + +(ert-deftest indent-sexp-stop-before-eol-non-lisp () + "`indent-sexp' shouldn't be too agressive in non-Lisp modes." + ;; See https://debbugs.gnu.org/35286#13. + (with-temp-buffer + (prolog-mode) + (let ((str "\ +x(H) --> + {y(H)}. +a(A) --> + b(A).")) + (insert str) + (search-backward "{") + (indent-sexp) + ;; There's no line-spanning sexp, so nothing should be indented. + (should (equal (buffer-string) str))))) + (ert-deftest lisp-indent-region () "Test basics of `lisp-indent-region'." (with-temp-buffer From 9ec18fbd560526ab19c6171aff15995d1307233e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 22 Apr 2019 21:24:22 -0400 Subject: [PATCH 2/4] * admin/admin.el (set-version): Check for increase in version length, rather than a .50 version. --- admin/admin.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/admin.el b/admin/admin.el index fda6708d4cd..d7de42e0782 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -138,10 +138,10 @@ Root must be the root of an Emacs source tree." (if (eq 2 (length newversion)) 0 1)))) (majorbump (and oldversion (not (equal oldmajor newmajor)))) (minorbump (and oldversion (not majorbump) - (or (not (equal (cadr oldversion) - (cadr newversion))) - (and (equal (cadr oldversion) (cadr newversion)) - (equal (nth 2 newversion) 50))))) + (or (not (equal (cadr oldversion) (cadr newversion))) + ;; Eg 26.2 -> 26.2.50. + (and (> (length newversion) + (length oldversion)))))) (newsfile (expand-file-name "etc/NEWS" root)) (oldnewsfile (expand-file-name (format "etc/NEWS.%s" oldmajor) root))) (unless (> (length newversion) 2) ; pretest or release candidate? From 25a2ff72d09dfedc3803984cd1744c982de1c709 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Thu, 25 Apr 2019 22:49:03 +0200 Subject: [PATCH 3/4] ; Add missing space in custom.texi --- doc/emacs/custom.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index 3f660fe9a28..b07362f3cea 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -1329,7 +1329,7 @@ On MS-DOS, the name of this file should be @file{_dir-locals.el}, due to limitations of the DOS filesystems. If the filesystem is limited to 8+3 file names, the name of the file will be truncated by the OS to @file{_dir-loc.el}. -}in a directory. Whenever Emacs visits any file in that directory or +} in a directory. Whenever Emacs visits any file in that directory or any of its subdirectories, it will apply the directory-local variables specified in @file{.dir-locals.el}, as though they had been defined as file-local variables for that file (@pxref{File Variables}). Emacs From 0e8d452c1c166ff65a0325de23bc04b57aea68d8 Mon Sep 17 00:00:00 2001 From: "Charles A. Roelli" Date: Fri, 26 Apr 2019 21:49:46 +0200 Subject: [PATCH 4/4] ; * doc/lispref/nonascii.texi (Coding System Basics): Fix grammar. --- doc/lispref/nonascii.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index d58041b279b..df4f2932c6e 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi @@ -1049,7 +1049,7 @@ is like @code{undecided}, but it prefers to choose @code{utf-8} when possible. In general, a coding system doesn't guarantee roundtrip identity: -decoding a byte sequence using coding system, then encoding the +decoding a byte sequence using a coding system, then encoding the resulting text in the same coding system, can produce a different byte sequence. But some coding systems do guarantee that the byte sequence will be the same as what you originally decoded. Here are a few