[Emacs-diffs] emacs/lisp ls-lisp.el

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    09/03/27 18:34:03

Modified files:
        lisp           : ls-lisp.el 

Log message:
        (ls-lisp-insert-directory): Allow for a trailing '/' when looking for 
"."
        and "..".  (Bug#2801)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ls-lisp.el?cvsroot=emacs&r1=1.81&r2=1.82

Patches:
Index: ls-lisp.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ls-lisp.el,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- ls-lisp.el  28 Jan 2009 19:01:42 -0000      1.81
+++ ls-lisp.el  27 Mar 2009 18:34:03 -0000      1.82
@@ -390,7 +390,10 @@
              (setq elt (car file-alist)
                    file-alist (cdr file-alist))
              (when (and (eq (cadr elt) t) ; directory
-                        (not (string-match "\\`\\.\\.?\\'" (car elt))))
+                        ;; Under -F, we have already decorated all
+                        ;; directories, including "." and "..", with
+                        ;; a /, so allow for that as well.
+                        (not (string-match "\\`\\.\\.?/?\\'" (car elt))))
                (setq elt (expand-file-name (car elt) dir))
                (insert "\n" elt ":\n")
                (ls-lisp-insert-directory