[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master b8d7d7e: Fix previous commit
From: |
Daniel Colascione |
Subject: |
[Emacs-diffs] master b8d7d7e: Fix previous commit |
Date: |
Mon, 23 Mar 2015 08:43:05 +0000 |
branch: master
commit b8d7d7e8e6b3f5542b52b57f2514960d7184210a
Author: Daniel Colascione <address@hidden>
Commit: Daniel Colascione <address@hidden>
Fix previous commit
---
lisp/emacs-lisp/lisp-mode.el | 50 +++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 52bc6a5..e96c8ed 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master b8d7d7e: Fix previous commit,
Daniel Colascione <=