Merge from emacs-23

[gnu-emacs] / lisp / eshell / em-glob.el

diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el
index 27fab9afe60fafef8b001d9761de9a2c7acb8d5e..2f29f3d0aee14cfb953c03d3e958d3294ce47af8 100644 (file)
--- a/lisp/eshell/em-glob.el
+++ b/lisp/eshell/em-glob.el
@@ -1,7 +1,7 @@
 ;;; em-glob.el --- extended file name globbing
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;;   2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -53,7 +53,8 @@
 (eval-when-compile (require 'eshell))
 (require 'esh-util)
 
-(defgroup eshell-glob nil
+;;;###autoload
+(eshell-defgroup eshell-glob nil
   "This module provides extended globbing syntax, similar what is used
 by zsh for filename generation."
   :tag "Extended filename globbing"
@@ -62,39 +63,39 @@ by zsh for filename generation."
 ;;; User Variables:
 
 (defcustom eshell-glob-load-hook '(eshell-glob-initialize)
-  "*A list of functions to run when `eshell-glob' is loaded."
+  "A list of functions to run when `eshell-glob' is loaded."
   :type 'hook
   :group 'eshell-glob)
 
 (defcustom eshell-glob-include-dot-files nil
-  "*If non-nil, glob patterns will match files beginning with a dot."
+  "If non-nil, glob patterns will match files beginning with a dot."
   :type 'boolean
   :group 'eshell-glob)
 
 (defcustom eshell-glob-include-dot-dot t
-  "*If non-nil, glob patterns that match dots will match . and .."
+  "If non-nil, glob patterns that match dots will match . and .."
   :type 'boolean
   :group 'eshell-glob)
 
 (defcustom eshell-glob-case-insensitive (eshell-under-windows-p)
-  "*If non-nil, glob pattern matching will ignore case."
+  "If non-nil, glob pattern matching will ignore case."
   :type 'boolean
   :group 'eshell-glob)
 
 (defcustom eshell-glob-show-progress nil
-  "*If non-nil, display progress messages during a recursive glob.
+  "If non-nil, display progress messages during a recursive glob.
 This option slows down recursive glob processing by quite a bit."
   :type 'boolean
   :group 'eshell-glob)
 
 (defcustom eshell-error-if-no-glob nil
-  "*If non-nil, it is an error for a glob pattern not to match.
+  "If non-nil, it is an error for a glob pattern not to match.
  This mimcs the behavior of zsh if non-nil, but bash if nil."
   :type 'boolean
   :group 'eshell-glob)
 
 (defcustom eshell-glob-chars-list '(?\] ?\[ ?* ?? ?~ ?\( ?\) ?| ?# ?^)
-  "*List of additional characters used in extended globbing."
+  "List of additional characters used in extended globbing."
   :type '(repeat character)
   :group 'eshell-glob)
 
@@ -116,7 +117,7 @@ This option slows down recursive glob processing by quite a bit."
                         (if (eq (aref str (1+ pos)) ?*)
                             "*" "+")) (+ pos 2))
               (cons "*" (1+ pos))))))
-  "*An alist for translation of extended globbing characters."
+  "An alist for translation of extended globbing characters."
   :type '(repeat (cons character (choice regexp function)))
   :group 'eshell-glob)
 
@@ -259,9 +260,8 @@ the form:
            (error "No matches found: %s" glob)
          glob))))
 
-(eval-when-compile
-  (defvar matches)
-  (defvar message-shown))
+(defvar matches)
+(defvar message-shown)
 
 ;; FIXME does this really need to abuse matches, message-shown?
 (defun eshell-glob-entries (path globs &optional recurse-p)
@@ -354,5 +354,9 @@ the form:
 
 (provide 'em-glob)
 
+;; Local Variables:
+;; generated-autoload-file: "esh-groups.el"
+;; End:
+
 ;; arch-tag: d0548f54-fb7c-4978-a88e-f7c26f7f68ca
 ;;; em-glob.el ends here