aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-09-17 22:11:38 -0700
committerGlenn Morris2013-09-17 22:11:38 -0700
commit92d77c897be154cbc9ce960bd974bfd0f8f566df (patch)
tree69b00d58d2f3612699567ba4030e269f5c39fa14
parentee8b701cae9929d655054852dcadc817147305d8 (diff)
downloademacs-92d77c897be154cbc9ce960bd974bfd0f8f566df.tar.gz
emacs-92d77c897be154cbc9ce960bd974bfd0f8f566df.zip
* eshell/em-glob.el (ange-cache):
* eshell/em-unix.el (ange-cache): Declare.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/eshell/em-glob.el2
-rw-r--r--lisp/eshell/em-unix.el2
3 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9eaa1cb3ddf..a23dc06ec91 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -25,6 +25,9 @@
25 25
26 * custom.el (x-get-resource): Declare. 26 * custom.el (x-get-resource): Declare.
27 27
28 * eshell/em-glob.el (ange-cache):
29 * eshell/em-unix.el (ange-cache): Declare.
30
28 * faces.el (x-display-list, x-open-connection, x-get-resource): 31 * faces.el (x-display-list, x-open-connection, x-get-resource):
29 Declare. 32 Declare.
30 33
diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el
index 596547c3f5e..9d3836431c4 100644
--- a/lisp/eshell/em-glob.el
+++ b/lisp/eshell/em-glob.el
@@ -232,6 +232,8 @@ resulting regular expression."
232 (regexp-quote (substring pattern matched-in-pattern)) 232 (regexp-quote (substring pattern matched-in-pattern))
233 "\\'"))) 233 "\\'")))
234 234
235(defvar ange-cache) ; XEmacs? See esh-util
236
235(defun eshell-extended-glob (glob) 237(defun eshell-extended-glob (glob)
236 "Return a list of files generated from GLOB, perhaps looking for DIRS-ONLY. 238 "Return a list of files generated from GLOB, perhaps looking for DIRS-ONLY.
237This function almost fully supports zsh style filename generation 239This function almost fully supports zsh style filename generation
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index 5792fe17506..1548d181855 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -461,6 +461,8 @@ Remove the DIRECTORY(ies), if they are empty.")
461 (eshell-parse-command 461 (eshell-parse-command
462 (format "tar %s %s" tar-args archive) args)))) 462 (format "tar %s %s" tar-args archive) args))))
463 463
464(defvar ange-cache) ; XEmacs? See esh-util
465
464;; this is to avoid duplicating code... 466;; this is to avoid duplicating code...
465(defmacro eshell-mvcpln-template (command action func query-var 467(defmacro eshell-mvcpln-template (command action func query-var
466 force-var &optional preserve) 468 force-var &optional preserve)