diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-22 11:01:30 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-22 11:01:30 -0700 |
| commit | 37b9099068c10383e959ee366a52a22516846163 (patch) | |
| tree | f135528cdacc4313be84f7bf1ceade19327d5fe7 /lisp/emacs-lisp | |
| parent | 6bd1e2203486ace170f5de15cf7d66146fc8cc87 (diff) | |
| parent | 56df61712ac446d3dcd9c897f687cc74a04be314 (diff) | |
| download | emacs-37b9099068c10383e959ee366a52a22516846163.tar.gz emacs-37b9099068c10383e959ee366a52a22516846163.tar.bz2 emacs-37b9099068c10383e959ee366a52a22516846163.zip | |
-
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/smie.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index 495ba7cb859..1d8f0cb8f5d 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -1493,7 +1493,10 @@ should not be computed on the basis of the following token." (let ((endpos (point))) (goto-char pos) (forward-line 1) - (and (equal res (smie-indent-forward-token)) + ;; As seen in bug#22960, pos may be inside + ;; a string, and forward-token may then stumble. + (and (ignore-errors + (equal res (smie-indent-forward-token))) (eq (point) endpos))))) nil (goto-char pos) |