summaryrefslogtreecommitdiff
path: root/helm-bookmark.el
diff options
context:
space:
mode:
authorThierry Volpiatto <thierry.volpiatto@gmail.com>2016-01-14 14:42:45 +0100
committerThierry Volpiatto <thierry.volpiatto@gmail.com>2016-01-14 14:42:45 +0100
commitb580b39e5280aa1e8f7e71f713bd34d1b3237be5 (patch)
treec643a29e23b754f9a4b28750fe5d791cd8148f84 /helm-bookmark.el
parent9e5275c9fc9d5c895cbec065f2413f41a0a1625d (diff)
Remove also the search function which is wrong in helm-bookmark.
* helm-bookmark.el (helm-bookmark-search-fn): Removed. (helm-source-basic-bookmarks): Do it. (helm-source-filtered-bookmarks): Do it. (helm-bookmark-addressbook-class): Do it.
Diffstat (limited to 'helm-bookmark.el')
-rw-r--r--helm-bookmark.el17
1 files changed, 2 insertions, 15 deletions
diff --git a/helm-bookmark.el b/helm-bookmark.el
index 05880b00..94f63f64 100644
--- a/helm-bookmark.el
+++ b/helm-bookmark.el
@@ -167,8 +167,7 @@
(helm-init-candidates-in-buffer
'global
(bookmark-all-names))))
- (filtered-candidate-transformer :initform 'helm-bookmark-transformer)
- (search :initform 'helm-bookmark-search-fn)))
+ (filtered-candidate-transformer :initform 'helm-bookmark-transformer)))
(defvar helm-source-bookmarks
(helm-make-source "Bookmarks" 'helm-source-basic-bookmarks)
@@ -238,16 +237,6 @@
"See (info \"(emacs)Bookmarks\").")
-;;; Search and match-part fns.
-;;
-(defun helm-bookmark-search-fn (pattern)
- "Search function for bookmark sources using `helm-source-in-buffer'."
- (if helm-bookmark-show-location
- (helm-aif (next-single-property-change (point) 'location)
- (goto-char it))
- (re-search-forward pattern nil t)))
-
-
;;; Predicates
;;
(defconst helm-bookmark--non-file-filename " - no file -"
@@ -379,8 +368,7 @@ than `w3m-browse-url' use it."
;;
;;
(defclass helm-source-filtered-bookmarks (helm-source-in-buffer helm-type-bookmark)
- ((search :initform #'helm-bookmark-search-fn)
- (filtered-candidate-transformer
+ ((filtered-candidate-transformer
:initform '(helm-adaptive-sort
helm-highlight-bookmark))))
@@ -500,7 +488,6 @@ than `w3m-browse-url' use it."
(helm-init-candidates-in-buffer
'global
(helm-bookmark-addressbook-setup-alist))))
- (search :initform #'helm-bookmark-search-fn)
(persistent-action :initform
(lambda (candidate)
(let ((bmk (helm-bookmark-get-bookmark-from-name