dired: make dired-maybe-insert-subdir always skip trivial files

dired: make dired-maybe-insert-subdir always skip trivial files

[Filipp Gunbin]

When `dired-maybe-insert-subdir' is called on a subdir not yet present
in the dired buffer, it inserts that subdir and skips to a first
"non-trivial" file.

But when it is already present, the point jumps to the header line and
stays there.

Below is the fix which makes it select the first non-trivial file
always.  Is it ok to apply?

Filipp

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index bb93cce..acc7e76 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -2062,7 +2062,10 @@ See Info node `(emacs)Subdir switches' for more details."
     ;; inserted *after* opoint.
     (setq dirname (file-name-as-directory dirname))
     (or (and (not switches)
-	     (dired-goto-subdir dirname))
+	     (when (dired-goto-subdir dirname)
+	       (unless (dired-subdir-hidden-p dirname)
+		 (dired-initial-position dirname))
+	       t))
 	(dired-insert-subdir dirname switches no-error-if-not-dir-p))
     ;; Push mark so that it's easy to find back.  Do this after the
     ;; insert message so that the user sees the `Mark set' message.

Re: dired: make dired-maybe-insert-subdir always skip trivial files

[Juri Linkov]

> When `dired-maybe-insert-subdir' is called on a subdir not yet present
> in the dired buffer, it inserts that subdir and skips to a first
> "non-trivial" file.
>
> But when it is already present, the point jumps to the header line and
> stays there.
>
> Below is the fix which makes it select the first non-trivial file
> always.  Is it ok to apply?

I agree it would be good to make it consistent for both cases:
when it is already present and not present, especially good after fixing
http://debbugs.gnu.org/19436

> -	     (dired-goto-subdir dirname))
> +	     (when (dired-goto-subdir dirname)
> +	       (unless (dired-subdir-hidden-p dirname)
> +		 (dired-initial-position dirname))
> +	       t))

Why do you always return t?  Wouldn't it be better to use something like
(prog1 (dired-goto-subdir dirname) (unless ...))

Re: dired: make dired-maybe-insert-subdir always skip trivial files

[Filipp Gunbin]

On 25/12/2014 21:32 +0200, Juri Linkov wrote:

>> -	     (dired-goto-subdir dirname))
>> +	     (when (dired-goto-subdir dirname)
>> +	       (unless (dired-subdir-hidden-p dirname)
>> +		 (dired-initial-position dirname))
>> +	       t))
>
> Why do you always return t?  Wouldn't it be better to use something like
> (prog1 (dired-goto-subdir dirname) (unless ...))

This way, (unless ...) will be evaluated even if `dired-goto-subdir'
returned nil.

Filipp

Re: dired: make dired-maybe-insert-subdir always skip trivial files

[Juri Linkov]

> This way, (unless ...) will be evaluated even if `dired-goto-subdir'
> returned nil.

I thought that dired-subdir-hidden-p will handle this situation,
but then actually I see no problem in using t always.