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

Add a choice to 'dired-movement-style' to restore the previous behavior

Browse source 
* lisp/dired.el (dired-movement-style): Add new values
'bounded-files' and 'cycle-files' (bug#76596).
(dired--move-to-next-line): Use new values for users
who prefer the default behavior of Emacs 30.1.
This commit is contained in:
Juri Linkov 2025-03-23 19:48:28 +02:00
parent 10d534023a
commit bc51fabc10
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lisp/dired.el
View file

@ -512,10 +512,14 @@ Possible non-nil values:
to the first/last visible line.
* `bounded': don't move up/down if the current line is the
first/last visible line.
* `cycle-files': like `cycle' but moves only over file lines.
* `bounded-files': like `bounded' but moves only over file lines.
Any other non-nil value is treated as `bounded'."
:type '(choice (const :tag "Move to any line" nil)
(const :tag "Cycle through non-empty lines" cycle)
(const :tag "Stop on last/first non-empty line" bounded))
(const :tag "Cycle through file lines" cycle-files)
(const :tag "Stop on last/first non-empty line" bounded)
(const :tag "Stop on last/first file line" bounded-files))
:group 'dired
:version "30.1")
@ -2877,7 +2881,7 @@ is controlled by `dired-movement-style'."
;; but it still wants to move farther.
(cond
;; `cycle': go to the other end.
((eq dired-movement-style 'cycle)
((memq dired-movement-style '(cycle cycle-files))
;; Argument not changing on the second wrap
;; means infinite loop with no files found.
(if (and wrapped (eq old-arg arg))
@ -2889,7 +2893,8 @@ is controlled by `dired-movement-style'."
;; `bounded': go back to the last non-empty line.
(dired-movement-style ; Either 'bounded or anything else non-nil.
(while (and (dired-between-files)
(not (dired-get-subdir))
(or (eq dired-movement-style 'bounded-files)
(not (dired-get-subdir)))
(not (zerop arg)))
(funcall jumpfun (- moving-down))
;; Point not moving means infinite loop.
@ -2898,9 +2903,12 @@ is controlled by `dired-movement-style'."
(setq old-position (point))))
;; Encountered a boundary, so let's stop movement.
(setq arg (if (and (dired-between-files)
(not (dired-get-subdir)))
(or (eq dired-movement-style 'bounded-files)
(not (dired-get-subdir))))
0 moving-down)))))
(unless (and (dired-between-files) (not (dired-get-subdir)))
(unless (and (dired-between-files)
(or (memq dired-movement-style '(cycle-files bounded-files))
(not (dired-get-subdir))))
;; Has moved to a non-empty line. This movement does
;; make sense.
(cl-decf arg moving-down))