summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/eshell/em-ls.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e535f7f3e80..a6b085cd5cd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,10 @@
2001-01-29 Dave Love <fx@gnu.org>
+ * eshell/esh-ext.el (eshell-windows-shell-file): Fix :type.
+
+ * eshell/em-ls.el (eshell-ls-exclude-regexp): Fix :type.
+
* progmodes/tcl.el (outline, dabbrev, add-log): Require when
compiling.
(tcl-using-emacs-19-23): Consider Emacs 21+.
diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index 534ea932c3c..97a342b73ac 100644
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -85,7 +85,7 @@ This is useful for enabling human-readable format (-h), for example."
(defcustom eshell-ls-exclude-regexp nil
"*Unless -a is specified, files matching this regexp will not be shown."
- :type 'regexp
+ :type '(choice regexp (const nil))
:group 'eshell-ls)
(defcustom eshell-ls-exclude-hidden t