diff options
| author | Glenn Morris | 2013-09-13 00:12:44 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-09-13 00:12:44 -0700 |
| commit | 5c3f9bcc3dc27495d5beef5eca397ba383592302 (patch) | |
| tree | d54d85d1159e299fe90ae9a5c22e080ed15430ef | |
| parent | 2ada368ae92ff7b39e3beef407351fdfd31ae87b (diff) | |
| download | emacs-5c3f9bcc3dc27495d5beef5eca397ba383592302.tar.gz emacs-5c3f9bcc3dc27495d5beef5eca397ba383592302.zip | |
* eshell/esh-util.el (ange-cache): Move declaration earlier.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/eshell/esh-util.el | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 53153b22f4a..014b48771c1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2013-09-13 Glenn Morris <rgm@gnu.org> | 1 | 2013-09-13 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * eshell/esh-util.el (ange-cache): Move declaration earlier. | ||
| 4 | |||
| 3 | * eshell/esh-ext.el (eshell-search-path): Declare. | 5 | * eshell/esh-ext.el (eshell-search-path): Declare. |
| 4 | 6 | ||
| 5 | * eshell/em-prompt.el (eshell/pwd): Autoload it. | 7 | * eshell/em-prompt.el (eshell/pwd): Autoload it. |
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el index cac46ea8d18..5fa591a3082 100644 --- a/lisp/eshell/esh-util.el +++ b/lisp/eshell/esh-util.el | |||
| @@ -562,6 +562,8 @@ Unless optional argument INPLACE is non-nil, return a new string." | |||
| 562 | (substring string 0 sublen) | 562 | (substring string 0 sublen) |
| 563 | string))) | 563 | string))) |
| 564 | 564 | ||
| 565 | (defvar ange-cache) | ||
| 566 | |||
| 565 | (and (featurep 'xemacs) | 567 | (and (featurep 'xemacs) |
| 566 | (not (fboundp 'directory-files-and-attributes)) | 568 | (not (fboundp 'directory-files-and-attributes)) |
| 567 | (defun directory-files-and-attributes (directory &optional full match nosort id-format) | 569 | (defun directory-files-and-attributes (directory &optional full match nosort id-format) |
| @@ -579,8 +581,6 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable. | |||
| 579 | (cons file (eshell-file-attributes (expand-file-name file directory))))) | 581 | (cons file (eshell-file-attributes (expand-file-name file directory))))) |
| 580 | (directory-files directory full match nosort))))) | 582 | (directory-files directory full match nosort))))) |
| 581 | 583 | ||
| 582 | (defvar ange-cache) | ||
| 583 | |||
| 584 | (defun eshell-directory-files-and-attributes (dir &optional full match nosort id-format) | 584 | (defun eshell-directory-files-and-attributes (dir &optional full match nosort id-format) |
| 585 | "Make sure to use the handler for `directory-file-and-attributes'." | 585 | "Make sure to use the handler for `directory-file-and-attributes'." |
| 586 | (let* ((dir (expand-file-name dir))) | 586 | (let* ((dir (expand-file-name dir))) |