[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 7f38383 05/13: Don't expand in strings or comments
From: |
Artur Malabarba |
Subject: |
[elpa] master 7f38383 05/13: Don't expand in strings or comments |
Date: |
Wed, 05 Aug 2015 21:54:10 +0000 |
branch: master
commit 7f3838330bcba0277fe571125155150db0f8ca16
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>
Don't expand in strings or comments
---
sotlisp.el | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/sotlisp.el b/sotlisp.el
index dbdd03b..d093f0c 100644
--- a/sotlisp.el
+++ b/sotlisp.el
@@ -109,6 +109,14 @@ Specially, avoids matching inside argument lists."
(forward-char -2)
(looking-at-p "#'"))))
+(defun sotlisp--code-p ()
+ (save-excursion
+ (let ((r (point)))
+ (beginning-of-defun)
+ (let ((pps (parse-partial-sexp (point) r)))
+ (not (or (elt pps 3)
+ (elt pps 4)))))))
+
(defun sotlisp--function-p ()
"Non-nil if point is at reasonable place for a function name.
Returns non-nil if, after moving backwards by a sexp, either
@@ -117,8 +125,9 @@ non-nil."
(save-excursion
(ignore-errors
(skip-chars-backward (rx alnum))
- (or (sotlisp--function-form-p)
- (sotlisp--function-quote-p)))))
+ (and (sotlisp--code-p)
+ (or (sotlisp--function-form-p)
+ (sotlisp--function-quote-p))))))
(defun sotlisp--whitespace-p ()
"Non-nil if current `self-insert'ed char is whitespace."
- [elpa] master updated (e18833b -> 0bb0ee6), Artur Malabarba, 2015/08/05
- [elpa] master 785d35c 01/13: After expanding, eat up space ahead if convenient, Artur Malabarba, 2015/08/05
- [elpa] master 960ea2f 02/13: Avoid errors on false positives, Artur Malabarba, 2015/08/05
- [elpa] master f7b4937 04/13: Refactor whitespace detection, Artur Malabarba, 2015/08/05
- [elpa] master c1deb05 03/13: Don't use looking-back, Artur Malabarba, 2015/08/05
- [elpa] master 7f38383 05/13: Don't expand in strings or comments,
Artur Malabarba <=
- [elpa] master b957752 07/13: Don't indent if the user is starting to type a comment. Fix #51, Artur Malabarba, 2015/08/05
- [elpa] master 1e6676a 06/13: Version bump, Artur Malabarba, 2015/08/05
- [elpa] master f2c0fe9 08/13: Don't indent if undo-in-progress, Artur Malabarba, 2015/08/05
- [elpa] master 6ccb05d 10/13: More abbrevs, Artur Malabarba, 2015/08/05
- [elpa] master 3557254 09/13: Version bump, Artur Malabarba, 2015/08/05
- [elpa] master 98fe00f 11/13: Version bump, Artur Malabarba, 2015/08/05
- [elpa] master 0bb0ee6 13/13: Merge commit '3557254c6873aeb0b5070248aa0faf2ff0d29d04', Artur Malabarba, 2015/08/05
- [elpa] master 5b702fc 12/13: Merge commit '98fe00fbd6a71ba1e79cf616f22c026c9d84adc7', Artur Malabarba, 2015/08/05