From 5c3f9bcc3dc27495d5beef5eca397ba383592302 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 13 Sep 2013 00:12:44 -0700 Subject: [PATCH] * eshell/esh-util.el (ange-cache): Move declaration earlier. --- lisp/ChangeLog | 2 ++ 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 @@ 2013-09-13 Glenn Morris + * eshell/esh-util.el (ange-cache): Move declaration earlier. + * eshell/esh-ext.el (eshell-search-path): Declare. * 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." (substring string 0 sublen) string))) +(defvar ange-cache) + (and (featurep 'xemacs) (not (fboundp 'directory-files-and-attributes)) (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. (cons file (eshell-file-attributes (expand-file-name file directory))))) (directory-files directory full match nosort))))) -(defvar ange-cache) - (defun eshell-directory-files-and-attributes (dir &optional full match nosort id-format) "Make sure to use the handler for `directory-file-and-attributes'." (let* ((dir (expand-file-name dir))) -- 2.39.2