[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 24f8de1 10/12: rename a function
From: |
Michael Heerdegen |
Subject: |
[elpa] master 24f8de1 10/12: rename a function |
Date: |
Sun, 11 Oct 2015 10:33:30 +0000 |
branch: master
commit 24f8de19f568181aa0d396c549487e6812f37f16
Author: Michael Heerdegen <address@hidden>
Commit: Michael Heerdegen <address@hidden>
rename a function
---
packages/el-search/el-search.el | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el
index 1ad895a..8e6ef91 100644
--- a/packages/el-search/el-search.el
+++ b/packages/el-search/el-search.el
@@ -247,9 +247,10 @@ expression."
;;Point must be at sexp beginning
(or (scan-sexps (point) 1) (point-max)))
-(defun el-search--goto-next-sexp ()
- "Move point to the beginning of the next sexp.
-Don't move if already at beginning of a sexp."
+(defun el-search--ensure-sexp-start ()
+ "Move point to the beginning of the next sexp if necessary.
+Don't move if already at beginning of a sexp.
+Point must not be inside a string or comment."
(let ((not-done t) res)
(while not-done
(let ((stop-here nil) syntax-here
@@ -308,7 +309,7 @@ return nil (no error)."
(if (catch 'no-match
(while (not match-beg)
(condition-case nil
- (setq current-expr (el-search--goto-next-sexp))
+ (setq current-expr (el-search--ensure-sexp-start))
(end-of-buffer
(goto-char opoint)
(throw 'no-match t)))
@@ -329,7 +330,7 @@ return nil (no error)."
(this-sexp (buffer-substring-no-properties (point)
this-sexp-end)))
(funcall do-fun this-sexp this-sexp-end))
(forward-char)
- (el-search--goto-next-sexp))
+ (el-search--ensure-sexp-start))
(end-of-buffer))
(when ret-fun (funcall ret-fun))))
- [elpa] master 84282f0 08/12: avoid repeated expansion of pcase forms, (continued)
- [elpa] master 84282f0 08/12: avoid repeated expansion of pcase forms, Michael Heerdegen, 2015/10/11
- [elpa] master e1903f4 01/12: avoid looking-back in el-search--goto-next-sexp, Michael Heerdegen, 2015/10/11
- [elpa] master 855461b 03/12: rename a function, Michael Heerdegen, 2015/10/11
- [elpa] master ca3fe58 07/12: rename a function, Michael Heerdegen, 2015/10/11
- [elpa] master fa900da 09/12: new function el-search--end-of-sexp; use it, Michael Heerdegen, 2015/10/11
- [elpa] master ae052ce 11/12: rename a local variable, Michael Heerdegen, 2015/10/11
- [elpa] master 06c2076 02/12: change default of el-search-this-expression-identifier, Michael Heerdegen, 2015/10/11
- [elpa] master 5dd08f2 05/12: fix a condition in el-search--do-subsexps, Michael Heerdegen, 2015/10/15
- [elpa] master 0f79c16 06/12: drop el-search-expression-contains-match-p, Michael Heerdegen, 2015/10/15
- [elpa] master 2d5b3ba 12/12: whitespace clean up, Michael Heerdegen, 2015/10/15
- [elpa] master 24f8de1 10/12: rename a function,
Michael Heerdegen <=