diff options
| author | Thierry Volpiatto <thierry.volpiatto@gmail.com> | 2014-05-26 17:23:43 +0200 |
|---|---|---|
| committer | Thierry Volpiatto <thierry.volpiatto@gmail.com> | 2014-05-26 17:23:43 +0200 |
| commit | a784aac5c631a7585f87fcfe16d1ab464fd87635 (patch) | |
| tree | dd67d3ec75cf347fd56bad7fabfc8c56fe1f612b /helm-regexp.el | |
| parent | 8c196a9822520f4b2d9793d5606a50ca81370d24 (diff) | |
* helm-regexp.el (helm-moccur-init): No need to use a local var.
(helm-multi-occur-1): Set up helm-multi-occur-buffer-list here.
Diffstat (limited to 'helm-regexp.el')
| -rw-r--r-- | helm-regexp.el | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/helm-regexp.el b/helm-regexp.el index d1a9292f..50ce09b8 100644 --- a/helm-regexp.el +++ b/helm-regexp.el @@ -159,12 +159,7 @@ i.e Don't replace inside a word, regexp is surrounded with \\bregexp\\b." (defvar helm-multi-occur-buffer-list nil) (defun helm-moccur-init () - "Create the initial helm multi occur buffer with BUFFERS list." - (set (make-local-variable 'helm-multi-occur-buffer-list) - (if helm-moccur-always-search-in-current - (cons helm-current-buffer - (remove helm-current-buffer helm-multi-occur-buffer-list)) - helm-multi-occur-buffer-list)) + "Create the initial helm multi occur buffer." (helm-init-candidates-in-buffer 'global (cl-loop for buf in helm-multi-occur-buffer-list @@ -319,7 +314,13 @@ Same as `helm-moccur-goto-line' but go in new frame." (defun helm-multi-occur-1 (buffers &optional input) "Main function to call `helm-source-moccur' with BUFFERS list." - (setq helm-multi-occur-buffer-list buffers) + (setq helm-multi-occur-buffer-list + (if helm-moccur-always-search-in-current + (cons + ;; will become helm-current-buffer later. + (buffer-name (current-buffer)) + (remove helm-current-buffer helm-multi-occur-buffer-list)) + buffers)) (helm :sources 'helm-source-moccur :buffer "*helm multi occur*" :history 'helm-grep-history |