diff options
| author | John Wiegley | 2005-11-01 09:31:26 +0000 |
|---|---|---|
| committer | John Wiegley | 2005-11-01 09:31:26 +0000 |
| commit | dbc56a8ba256b126422423e23368440f19cd0040 (patch) | |
| tree | 3aecdbb028b924d5454cb260acb9b52741aa7eb6 | |
| parent | c7deede0114b59fad6b841b4f405466510b7b1a1 (diff) | |
| download | emacs-dbc56a8ba256b126422423e23368440f19cd0040.tar.gz emacs-dbc56a8ba256b126422423e23368440f19cd0040.zip | |
*** empty log message ***
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/eshell/em-glob.el | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a15ee5c6d7f..b9782a19545 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -59,11 +59,6 @@ | |||
| 59 | recently due to changes in font-lock, so this goes back to version | 59 | recently due to changes in font-lock, so this goes back to version |
| 60 | 21 behavior. | 60 | 21 behavior. |
| 61 | 61 | ||
| 62 | * eshell/em-glob.el (eshell-extended-glob): Expand the "." path | ||
| 63 | before passing it down to `eshell-glob-entries'. This is done | ||
| 64 | because special file-handlers will on trigger on ".", even if | ||
| 65 | `default-directory' is special. | ||
| 66 | |||
| 67 | 2005-11-01 Nick Roberts <nickrob@snap.net.nz> | 62 | 2005-11-01 Nick Roberts <nickrob@snap.net.nz> |
| 68 | 63 | ||
| 69 | * progmodes/gdb-ui.el (gdb-use-inferior-io-buffer): New function. | 64 | * progmodes/gdb-ui.el (gdb-use-inferior-io-buffer): New function. |
diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el index ec7ed22876a..869144dad74 100644 --- a/lisp/eshell/em-glob.el +++ b/lisp/eshell/em-glob.el | |||
| @@ -254,8 +254,7 @@ the form: | |||
| 254 | (file-name-absolute-p (car paths))) | 254 | (file-name-absolute-p (car paths))) |
| 255 | (eshell-glob-entries (file-name-as-directory (car paths)) | 255 | (eshell-glob-entries (file-name-as-directory (car paths)) |
| 256 | (cdr paths)) | 256 | (cdr paths)) |
| 257 | (eshell-glob-entries (expand-file-name | 257 | (eshell-glob-entries (file-name-as-directory ".") paths)) |
| 258 | (file-name-as-directory ".")) paths)) | ||
| 259 | (if message-shown | 258 | (if message-shown |
| 260 | (message nil))) | 259 | (message nil))) |
| 261 | (or (and matches (nreverse matches)) | 260 | (or (and matches (nreverse matches)) |