11 files changed, 215 insertions, 93 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 48ead8f51ff..52486191495 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,40 @@
+2006-04-02  Drew Adams  <drew.adams@oracle.com>  (tiny change)
+
+        * speedbar.el (speedbar-after-create-hook): Doc fix.
+
+2006-04-02  Michael Ernst  <mernst@alum.mit.edu>
+
+        * shell.el (shell-directory-tracker)
+        (shell-dynamic-complete-command): Doc fixes.
+
+2006-04-01  Matt Hodges  <MPHodges@member.fsf.org>
+
+        * pcomplete.el (pcomplete-show-completions): Recognize TAB on text
+        terminals.
+
+2006-04-01  Kim F. Storm  <storm@cua.dk>
+
+        * ido.el (ido-unc-hosts-cache): New defvar.
+        (ido-unc-hosts): If value of defcustom is a function, call it to
+        get list of UNC hosts.  Add function-item choices to specify
+        ido-unc-hosts-net-view or user function.
+        (ido-ignore-unc-host-regexps): New defcustom.
+        (ido-unc-hosts-net-view, ido-unc-hosts): New functions.
+        (ido-is-unc-root, ido-is-unc-host, ido-file-name-all-completions)
+        (ido-exhibit): Call ido-unc-hosts to get list of UNC hosts.
+
+2006-03-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * pcvs-util.el (cvs-insert-strings): Fix bug with strings longer than
+        wwidth.
+
+2006-03-31  Juanma Barranquero  <lekktu@gmail.com>
+
+        * ido.el (ido-cache-unc-host-shares-time, ido-report-no-match)
+        (ido-max-work-file-list, ido-switch-buffer)
+        (ido-read-file-name-as-directory-commands):
+        Fix typos in docstrings.
+
 2006-03-30  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * term/mac-win.el (mac-system-coding-system): Define and use after
@@ -433,11 +470,6 @@
         * tree-widget.el (tree-widget-themes-load-path)
         (tree-widget-themes-directory, tree-widget-theme): Doc fix.
 
-2006-03-13  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-        * pcvs-util.el (cvs-insert-strings): Fix bug with strings longer than
-        wwidth.
-
 2006-03-13  Ryan Yeske  <rcyeske@gmail.com>
 
         * net/rcirc.el (rcirc) <defgroup>: Add link to manual.
@@ -15172,7 +15204,7 @@
         * add-log.el (change-log-font-lock-keywords): Make the regexp for
         date lines stricter.
 
-2005-06-10  Zhang Wei  <id.brep@gmail.com>  (tiny change)
+2005-06-10  Zhang Wei  <id.brep@gmail.com>
 
         * term/x-win.el (x-clipboard-yank): Use x-selection-value instead
         of x-get-selection.
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 5781a442c08..67799d73049 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -197,7 +197,7 @@
 
         * erc.el (erc-version-string): Release ERC 5.1.1.
 
-2006-02-03  Zhang Wei  <id.brep@gmail.com>  (tiny change)
+2006-02-03  Zhang Wei  <id.brep@gmail.com>
 
         * erc.el (erc-version-string): Don't hard-code Emacs version.
         (erc-version): Use emacs-version.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 71940cac0db..d39ab0a1455 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-31  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-group.el (gnus-group-update-tool-bar): Add :initialize and
+        :set.
+
 2006-03-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * mml.el (mml-insert-mime): Ignore cached contents of
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 0ed72433115..24e4df14712 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -1389,6 +1389,13 @@ if it is a string, only list groups matching REGEXP."
   "Force updating the group buffer tool bar."
   :group 'gnus-group
   :version "22.1"
