diff options
| author | Daniel Colascione <dancol@dancol.org> | 2015-03-23 01:42:56 -0700 |
|---|---|---|
| committer | Daniel Colascione <dancol@dancol.org> | 2015-03-23 01:42:56 -0700 |
| commit | b8d7d7e8e6b3f5542b52b57f2514960d7184210a (patch) | |
| tree | b36e13c949728b7544d1c02dd82e46d42b196fb0 /lisp/emacs-lisp/lisp-mode.el | |
| parent | d235b1d261ae9f275ac1f412dd8a8ad3f1c45e51 (diff) | |
| download | emacs-b8d7d7e8e6b3f5542b52b57f2514960d7184210a.tar.gz emacs-b8d7d7e8e6b3f5542b52b57f2514960d7184210a.tar.bz2 emacs-b8d7d7e8e6b3f5542b52b57f2514960d7184210a.zip | |
Fix previous commit
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 52bc6a5405b..e96c8ed5cef 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -186,32 +186,32 @@ (setf pos (or pos (point))) (save-match-data (save-excursion - (goto-char pos) - (or (eql (char-before) ?\') - (let ((parent - (ignore-errors + (ignore-errors + (goto-char pos) + (or (eql (char-before) ?\') + (let ((parent (up-list -1) - (cond - ((looking-at (rx "(" (* (syntax -)) "(")) - (up-list -1) - (when (looking-at "(\\_<let\\*?\\_>") - (goto-char (match-end 0)) - 'let)) - ((looking-at - (rx "(" - (group-n 1 (+ (or (syntax w) (syntax _)))) - symbol-end)) - (prog1 (intern-soft (match-string-no-properties 1)) - (goto-char (match-end 1)))))))) - (or (eq parent 'declare) - (and (eq parent 'let) - (progn - (forward-sexp 1) - (< pos (point)))) - (and (eq parent 'condition-case) - (progn - (forward-sexp 2) - (< (point) pos))))))))) + (cond + ((looking-at (rx "(" (* (syntax -)) "(")) + (up-list -1) + (when (looking-at "(\\_<let\\*?\\_>") + (goto-char (match-end 0)) + 'let)) + ((looking-at + (rx "(" + (group-n 1 (+ (or (syntax w) (syntax _)))) + symbol-end)) + (prog1 (intern-soft (match-string-no-properties 1)) + (goto-char (match-end 1))))))) + (or (eq parent 'declare) + (and (eq parent 'let) + (progn + (forward-sexp 1) + (< pos (point)))) + (and (eq parent 'condition-case) + (progn + (forward-sexp 2) + (< (point) pos)))))))))) (defun lisp--el-match-keyword (limit) (catch 'found |