procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix previous commit

Browse source
This commit is contained in:
Daniel Colascione 2015-03-23 01:42:56 -07:00
parent d235b1d261
commit b8d7d7e8e6
1 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
lisp/emacs-lisp/lisp-mode.el
View file

@ -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