[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master bad7308: Fix previous commit (again)
From: |
Daniel Colascione |
Subject: |
[Emacs-diffs] master bad7308: Fix previous commit (again) |
Date: |
Mon, 23 Mar 2015 08:55:47 +0000 |
branch: master
commit bad7308e0c7bfe0192ac05d7aea72e1f7bea7b08
Author: Daniel Colascione <address@hidden>
Commit: Daniel Colascione <address@hidden>
Fix previous commit (again)
---
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 e96c8ed..4c9a39f 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -190,19 +190,22 @@
(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)))))))
+ (progn
+ (up-list -1)
+ (cond
+ ((ignore-errors
+ (and (eql (char-after) ?\()
+ (progn
+ (up-list -1)
+ (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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master bad7308: Fix previous commit (again),
Daniel Colascione <=