diff options
| author | Daniel Colascione | 2015-03-23 01:50:42 -0700 |
|---|---|---|
| committer | Daniel Colascione | 2015-03-23 01:54:42 -0700 |
| commit | bad7308e0c7bfe0192ac05d7aea72e1f7bea7b08 (patch) | |
| tree | 42b1e353fcd67ba4327a75546e779d2651d54ce6 | |
| parent | b8d7d7e8e6b3f5542b52b57f2514960d7184210a (diff) | |
| download | emacs-bad7308e0c7bfe0192ac05d7aea72e1f7bea7b08.tar.gz emacs-bad7308e0c7bfe0192ac05d7aea72e1f7bea7b08.zip | |
Fix previous commit (again)
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index e96c8ed5cef..4c9a39fe174 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el | |||
| @@ -190,19 +190,22 @@ | |||
| 190 | (goto-char pos) | 190 | (goto-char pos) |
| 191 | (or (eql (char-before) ?\') | 191 | (or (eql (char-before) ?\') |
| 192 | (let ((parent | 192 | (let ((parent |
| 193 | (up-list -1) | 193 | (progn |
| 194 | (cond | 194 | (up-list -1) |
| 195 | ((looking-at (rx "(" (* (syntax -)) "(")) | 195 | (cond |
| 196 | (up-list -1) | 196 | ((ignore-errors |
| 197 | (when (looking-at "(\\_<let\\*?\\_>") | 197 | (and (eql (char-after) ?\() |
| 198 | (goto-char (match-end 0)) | 198 | (progn |
| 199 | 'let)) | 199 | (up-list -1) |
| 200 | ((looking-at | 200 | (looking-at "(\\_<let\\*?\\_>")))) |
| 201 | (rx "(" | 201 | (goto-char (match-end 0)) |
| 202 | (group-n 1 (+ (or (syntax w) (syntax _)))) | 202 | 'let) |
| 203 | symbol-end)) | 203 | ((looking-at |
| 204 | (prog1 (intern-soft (match-string-no-properties 1)) | 204 | (rx "(" |
| 205 | (goto-char (match-end 1))))))) | 205 | (group-n 1 (+ (or (syntax w) (syntax _)))) |
| 206 | symbol-end)) | ||
| 207 | (prog1 (intern-soft (match-string-no-properties 1)) | ||
| 208 | (goto-char (match-end 1)))))))) | ||
| 206 | (or (eq parent 'declare) | 209 | (or (eq parent 'declare) |
| 207 | (and (eq parent 'let) | 210 | (and (eq parent 'let) |
| 208 | (progn | 211 | (progn |