+  :initialize 'custom-initialize-default
+  :set (lambda (symbol value)
+         (set-default symbol value)
+         (when (gnus-alive-p)
+           (with-current-buffer gnus-group-buffer
+             ;; FIXME: Is there a better way to redraw the group buffer?
+             (gnus-group-get-new-news 0))))
   :type 'boolean)
 
 (defun gnus-group-insert-group-line (gnus-tmp-group gnus-tmp-level
diff --git a/lisp/ido.el b/lisp/ido.el
index 6bc2f45709f..e4ec2be700d 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -630,22 +630,41 @@ equivalent function, e.g. `find-file' rather than `ido-find-file'."
   :type '(repeat regexp)
   :group 'ido)
 
+(defvar ido-unc-hosts-cache t
+  "Cached value from ido-unc-hosts function.")
+
 (defcustom ido-unc-hosts nil
-  "*List of known UNC host names to complete after initial //."
-  :type '(repeat string)
+  "*List of known UNC host names to complete after initial //.
+If value is a function, that function is called to search network for
+hosts on first use of UNC path."
+  :type '(choice (repeat :tag "List of UNC host names" string)
+                 (function-item :tag "Use `NET VIEW'"
+                                :value ido-unc-hosts-net-view)
+                 (function :tag "Your own function"))
+  :set #'(lambda (symbol value)
+           (set symbol value)
+           (setq ido-unc-hosts-cache t))
+  :group 'ido)
+
+(defcustom ido-ignore-unc-host-regexps nil
+  "*List of regexps matching UNC hosts to ignore."
+  :type '(repeat regexp)
+  :set #'(lambda (symbol value)
+           (set symbol value)
+           (setq ido-unc-hosts-cache t))
   :group 'ido)
 
 (defcustom ido-cache-unc-host-shares-time 8.0
   "*Maximum time to cache shares of an UNC host (in hours).
 Use C-l in prompt to refresh list.
-If zero, unc host shares are not cached."
+If zero, UNC host shares are not cached."
   :type 'number
   :group 'ido)
 
 (defcustom ido-max-work-file-list 10
   "*Maximum number of names of recently opened files to record.
 This is the list the file names (sans directory) which have most recently
-been opened. See `ido-work-file-list' and `ido-save-directory-list-file'."
+been opened.  See `ido-work-file-list' and `ido-save-directory-list-file'."
   :type 'integer
   :group 'ido)
 
@@ -891,7 +910,7 @@ Must be set before enabling ido mode."
   :group 'ido)
 
 (defcustom ido-read-file-name-as-directory-commands '()
-  "List of commands which uses read-file-name to read a directory name.
+  "List of commands which uses `read-file-name' to read a directory name.
 When `ido-everywhere' is non-nil, the commands in this list will read
 the directory using `ido-read-directory-name'."
   :type '(repeat symbol)
@@ -988,7 +1007,7 @@ Copied from `icomplete-eoinput'.")
   "List of files currently matching `ido-text'.")
 
 (defvar ido-report-no-match t
-  "Report [No Match] when no completions matches ido-text.")
+  "Report [No Match] when no completions matches `ido-text'.")
 
 (defvar ido-exit nil
   "Flag to monitor how `ido-find-file' exits.
@@ -1111,18 +1130,58 @@ it doesn't interfere with other minibuffer usage.")
           (pop-to-buffer b t t)
           (setq truncate-lines t)))))
 
