diff options
| author | John Wiegley <johnw@newartisans.com> | 2001-01-26 06:19:25 +0000 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2001-01-26 06:19:25 +0000 |
| commit | 219227ead0447814c838935b8d5d06fd2095546d (patch) | |
| tree | 9501e9229c038e8a88bc0eefaa96ea8c8dc2f8b9 /lisp | |
| parent | 8844fa83d302c082faf9976fa3253709afda0d2c (diff) | |
| download | emacs-219227ead0447814c838935b8d5d06fd2095546d.tar.gz | |
See ChangeLog
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 12 | ||||
| -rw-r--r-- | lisp/eshell/em-unix.el | 8 | ||||
| -rw-r--r-- | lisp/eshell/esh-util.el | 9 | ||||
| -rw-r--r-- | lisp/pcomplete.el | 6 |
4 files changed, 24 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ce1a0246d7c..86bcf14b8e9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2001-01-25 John Wiegley <johnw@gnu.org> + + * eshell/esh-util.el (eshell-ange-ls-uids): Changed use of `alist' + to `repeat' in the :type field. + + * pcomplete.el (pcomplete-file-ignore): Changed a :type field to + allow a choice of regexp or nil. + (pcomplete-dir-ignore): same. + + * eshell/em-unix.el (eshell/occur): Fixed bug causing `occur' (as + a command) to always fail. + 2001-01-25 Gerd Moellmann <gerd@gnu.org> * iswitchb.el (iswitchb-make-buflist): When nconc'ing lists, don't 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: diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el index 47c52061c27..0ef1cbd05c7 100644 --- a/lisp/pcomplete.el +++ b/lisp/pcomplete.el @@ -1,6 +1,6 @@ ;;; pcomplete --- programmable completion -;; Copyright (C) 1999, 2000 Free Sofware Foundation +;; Copyright (C) 1999, 2000, 2001 Free Sofware Foundation ;; Author: John Wiegley <johnw@gnu.org> ;; Keywords: processes abbrev @@ -131,12 +131,12 @@ (defcustom pcomplete-file-ignore nil "*A regexp of filenames to be disregarded during file completion." - :type 'regexp + :type '(choice regexp (const :tag "None" nil)) :group 'pcomplete) (defcustom pcomplete-dir-ignore nil "*A regexp of names to be disregarded during directory completion." - :type 'regexp + :type '(choice regexp (const :tag "None" nil)) :group 'pcomplete) (defcustom pcomplete-ignore-case (memq system-type '(ms-dos windows-nt)) |