Mercurial > emacs
changeset 48917:9b8d6678be5c
(original-insert-directory): Make this a variable,
don't set its function definition.
(insert-directory): Use funcall to call that function.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 21 Dec 2002 20:20:47 +0000 |
| parents | af752f3c5c09 |
| children | 199771712967 |
| files | lisp/ls-lisp.el |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ls-lisp.el Sat Dec 21 20:19:37 2002 +0000 +++ b/lisp/ls-lisp.el Sat Dec 21 20:20:47 2002 +0000 @@ -162,9 +162,12 @@ (string :tag "Old time format")) :group 'ls-lisp) +(defvar original-insert-directory nil + "This holds the original function definition of `insert-directory'.") + ;; Remember the original insert-directory function (or (featurep 'ls-lisp) ; FJW: unless this file is being reloaded! - (fset 'original-insert-directory (symbol-function 'insert-directory))) + (setq original-insert-directory (symbol-function 'insert-directory))) ;; This stub is to allow ls-lisp to parse symbolic links via another ;; library such as w32-symlinks.el from @@ -200,7 +203,8 @@ to match file names. It does not support all `ls' switches -- those that work are: A a c i r S s t u U X g G B C R and F partly." (if ls-lisp-use-insert-directory-program - (original-insert-directory file switches wildcard full-directory-p) + (funcall original-insert-directory + file switches wildcard full-directory-p) ;; We need the directory in order to find the right handler. (let ((handler (find-file-name-handler (expand-file-name file) 'insert-directory)))