+(defun ido-unc-hosts (&optional query)
+  "Return list of UNC host names."
+  (cond
+   ((listp ido-unc-hosts)
+    ido-unc-hosts)              ;; static list or nil
+   ((listp ido-unc-hosts-cache)
+    ido-unc-hosts-cache)        ;; result of net search
+   ((and query (fboundp ido-unc-hosts))
+    (message "Searching for UNC hosts...")
+    (let ((hosts (funcall ido-unc-hosts)) host re-list re)
+      (setq ido-unc-hosts-cache nil)
+      (while hosts
+        (setq host (downcase (car hosts))
+              hosts (cdr hosts)
+              re-list ido-ignore-unc-host-regexps)
+        (while re-list
+          (setq re (car re-list)
+                re-list (cdr re-list))
+          (if (string-match re host)
+              (setq re-list nil
+                    host nil)))
+        (if host
+            (setq ido-unc-hosts-cache (cons host ido-unc-hosts-cache)))))
+    (message nil)
+    (setq ido-unc-hosts-cache
+          (sort ido-unc-hosts-cache #'string<)))
+   (query
+    (setq ido-unc-hosts-cache nil))
+   (t (fboundp ido-unc-hosts))))
+
+(defun ido-unc-hosts-net-view ()
+  "Query network for list of UNC host names using `NET VIEW'."
+  (let (hosts)
+    (with-temp-buffer
+      (shell-command "net view" t)
+      (goto-char (point-min))
+      (while (re-search-forward "^\\\\\\\\\\([[:graph:]]+\\)" nil t)
+        (setq hosts (cons (match-string 1) hosts))))
+    hosts))
+
 (defun ido-is-tramp-root (&optional dir)
   (and ido-enable-tramp-completion
        (string-match "\\`/[^/]+[@:]\\'"
                      (or dir ido-current-directory))))
 
 (defun ido-is-unc-root (&optional dir)
-  (and ido-unc-hosts
+  (and (ido-unc-hosts)
        (string-equal "//"
                      (or dir ido-current-directory))))
 
 (defun ido-is-unc-host (&optional dir)
-  (and ido-unc-hosts
+  (and (ido-unc-hosts)
        (string-match "\\`//[^/]+/\\'"
                      (or dir ido-current-directory))))
 
@@ -1699,7 +1758,7 @@ With ARG, turn ido speed-up on if arg is positive, off otherwise."
 ;;       the relevant function is called (find-file, write-file, etc).
 
 (defun ido-read-internal (item prompt history &optional default require-match initial)
-  "Perform the ido-read-buffer and ido-read-file-name functions.
+  "Perform the `ido-read-buffer' and `ido-read-file-name' functions.
 Return the name of a buffer or file selected.
 PROMPT is the prompt to give to the user.
 DEFAULT if given is the default directory to start with.
@@ -3238,7 +3297,7 @@ for first matching file."
     (mapcar
      (lambda (host)
        (if (string-match "/\\'" host) host (concat host "/")))
-     ido-unc-hosts))
+     (ido-unc-hosts t)))
    ((and (numberp ido-max-dir-file-cache) (> ido-max-dir-file-cache 0)
          (stringp dir) (> (length dir) 0)
          (ido-may-cache-directory dir))
@@ -3734,7 +3793,7 @@ default is to show it in the same window, unless it is already visible
 in another frame.
 
 As you type in a string, all of the buffers matching the string are
-displayed if substring-matching is used \(default). Look at
+displayed if substring-matching is used \(default).  Look at
 `ido-enable-prefix' and `ido-toggle-prefix'.  When you have found the
 buffer you want, it can then be selected.  As you type, most keys have
 their normal keybindings, except for the following: \\<ido-buffer-completion-map>
@@ -3757,7 +3816,7 @@ in a separate window.
 \\[ido-toggle-prefix] Toggle between substring and prefix matching.
 \\[ido-toggle-case] Toggle case-sensitive searching of buffer names.
 \\[ido-completion-help] Show list of matching buffers in separate window.
-\\[ido-enter-find-file] Drop into ido-find-file.
+\\[ido-enter-find-file] Drop into `ido-find-file'.
 \\[ido-kill-buffer-at-head] Kill buffer at head of buffer list.
 \\[ido-toggle-ignore] Toggle ignoring buffers listed in `ido-ignore-buffers'."
   (interactive)
@@ -4026,7 +4085,7 @@ For details of keybindings, do `\\[describe-function] ido-find-file'."
            ((and (ido-is-tramp-root) (string-equal contents "/"))
             (ido-set-current-directory ido-current-directory contents)
             (setq refresh t))
-           ((and ido-unc-hosts (string-equal contents "/")
+           ((and (ido-unc-hosts) (string-equal contents "/")
                  (let ((ido-enable-tramp-completion nil))
                    (ido-is-root-directory)))
             (ido-set-current-directory "//")
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 64876717392..fa66eaca664 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-31  Bill Wohler  <wohler@newt.com>
+
+        * mh-e.el (mh-strip-package-version): Move before use to avoid
+        compiler error. Make macro, also to avoid compiler error.
+        (mh-defface-compat): Incorporate body into mh-face-data and
+        delete.
+
 2006-03-30  Bill Wohler  <wohler@newt.com>
 
         * mh-e.el (mh-defcustom, mh-defface, mh-defgroup): Macros to
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index ce2db4fb66e..5f1c66e58d8 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -895,6 +895,19 @@ necessary and can actually cause problems."
 
 ;; Temporary function and data structure used customization.
 ;; These will be unbound after the options are defined.
+(defmacro mh-strip-package-version (args)
+  "Strip :package-version keyword and its value from ARGS.
+In Emacs versions that support the :package-version keyword,
+ARGS is returned unchanged."
+  `(if (boundp 'customize-package-emacs-version-alist)
+       ,args
+     (let (seen)
+       (loop for keyword in ,args
+             if (cond ((eq keyword ':package-version) (setq seen t) nil)
+                      (seen (setq seen nil) nil)
+                      (t t))
+             collect keyword))))
+
 (defmacro mh-defgroup (symbol members doc &rest args)
   "Declare SYMBOL as a customization group containing MEMBERS.
 See documentation for `defgroup' for a description of the arguments
@@ -925,19 +938,6 @@ keyword, introduced in Emacs 22."
   `(defface ,face ,spec ,doc ,@(mh-strip-package-version args)))
 (put 'mh-defface 'lisp-indent-function 'defun)
 
-(defun mh-strip-package-version (args)
-  "Strip :package-version keyword and its value from ARGS.
-In Emacs versions that support the :package-version keyword,
-ARGS is returned unchanged."
-  (if (boundp 'customize-package-emacs-version-alist)
-      args
-    (let (seen)
-      (loop for keyword in args
-            if (cond ((eq keyword ':package-version) (setq seen t) nil)
-                     (seen (setq seen nil) nil)
-                     (t t))
-            collect keyword))))
-
 
 
 ;;; MH-E Customization
@@ -3115,46 +3115,12 @@ sequence."
 (if (boundp 'facemenu-unlisted-faces)
     (add-to-list 'facemenu-unlisted-faces "^mh-"))
 
-;; Temporary function and data structure used for defining faces.
-;; These will be unbound after the faces are defined.
-(defvar mh-min-colors-defined-flag (and (not mh-xemacs-flag)
-                                        (>= emacs-major-version 22))
-  "Non-nil means `defface' supports min-colors display requirement.")
-
-(defun mh-defface-compat (spec)
-  "Convert SPEC for defface if necessary to run on older platforms.
-Modifies SPEC in place and returns it. See `defface' for the spec definition.
-
-When `mh-min-colors-defined-flag' is nil, this function finds
-display entries with \"min-colors\" requirements and either
-removes the \"min-colors\" requirement or strips the display
-entirely if the display does not support the number of specified
-colors."
-  (if mh-min-colors-defined-flag
-      spec
-    (let ((cells (mh-display-color-cells))
-          new-spec)
-      ;; Remove entries with min-colors, or delete them if we have fewer colors
-      ;; than they specify.
-      (loop for entry in (reverse spec) do
-            (let ((requirement (if (eq (car entry) t)
-                                   nil
-                                 (assoc 'min-colors (car entry)))))
-              (if requirement
-                  (when (>= cells (nth 1 requirement))
-                    (setq new-spec (cons (cons (delq requirement (car entry))
-                                               (cdr entry))
-                                         new-spec)))
-                (setq new-spec (cons entry new-spec)))))
-      new-spec)))
-
-(require 'cus-face)
-
-(defvar mh-inherit-face-flag (assq :inherit custom-face-attributes)
-  "Non-nil means that the `defface' :inherit keyword is available.
-The :inherit keyword is available on all supported versions of
-GNU Emacs and XEmacs from at least 21.5.23 on.")
-
+;; To add a new face:
+;; 1. Add entry to variable mh-face-data.
+;; 2. Create face using mh-defface (which removes min-color spec and
+;;    :package-version keyword where these are not supported),
+;;    accessing face data with function mh-face-data.
+;; 3. Add inherit argument to function mh-face-data if applicable.
 (defvar mh-face-data
   '((mh-folder-followup
      ((((class color) (background light))
@@ -3297,19 +3263,61 @@ GNU Emacs and XEmacs from at least 21.5.23 on.")
       (((class color) (background dark))
        (:foreground "red1" :underline t))
       (t
-       (:underline t))))))
+       (:underline t)))))
+  "MH-E face data.
+Used by function `mh-face-data' which returns spec that is
+consumed by `mh-defface'.")
+
+(require 'cus-face)
+
+(defvar mh-inherit-face-flag (assq :inherit custom-face-attributes)
+  "Non-nil means that the `defface' :inherit keyword is available.
+The :inherit keyword is available on all supported versions of
+GNU Emacs and XEmacs from at least 21.5.23 on.")
+
+(defvar mh-min-colors-defined-flag (and (not mh-xemacs-flag)
+                                        (>= emacs-major-version 22))
+  "Non-nil means `defface' supports min-colors display requirement.")
 
 (defun mh-face-data (face &optional inherit)
   "Return spec for FACE.
-If INHERIT is non-nil and `defface' supports the :inherit
-keyword, return INHERIT literally; otherwise, return spec for FACE.
+See `defface' for the spec definition.
 
-This isn't a perfect implementation. In the case that
-the :inherit keyword is not supported, any additional attributes
-in the inherit parameter are not added to the returned spec."
-  (if (and inherit mh-inherit-face-flag)
-      inherit
-    (mh-defface-compat (cadr (assoc face mh-face-data)))))
+If INHERIT is non-nil and `defface' supports the :inherit
+keyword, return INHERIT literally; otherwise, return spec for
+FACE from the variable `mh-face-data'. This isn't a perfect
+implementation. In the case that the :inherit keyword is not
+supported, any additional attributes in the inherit parameter are
+not added to the returned spec.
+
+Furthermore, when `mh-min-colors-defined-flag' is nil, this
+function finds display entries with \"min-colors\" requirements
+and either removes the \"min-colors\" requirement or strips the
+display entirely if the display does not support the number of
+specified colors."
+  (let ((spec
+         (if (and inherit mh-inherit-face-flag)
+             inherit
+           (or (cadr (assq face mh-face-data))
+               (error "Could not find %s in mh-face-data" face)))))
+
+    (if mh-min-colors-defined-flag
+        spec
+      (let ((cells (mh-display-color-cells))
+            new-spec)
+        ;; Remove entries with min-colors, or delete them if we have
+        ;; fewer colors than they specify.
+        (loop for entry in (reverse spec) do
+              (let ((requirement (if (eq (car entry) t)
+                                     nil
+                                   (assq 'min-colors (car entry)))))
+                (if requirement
+                    (when (>= cells (nth 1 requirement))
+                      (setq new-spec (cons (cons (delq requirement (car entry))
+                                                 (cdr entry))
+                                           new-spec)))
+                  (setq new-spec (cons entry new-spec)))))
+        new-spec))))
 
 (mh-defface mh-folder-address
   (mh-face-data 'mh-folder-subject '((t (:inherit mh-folder-subject))))
@@ -3520,9 +3528,9 @@ The background and foreground are used in the image."
 ;; Get rid of temporary functions and data structures.
 (fmakunbound 'mh-defcustom)
 (fmakunbound 'mh-defface)
-(fmakunbound 'mh-defface-compat)
 (fmakunbound 'mh-defgroup)
 (fmakunbound 'mh-face-data)
+(fmakunbound 'mh-strip-package-version)
 (makunbound 'mh-face-data)
 (makunbound 'mh-inherit-face-flag)
 (makunbound 'mh-min-colors-defined-flag)
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index 36878d2dff9..0f970c5191a 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -978,7 +978,9 @@ Typing SPC flushes the help buffer."
                 (set-window-configuration pcomplete-last-window-config)
                 (setq pcomplete-last-window-config nil)
                 (throw 'done nil))
-               ((event-matches-key-specifier-p event 'tab)
+               ((or (event-matches-key-specifier-p event 'tab)
+                    ;; Needed on a terminal
+                    (event-matches-key-specifier-p event 9))
                 (save-selected-window
                   (select-window (get-buffer-window "*Completions*"))
                   (if (pos-visible-in-window-p (point-max))
diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el
index 9ff40d09494..b04f3c121a1 100644
--- a/lisp/pcvs-util.el
+++ b/lisp/pcvs-util.el
@@ -157,10 +157,11 @@ Uses columns to keep the listing readable but compact."
       (setq tab-width colwidth)
       ;; The insertion should be "sensible" no matter what choices were made.
       (dolist (str strings)
-        (unless (bolp) (insert " \t"))
-        (when (< wwidth (+ (max colwidth (length str)) (current-column)))
-          (delete-char -2) (insert "\n"))
-        (insert str)))))
+        (unless (bolp)
+          (insert " \t")
+          (when (< wwidth (+ (max colwidth (length str)) (current-column)))
+            (delete-char -2) (insert "\n")))
+        (insert str)))))
 
 
 (defun cvs-file-to-string (file &optional oneline args)
@@ -357,7 +358,8 @@ If ARG is nil toggle the PREFIX's value between its 0th default and nil
   and reset the persistence."
   (let* ((prefix (symbol-value (cvs-prefix-sym sym)))
          (numarg (if (integerp arg) arg 0))
-         (defs (cvs-flags-defaults prefix)))
+         ;; (defs (cvs-flags-defaults prefix))
+         )
 
     ;; set persistence if requested
     (when (> (prefix-numeric-value arg) 9)
diff --git a/lisp/shell.el b/lisp/shell.el
index f7eaeb84341..71b5862feb6 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -574,7 +574,7 @@ Otherwise, one argument `-i' is passed to the shell.
 ;;; 2. It cannot infallibly deal with command sequences, though it does well
 ;;;    with these and with ignoring commands forked in another shell with ()s.
 ;;; 3. More generally, any complex command is going to throw it. Otherwise,
-;;;    you'd have to build an entire shell interpreter in emacs lisp.  Failing
+;;;    you'd have to build an entire shell interpreter in Emacs Lisp.  Failing
 ;;;    that, there's no way to catch shell commands where cd's are buried
 ;;;    inside conditional expressions, aliases, and so forth.
 ;;;
@@ -608,7 +608,7 @@ It watches for cd, pushd and popd commands and sets the buffer's
 default directory to track these commands.
 
 You may toggle this tracking on and off with M-x dirtrack-mode.
-If emacs gets confused, you can resync with the shell with M-x dirs.
+If Emacs gets confused, you can resync with the shell with M-x dirs.
 
 See variables `shell-cd-regexp', `shell-chdrive-regexp', `shell-pushd-regexp',
 and  `shell-popd-regexp', while `shell-pushd-tohome', `shell-pushd-dextract',
@@ -929,7 +929,7 @@ See `shell-command-regexp'."
 (defun shell-dynamic-complete-command ()
   "Dynamically complete the command at point.
 This function is similar to `comint-dynamic-complete-filename', except that it
-searches `exec-path' (minus the trailing emacs library path) for completion
+searches `exec-path' (minus the trailing Emacs library path) for completion
 candidates.  Note that this may not be the same as the shell's idea of the
 path.
 
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 2e55c4929d5..4b83f08d89d 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -503,7 +503,7 @@ hierarchy would be replaced with the new directory."
   :type 'hook)
 
 (defcustom speedbar-after-create-hook '(speedbar-frame-reposition-smartly)
-  "*Hooks called before popping up the speedbar frame."
+  "*Hooks called after popping up the speedbar frame."
   :group 'speedbar
   :type 'hook)