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

Fix previous commit
---

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 52bc6a5405b..e96c8ed5cef 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -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