diff options
| author | Stefan Monnier | 2008-06-10 19:10:42 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-06-10 19:10:42 +0000 |
| commit | a7f07c365f64fb0f93e574776d3b1facdf2a7918 (patch) | |
| tree | 6ecaf5bb48b599662b4181f9c34bdf93de964d4d | |
| parent | 73a0b3b52811c757449a9b30bceb57d750c82429 (diff) | |
| download | emacs-a7f07c365f64fb0f93e574776d3b1facdf2a7918.tar.gz emacs-a7f07c365f64fb0f93e574776d3b1facdf2a7918.zip | |
(dired-insert-directory): Don't assume Unix-style dir names.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/dired.el | 4 |
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 @@ | |||
| 1 | 2008-06-10 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2008-06-10 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * dired.el (dired-insert-directory): Don't assume Unix-style dir names. | ||
| 4 | |||
| 3 | * subr.el (momentary-string-display): Use an overlay. | 5 | * subr.el (momentary-string-display): Use an overlay. |
| 4 | 6 | ||
| 5 | * progmodes/compile.el (compilation-mode): | 7 | * 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." | |||
| 1044 | ;; Insert text at the beginning to standardize things. | 1044 | ;; Insert text at the beginning to standardize things. |
| 1045 | (save-excursion | 1045 | (save-excursion |
| 1046 | (goto-char opoint) | 1046 | (goto-char opoint) |
| 1047 | (if (and (or hdr wildcard) (not (looking-at "^ /.*:$"))) | 1047 | (if (and (or hdr wildcard) |
| 1048 | (not (and (looking-at "^ \\(.*\\):$") | ||
| 1049 | (file-name-absolute-p (match-string 1))))) | ||
| 1048 | ;; Note that dired-build-subdir-alist will replace the name | 1050 | ;; Note that dired-build-subdir-alist will replace the name |
| 1049 | ;; by its expansion, so it does not matter whether what we insert | 1051 | ;; by its expansion, so it does not matter whether what we insert |
| 1050 | ;; here is fully expanded, but it should be absolute. | 1052 | ;; here is fully expanded, but it should be absolute. |