From ce0acffc9f20bd834ee64e0ce670024da26f09e5 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 13 Mar 2025 12:34:23 +0200 Subject: [PATCH] Fix 'dired-movement-style' in Dired when subdirs are shown * lisp/dired.el (dired--move-to-next-line): Don't consider sub-directory lines as empty. (Bug#76596) (cherry picked from commit 04034cd9ce746e3914daa66add34c66ad2db032d) --- lisp/dired.el | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lisp/dired.el b/lisp/dired.el index 06c627c3cda..8bb05a4540e 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -2931,15 +2931,19 @@ is controlled by `dired-movement-style'." (setq wrapped t)) ;; `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 (zerop arg))) + (while (and (dired-between-files) + (not (dired-get-subdir)) + (not (zerop arg))) (funcall jumpfun (- moving-down)) ;; Point not moving means infinite loop. (if (= old-position (point)) (setq arg 0) (setq old-position (point)))) ;; Encountered a boundary, so let's stop movement. - (setq arg (if (dired-between-files) 0 moving-down))))) - (unless (dired-between-files) + (setq arg (if (and (dired-between-files) + (not (dired-get-subdir))) + 0 moving-down))))) + (unless (and (dired-between-files) (not (dired-get-subdir))) ;; Has moved to a non-empty line. This movement does ;; make sense. (decf arg moving-down)) -- 2.39.5