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

Remove some macros in image-dired (Bug#65403)

Browse source 
* lisp/image/image-dired.el (image-dired--movement-command)
(image-dired--movement-command-line): Change macros to functions.
(image-dired--update-after-move): New function for book-keeping
after a move in image-dired.
(image-dired-scroll): Use it.
This commit is contained in:
Manuel Giraud 2023-08-13 14:48:01 +02:00 • committed by Stefan Kangas
parent 1992ad96d5
commit f46d6b0b39
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
lisp/image/image-dired.el
View file

@ -724,21 +724,22 @@ On reaching end or beginning of buffer, stop and show a message."
(not (if reverse (bobp) (eobp))))
(forward-char (if reverse -1 1))))
(defmacro image-dired--movement-command (to &optional reverse)
`(progn
(goto-char ,to)
(image-dired--movement-ensure-point-pos ,reverse)
(when image-dired-track-movement
(image-dired-track-original-file))
(image-dired--update-header-line)))
(defun image-dired--update-after-move (reverse)
"Book-keeping after move."
(image-dired--movement-ensure-point-pos reverse)
(when image-dired-track-movement
(image-dired-track-original-file))
(image-dired--update-header-line))
(defmacro image-dired--movement-command-line (&optional reverse)
`(image-dired--movement-command
(let ((goal-column (current-column)))
(forward-line ,(if reverse -1 1))
(move-to-column goal-column)
(point))
,reverse))
(defun image-dired--movement-command (to &optional reverse)
(goto-char to)
(image-dired--update-after-move reverse))
(defun image-dired--movement-command-line (&optional reverse)
(let ((goal-column (current-column)))
(forward-line (if reverse -1 1))
(move-to-column goal-column)
(image-dired--update-after-move reverse)))
(defun image-dired-next-line ()
"Move to next line in the thumbnail buffer."
@ -775,10 +776,7 @@ On reaching end or beginning of buffer, stop and show a message."
(let ((goal-column (current-column)))
(if down (scroll-down) (scroll-up))
(move-to-column goal-column)
(image-dired--movement-ensure-point-pos down)
(when image-dired-track-movement
(image-dired-track-original-file))
(image-dired--update-header-line)))
(image-dired--update-after-move down)))
(defun image-dired-scroll-up ()
(interactive nil image-dired-thumbnail-mode)