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

(define-ibuffer-op): Minor tweak to Shipmints's patch

Browse source 
* lisp/ibuf-macs.el (define-ibuffer-op): Evaluate `(active-)opstring`
args when defining the operation rather than every time the operation
is used.  Move the `:autoload-end` marker back to the level of `progn`.
This commit is contained in:
Stefan Monnier 2025-02-26 09:13:04 -05:00
parent 5d75c6e44d
commit 5815bd5227
1 changed files with 46 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
lisp/ibuf-macs.el
View file

@ -221,19 +221,20 @@ buffer object.
(defalias ',(intern (concat (if (string-match "^ibuffer-do" (symbol-name op))
"" "ibuffer-do-")
(symbol-name op)))
(lambda ,args
,(if (stringp documentation)
documentation
(format "%s marked buffers." (if (functionp active-opstring)
(funcall active-opstring)
active-opstring)))
,(if (not (null interactive))
`(interactive ,interactive)
'(interactive))
(cl-assert (derived-mode-p 'ibuffer-mode))
(setq ibuffer-did-modification nil)
(let ((,opstring-sym ,opstring)
(,active-opstring-sym ,active-opstring))
(let ((,opstring-sym ,opstring)
(,active-opstring-sym ,active-opstring))
(lambda ,args
,(if (stringp documentation)
documentation
(format "%s marked buffers." (if (functionp active-opstring)
;; FIXME: Unused?
(funcall active-opstring)
active-opstring)))
,(if (not (null interactive))
`(interactive ,interactive)
'(interactive))
(cl-assert (derived-mode-p 'ibuffer-mode))
(setq ibuffer-did-modification nil)
(let ((marked-names (,(pcase mark
(:deletion
'ibuffer-deletion-marked-buffer-names)
@ -243,7 +244,8 @@ buffer object.
(cl-assert (get-text-property (line-beginning-position)
'ibuffer-properties)
nil "No buffer on this line")
(setq marked-names (list (buffer-name (ibuffer-current-buffer))))
(setq marked-names
(list (buffer-name (ibuffer-current-buffer))))
(ibuffer-set-mark ,(pcase mark
(:deletion
'ibuffer-deletion-char)
@ -258,6 +260,7 @@ buffer object.
`((ibuffer-redisplay t)
(message (concat "Operation finished; "
(if (functionp ,opstring-sym)
;; FIXME: Unused?
(funcall ,opstring-sym)
,opstring-sym)
" %s %s")
@ -266,40 +269,42 @@ buffer object.
(inner-body (if complex
`(progn ,@body)
`(progn
(with-current-buffer buf
(save-excursion
,@body))
t)))
(body `(let ((_ ,before) ; pre-operation form.
(count
(,(pcase mark
(:deletion
'ibuffer-map-deletion-lines)
(_
'ibuffer-map-marked-lines))
(lambda (buf mark)
;; Silence warning for code that doesn't
;; use `mark'.
(ignore mark)
,(if (eq modifier-p :maybe)
`(let ((ibuffer-tmp-previous-buffer-modification
(buffer-modified-p buf)))
(prog1 ,inner-body
(when (not (eq ibuffer-tmp-previous-buffer-modification
(buffer-modified-p buf)))
(setq
ibuffer-did-modification t))))
inner-body)))))
,finish)))
(with-current-buffer buf
(save-excursion
,@body))
t)))
(body
`(let ((_ ,before) ; pre-operation form.
(count
(,(pcase mark
(:deletion
'ibuffer-map-deletion-lines)
(_
'ibuffer-map-marked-lines))
(lambda (buf mark)
;; Silence warning for code that doesn't
;; use `mark'.
(ignore mark)
,(if (eq modifier-p :maybe)
`(let ((ibuffer-tmp-previous-buffer-modification
(buffer-modified-p buf)))
(prog1 ,inner-body
(unless (eq ibuffer-tmp-previous-buffer-modification
(buffer-modified-p buf))
(setq
ibuffer-did-modification t))))
inner-body)))))
,finish)))
(if dangerous
`(when (ibuffer-confirm-operation-on
(if (functionp ,active-opstring-sym)
;; FIXME: Unused?
(funcall ,active-opstring-sym)
,active-opstring-sym)
marked-names)
,body)
body))))
:autoload-end)))))
body))))))
:autoload-end)))
;;;###autoload
(cl-defmacro define-ibuffer-filter (name documentation