From: Daniel Colascione <dancol@dancol.org>
Date: Mon, 23 Mar 2015 08:50:42 +0000 (-0700)
Subject: Fix previous commit (again)
X-Git-Tag: emacs-25.0.90~2564^2~99
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bad7308e0c7bfe0192ac05d7aea72e1f7bea7b08;p=emacs.git

Fix previous commit (again)
---

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