emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] master 6319bbd 20/22: remove search wrapping functionality


From: Michael Heerdegen
Subject: [elpa] master 6319bbd 20/22: remove search wrapping functionality
Date: Sat, 31 Oct 2015 18:41:43 +0000

branch: master
commit 6319bbd5a0a87f48af6ab6d4758349f87751890c
Author: Michael Heerdegen <address@hidden>
Commit: Michael Heerdegen <address@hidden>

    remove search wrapping functionality
---
 packages/el-search/el-search.el |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el
index fa9c26d..bf545ae 100644
--- a/packages/el-search/el-search.el
+++ b/packages/el-search/el-search.el
@@ -600,7 +600,8 @@ Additional `pcase' pattern types to be used with this 
command can
 be defined with `el-search-defpattern'.
 
 The following additional pattern types are currently defined:\n"
-  (interactive (list (if (eq this-command last-command)
+  (interactive (list (if (and (eq this-command last-command)
+                              el-search-success)
                          el-search-current-pattern
                        (let ((pattern
                               (el-search--read-pattern "Find pcase pattern: "
@@ -616,17 +617,13 @@ The following additional pattern types are currently 
defined:\n"
   (setq this-command 'el-search-pattern) ;in case we come from isearch
   (setq el-search-current-pattern pattern)
   (let ((opoint (point)))
-    (when (eq this-command last-command)
-      (if el-search-success
-          (el-search--skip-expression nil t)
-        ;; wrap search
-        (goto-char (point-min))))
+    (when (and (eq this-command last-command) el-search-success)
+      (el-search--skip-expression nil t))
     (setq el-search-success nil)
     (message "%s" (substitute-command-keys "Type \\[el-search-pattern] to 
repeat"))
     (when (condition-case nil
               (el-search--search-pattern pattern)
-            (end-of-buffer (message "No match; %s"
-                                    (substitute-command-keys "Type 
\\[el-search-pattern] to wrap"))
+            (end-of-buffer (message "No match")
                            (goto-char opoint)
                            (el-search-hl-remove)
                            (ding)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]