aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2007-11-07 04:00:02 +0000
committerGlenn Morris2007-11-07 04:00:02 +0000
commitf117c226d09f008ea965ec4c3eab2a1e66e94671 (patch)
tree06d4e1d9bfe593382c098f36928c0ac91b1a8c6a
parent53afc6860d4eb275bf4739a1b573b6511d41d485 (diff)
downloademacs-f117c226d09f008ea965ec4c3eab2a1e66e94671.tar.gz
emacs-f117c226d09f008ea965ec4c3eab2a1e66e94671.zip
Comment.
-rw-r--r--ChangeLog4
-rw-r--r--lisp/eshell/em-glob.el1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fd23fce5da3..2ca36bb3a02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12007-11-07 Glenn Morris <rgm@gnu.org>
2
3 * configure.in: Deprecate Mac Carbon port.
4
12007-11-01 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 52007-11-01 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 6
3 * configure.in: Remove HAVE_X11R5 check. 7 * configure.in: Remove HAVE_X11R5 check.
diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el
index b1d8736b860..2e95aaefae0 100644
--- a/lisp/eshell/em-glob.el
+++ b/lisp/eshell/em-glob.el
@@ -267,6 +267,7 @@ the form:
267 (defvar matches) 267 (defvar matches)
268 (defvar message-shown)) 268 (defvar message-shown))
269 269
270;; FIXME does this really need to abuse matches, message-shown?
270(defun eshell-glob-entries (path globs &optional recurse-p) 271(defun eshell-glob-entries (path globs &optional recurse-p)
271 "Glob the entries in PATHS, possibly recursing if RECURSE-P is non-nil." 272 "Glob the entries in PATHS, possibly recursing if RECURSE-P is non-nil."
272 (let* ((entries (ignore-errors 273 (let* ((entries (ignore-errors