diff options
author | Glenn Morris <rgm@gnu.org> | 2019-08-20 09:01:55 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2019-08-20 09:01:55 -0700 |
commit | 8f68449c9476956425881bf1534fa727d5247448 (patch) | |
tree | 6647f6d286b2efdfab829f0a6715164743594084 /test/lisp/emacs-lisp | |
parent | 65dc07f563f229faadaa44312776941abbf6e1b6 (diff) | |
parent | 0b810ebc9fe65e447e37832db40ccf634e5548d9 (diff) | |
download | emacs-8f68449c9476956425881bf1534fa727d5247448.tar.gz |
Merge from origin/emacs-26
0b810eb Fix a typo in char-width-table
3f00db7 Minor update in admin/notes/unicode
bcd0115 Fix lisp indent infloop on unfinished strings (Bug#37045)
5f992d1 Improve commentary in composite.el
3a04be2 ; Improve commentary in xdisp.c
15de1d1 Fix markup in dired-x.texi
bda7fc7 ; Fix typo in a doc string of speedbar.el
6f57ef9 * src/callproc.c (Fcall_process): Doc fix.
# Conflicts:
# doc/misc/dired-x.texi
# lisp/international/characters.el
# src/callproc.c
Diffstat (limited to 'test/lisp/emacs-lisp')
-rw-r--r-- | test/lisp/emacs-lisp/lisp-mode-tests.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/lisp/emacs-lisp/lisp-mode-tests.el b/test/lisp/emacs-lisp/lisp-mode-tests.el index 63632449ca5..e4ba929ecbd 100644 --- a/test/lisp/emacs-lisp/lisp-mode-tests.el +++ b/test/lisp/emacs-lisp/lisp-mode-tests.el @@ -284,7 +284,11 @@ Expected initialization file: `%s'\" (lisp-indent-line) (should (equal (buffer-string) "prompt> foo")))) - +(ert-deftest lisp-indent-unfinished-string () + "Don't infloop on unfinished string (Bug#37045)." + (with-temp-buffer + (insert "\"\n") + (lisp-indent-region (point-min) (point-max)))) (provide 'lisp-mode-tests) ;;; lisp-mode-tests.el ends here |