[elpa] master b0aeb9e 4/4: Merge commit '206468aa4de299ad26c2db12b757f5ad7290912f'
branch: master commit b0aeb9e30b6f14544e74d6c2b8f6bd030705f886 Merge: 30566f8 206468a Author: Michael Heerdegen Commit: Michael Heerdegen Merge commit '206468aa4de299ad26c2db12b757f5ad7290912f'
[elpa] master 21516b4 1/4: Tweak docstring of el-search--ensure-sexp-start
branch: master commit 21516b4b7114e8c5dadf4747066e72eb1e9960d6 Author: Michael Heerdegen Commit: Michael Heerdegen Tweak docstring of el-search--ensure-sexp-start --- packages/el-search/el-search.el |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el index fc9f2bf..dea74b2 100644 --- a/packages/el-search/el-search.el +++ b/packages/el-search/el-search.el @@ -327,9 +327,10 @@ If nil, the value of `case-fold-search' is decisive." (or (scan-sexps (point) 1) (point-max))) (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." + "Move point to the next sexp beginning position. +Don't move if already at beginning of a sexp. Point must not be +inside a string or comment. `read' the expression at that point +and return it." (let ((not-done t) res) (while not-done (let ((stop-here nil)
[elpa] master updated (5f19016 -> b0aeb9e)
mheerdegen pushed a change to branch master. from 5f19016 New user option: el-search-smart-case-fold-search new 21516b4 Tweak docstring of el-search--ensure-sexp-start new 30566f8 Fix for non-interactive calls of el-search-pattern new 206468a on-screen-enabled-p: use `or' instead of `if' new b0aeb9e Merge commit '206468aa4de299ad26c2db12b757f5ad7290912f' Summary of changes: packages/el-search/el-search.el | 43 -- 1 files changed, 23 insertions(+), 20 deletions(-)
[elpa] master 30566f8 2/4: Fix for non-interactive calls of el-search-pattern
branch: master commit 30566f8bf5cc98f8ef2184035f15b339ce1d9691 Author: Michael Heerdegen Commit: Michael Heerdegen Fix for non-interactive calls of el-search-pattern --- packages/el-search/el-search.el | 36 +++- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el index dea74b2..52e919a 100644 --- a/packages/el-search/el-search.el +++ b/packages/el-search/el-search.el @@ -849,23 +849,25 @@ The following additional pattern types are currently defined:" (not (eq (symbol-value pattern) pattern (error "Please don't forget the quote when searching for a symbol")) (el-search--wrap-pattern pattern) - (setq this-command 'el-search-pattern) ;in case we come from isearch - (setq el-search-current-pattern pattern) - (let ((opoint (point))) -(when (and (eq this-command last-command) el-search-success) - (el-search--skip-expression nil t)) -(setq el-search-success nil) -(when (condition-case nil - (el-search--search-pattern pattern) -(end-of-buffer (message "No match") - (goto-char opoint) - (el-search-hl-remove) - (ding) - nil)) - (setq el-search-success t) - (el-search-hl-sexp) - (unless (eq this-command last-command) -(el-search-hl-other-matches pattern) + (if (not (called-interactively-p 'any)) + (el-search--search-pattern pattern) +(setq this-command 'el-search-pattern) ;in case we come from isearch +(setq el-search-current-pattern pattern) +(let ((opoint (point))) + (when (and (eq this-command last-command) el-search-success) +(el-search--skip-expression nil t)) + (setq el-search-success nil) + (when (condition-case nil +(el-search--search-pattern pattern) + (end-of-buffer (message "No match") + (goto-char opoint) + (el-search-hl-remove) + (ding) + nil)) +(setq el-search-success t) +(el-search-hl-sexp) +(unless (eq this-command last-command) + (el-search-hl-other-matches pattern)) (defvar el-search-search-and-replace-help-string "\
[elpa] master 206468a 3/4: on-screen-enabled-p: use `or' instead of `if'
branch: master commit 206468aa4de299ad26c2db12b757f5ad7290912f Author: Michael Heerdegen Commit: Michael Heerdegen on-screen-enabled-p: use `or' instead of `if' Thanks Stefan. --- on-screen.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/on-screen.el b/on-screen.el index bce3c56..e5c3977 100644 --- a/on-screen.el +++ b/on-screen.el @@ -636,7 +636,7 @@ highlightings and clear all associated data." "Return non-nil if on-screen is enabled in BUFFER." (with-current-buffer (or buffer (current-buffer)) (and - (if on-screen-global-mode t on-screen-mode) + (or on-screen-global-mode on-screen-mode) (cond ((not on-screen-inhibit-highlighting) t) ((functionp on-screen-inhibit-highlighting)
