diff options
author | Thierry Volpiatto <thierry.volpiatto@gmail.com> | 2017-10-26 12:54:12 +0200 |
---|---|---|
committer | Thierry Volpiatto <thierry.volpiatto@gmail.com> | 2017-10-26 12:54:12 +0200 |
commit | 3ff680b7ee5aba7b49ec13780c5d44c210a2b2d8 (patch) | |
tree | 3f9d00d99cc548de576b437450ebb01829e4883c /helm-grep.el | |
parent | 4c2157971fbf3f32f47422581c4cd194a1ff8cd9 (diff) |
Fix duplicates in mark-ring (#1891)
and remove obsolete prefix args for mark in grep/occur actions fns.
* helm-grep.el (helm-grep-action): Do it, signature have changed.
(helm-grep-persistent-action): Fix call to helm-grep-action.
* helm-regexp.el (helm-moccur-action): Same as helm-grep-action.
(helm-moccur-goto-line): Remove prefix arg usage.
(helm-moccur-goto-line-ow): Remove prefix arg usage.
(helm-moccur-goto-line-of): Remove prefix arg usage.
Diffstat (limited to 'helm-grep.el')
-rw-r--r-- | helm-grep.el | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/helm-grep.el b/helm-grep.el index 600981e1..966ca285 100644 --- a/helm-grep.el +++ b/helm-grep.el @@ -585,7 +585,7 @@ It is intended to use as a let-bound variable, DON'T set this globaly.") ;;; Actions ;; ;; -(defun helm-grep-action (candidate &optional where mark) +(defun helm-grep-action (candidate &optional where) "Define a default action for `helm-do-grep-1' on CANDIDATE. WHERE can be one of other-window, other-frame." (let* ((split (helm-grep-split-line candidate)) @@ -625,9 +625,6 @@ WHERE can be one of other-window, other-frame." (invalid-regexp nil))) collect (match-beginning 0) into pos-ls finally (when pos-ls (goto-char (apply #'min pos-ls)))) - (when mark - (set-marker (mark-marker) (point)) - (push-mark (point) 'nomsg)) ;; Save history (unless (or helm-in-persistent-action (eq major-mode 'helm-grep-mode) @@ -644,9 +641,7 @@ WHERE can be one of other-window, other-frame." (defun helm-grep-persistent-action (candidate) "Persistent action for `helm-do-grep-1'. With a prefix arg record CANDIDATE in `mark-ring'." - (if current-prefix-arg - (helm-grep-action candidate nil 'mark) - (helm-grep-action candidate)) + (helm-grep-action candidate) (helm-highlight-current-line)) (defun helm-grep-other-window (candidate) |