diff options
| author | Philip Kaludercic <philipk@posteo.net> | 2022-07-31 14:27:28 +0200 |
|---|---|---|
| committer | Philip Kaludercic <philipk@posteo.net> | 2022-07-31 14:27:28 +0200 |
| commit | 118033294136a8fb3a14347ce190b447dd2ff2fe (patch) | |
| tree | 3d036aa53a16c1283883b0955cbed77be3295310 /lisp/emacs-lisp/smie.el | |
| parent | edd73bd0d5474b71cbd4261c6a722be8f652bb9a (diff) | |
| parent | ac237334c7672377721e4d27e8ecd6b09d453568 (diff) | |
| download | emacs-118033294136a8fb3a14347ce190b447dd2ff2fe.tar.gz emacs-118033294136a8fb3a14347ce190b447dd2ff2fe.tar.bz2 emacs-118033294136a8fb3a14347ce190b447dd2ff2fe.zip | |
Merge remote-tracking branch 'origin/master' into feature/package+vc
Diffstat (limited to 'lisp/emacs-lisp/smie.el')
| -rw-r--r-- | lisp/emacs-lisp/smie.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index 2bab1319132..61d52026b38 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -1846,7 +1846,9 @@ to which that point should be aligned, if we were to reindent it.") (move-to-column fc) (syntax-ppss)))) (while - (and (with-demoted-errors "SMIE Error: %S" + ;; We silence the error completely since errors are "normal" in + ;; some cases and an error message would be annoying (bug#19342). + (and (ignore-error scan-error (save-excursion (let ((end (point)) (bsf nil) ;Best-so-far. |