branch: master
commit 101101dcbc85a5541cc0e97bd0aec069b55aa9d6
Author: Kaushal Modi <[email protected]>
Commit: Kaushal Modi <[email protected]>
Don't attempt to save readonly files before calling counsel-grep
* counsel.el (counsel-grep-or-swiper): Save buffer only if the file is
writable. Create let-bound fname instead of calling (buffer-file-name)
multiple times.
---
counsel.el | 32 +++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/counsel.el b/counsel.el
index 302c735..d64eb79 100644
--- a/counsel.el
+++ b/counsel.el
@@ -2018,21 +2018,23 @@ the command."
(defun counsel-grep-or-swiper ()
"Call `swiper' for small buffers and `counsel-grep' for large ones."
(interactive)
- (if (and (buffer-file-name)
- (not (buffer-narrowed-p))
- (not (ignore-errors
- (file-remote-p (buffer-file-name))))
- (not (string-match
- counsel-compressed-file-regex
- (buffer-file-name)))
- (> (buffer-size)
- (if (eq major-mode 'org-mode)
- (/ counsel-grep-swiper-limit 4)
- counsel-grep-swiper-limit)))
- (progn
- (save-buffer)
- (counsel-grep))
- (swiper--ivy (swiper--candidates))))
+ (let ((fname (buffer-file-name)))
+ (if (and fname
+ (not (buffer-narrowed-p))
+ (not (ignore-errors
+ (file-remote-p fname)))
+ (not (string-match
+ counsel-compressed-file-regex
+ fname))
+ (> (buffer-size)
+ (if (eq major-mode 'org-mode)
+ (/ counsel-grep-swiper-limit 4)
+ counsel-grep-swiper-limit)))
+ (progn
+ (when (file-writable-p fname)
+ (save-buffer))
+ (counsel-grep))
+ (swiper--ivy (swiper--candidates)))))
;;** `counsel-recoll'
(defun counsel-recoll-function (string)
