]> code.delx.au - gnu-emacs/commitdiff
Fix previous commit (again)
authorDaniel Colascione <dancol@dancol.org>
Mon, 23 Mar 2015 08:50:42 +0000 (01:50 -0700)
committerDaniel Colascione <dancol@dancol.org>
Mon, 23 Mar 2015 08:54:42 +0000 (01:54 -0700)
lisp/emacs-lisp/lisp-mode.el

index e96c8ed5cef22ac5b4d8e29a3bd26077fdaaec1f..4c9a39fe174436d223480ae8f8c8be93b3529667 100644 (file)
         (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