summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2008-06-10 19:10:42 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2008-06-10 19:10:42 +0000
commita7f07c365f64fb0f93e574776d3b1facdf2a7918 (patch)
tree6ecaf5bb48b599662b4181f9c34bdf93de964d4d
parent73a0b3b52811c757449a9b30bceb57d750c82429 (diff)
downloademacs-a7f07c365f64fb0f93e574776d3b1facdf2a7918.tar.gz
emacs-a7f07c365f64fb0f93e574776d3b1facdf2a7918.tar.bz2
emacs-a7f07c365f64fb0f93e574776d3b1facdf2a7918.zip
(dired-insert-directory): Don't assume Unix-style dir names.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/dired.el4
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 99927a698dd..bbe2b11433d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
2008-06-10 Stefan Monnier <monnier@iro.umontreal.ca>
+ * dired.el (dired-insert-directory): Don't assume Unix-style dir names.
+
* subr.el (momentary-string-display): Use an overlay.
* progmodes/compile.el (compilation-mode):
diff --git a/lisp/dired.el b/lisp/dired.el
index d15e32f70fb..61c3549ecc1 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1044,7 +1044,9 @@ If HDR is non-nil, insert a header line with the directory name."
;; Insert text at the beginning to standardize things.
(save-excursion
(goto-char opoint)
- (if (and (or hdr wildcard) (not (looking-at "^ /.*:$")))
+ (if (and (or hdr wildcard)
+ (not (and (looking-at "^ \\(.*\\):$")
+ (file-name-absolute-p (match-string 1)))))
;; Note that dired-build-subdir-alist will replace the name
;; by its expansion, so it does not matter whether what we insert
;; here is fully expanded, but it should be absolute.