See ChangeLog

2 files changed, 9 insertions, 8 deletions

diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index c9b3d418b83..726fd0eeaf6 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -1,6 +1,6 @@
 ;;; em-unix --- UNIX command aliases
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2001 Free Software Foundation
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -974,9 +974,9 @@ Show wall-clock time elapsed during execution of COMMAND.")
 (defun eshell/occur (&rest args)
   "Alias \"occur\" to call Emacs `occur' function."
   (let ((inhibit-read-only t))
-    (if args
-        (error "usage: occur: (REGEXP)")
-      (occur (car args)))))
+    (if (> (length args) 2)
+        (error "usage: occur: (REGEXP &optional NLINES)")
+      (apply 'occur args))))
 
 ;;; Code:
 
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index 354905edc24..440cf01d607 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -98,10 +98,11 @@ function `string-to-number'."
 
 (defcustom eshell-ange-ls-uids nil
   "*List of user/host/id strings, used to determine remote ownership."
-  :type '(alist :key-type (string :tag "Hostname")
-                :value-type (alist :tag "User/UID List"
-                                   :key-type (string :tag "Username")
-                                   :value-type (repeat :tag "UIDs" string)))
+  :type '(repeat (cons :tag "Host for User/UID map"
+                       (string :tag "Hostname")
+                       (repeat (cons :tag "User/UID List"
+                                     (string :tag "Username")
+                                     (repeat :tag "UIDs" string)))))
   :group 'eshell-util)
 
 ;;; Internal Variables: