diff options
| author | Glenn Morris | 2007-11-07 03:57:06 +0000 |
|---|---|---|
| committer | Glenn Morris | 2007-11-07 03:57:06 +0000 |
| commit | 53afc6860d4eb275bf4739a1b573b6511d41d485 (patch) | |
| tree | f5f4731e60e921b4cece246992cc31c9c5086f30 | |
| parent | c74e901d7f21678f300a1f47be091ff34760a3e2 (diff) | |
| download | emacs-53afc6860d4eb275bf4739a1b573b6511d41d485.tar.gz emacs-53afc6860d4eb275bf4739a1b573b6511d41d485.zip | |
David Hansen <david.hansen at gmx.net>
(eshell-extended-glob): Sort matches.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/eshell/em-glob.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7622873361d..ba0db896abf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-11-07 David Hansen <david.hansen@gmx.net> | ||
| 2 | |||
| 3 | * eshell/em-glob.el (eshell-extended-glob): Sort matches. | ||
| 4 | |||
| 1 | 2007-11-07 Glenn Morris <rgm@gnu.org> | 5 | 2007-11-07 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * emulation/tpu-mapper.el (tpu-map-key): Use unless rather than cond. | 7 | * emulation/tpu-mapper.el (tpu-map-key): Use unless rather than cond. |
diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el index 5d68fdf9437..b1d8736b860 100644 --- a/lisp/eshell/em-glob.el +++ b/lisp/eshell/em-glob.el | |||
| @@ -258,7 +258,7 @@ the form: | |||
| 258 | (eshell-glob-entries (file-name-as-directory ".") paths)) | 258 | (eshell-glob-entries (file-name-as-directory ".") paths)) |
| 259 | (if message-shown | 259 | (if message-shown |
| 260 | (message nil))) | 260 | (message nil))) |
| 261 | (or (and matches (nreverse matches)) | 261 | (or (and matches (sort matches #'string<)) |
| 262 | (if eshell-error-if-no-glob | 262 | (if eshell-error-if-no-glob |
| 263 | (error "No matches found: %s" glob) | 263 | (error "No matches found: %s" glob) |
| 264 | glob)))) | 264 | glob)))) |