procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix ibuffer-mark-by-file-name-regexp abbreviations

Browse source 
* lisp/ibuffer.el (ibuffer--abbreviate-file-name): New function.
(filename): Use it.
* lisp/ibuf-ext.el (ibuffer-mark-by-file-name-regexp): Prefer
read-regexp over read-string for reading regexps.  Determine file
name using ibuffer-buffer-file-name for consistency.  Abbreviate
file name using ibuffer-directory-abbrev-alist (bug#18859).
This commit is contained in:
Basil L. Contovounesios 2021-01-17 15:53:53 +00:00
parent bdb9889f78
commit 8f4b3b812a
No known key found for this signature in database
GPG key ID: 205AB54A5D5D8CFF
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lisp/ibuf-ext.el
View file

@ -1823,18 +1823,12 @@ When BUF nil, default to the buffer at current line."
;;;###autoload
(defun ibuffer-mark-by-file-name-regexp (regexp)
"Mark all buffers whose file name matches REGEXP."
(interactive "sMark by file name (regexp): ")
(interactive (list (read-regexp "Mark by file name (regexp)")))
(ibuffer-mark-on-buffer
#'(lambda (buf)
(let ((name (or (buffer-file-name buf)
(with-current-buffer buf
(and
(boundp 'dired-directory)
(stringp dired-directory)
dired-directory)))))
(when name
;; Match on the displayed file name (which is abbreviated).
(string-match regexp (abbreviate-file-name name)))))))
(lambda (buf)
(when-let ((name (with-current-buffer buf (ibuffer-buffer-file-name))))
;; Match on the displayed file name (which is abbreviated).
(string-match-p regexp (ibuffer--abbreviate-file-name name))))))
;;;###autoload
(defun ibuffer-mark-by-content-regexp (regexp &optional all-buffers)

9
lisp/ibuffer.el
View file

@ -1308,6 +1308,11 @@ a new window in the current frame, splitting vertically."
(car dired-directory)))))
(and dirname (expand-file-name dirname))))))
(defun ibuffer--abbreviate-file-name (filename)
"Abbreviate FILENAME using `ibuffer-directory-abbrev-alist'."
(let ((directory-abbrev-alist ibuffer-directory-abbrev-alist))
(abbreviate-file-name filename)))
(define-ibuffer-op ibuffer-do-save ()
"Save marked buffers as with `save-buffer'."
(:complex t
@ -1885,9 +1890,7 @@ If point is on a group name, this function operates on that group."
(cond ((zerop total) "No files")
((= 1 total) "1 file")
(t (format "%d files" total))))))
(let ((directory-abbrev-alist ibuffer-directory-abbrev-alist))
(abbreviate-file-name
(or (ibuffer-buffer-file-name) ""))))
(ibuffer--abbreviate-file-name (or (ibuffer-buffer-file-name) "")))
(define-ibuffer-column filename-and-process
(:name "Filename/Process"