Remove spurious * in docstrings.

(tmm-prompt): Use with-current-buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fadb8ab8744ad6378d59276683a2a218c2356a7a..995155f3bbec39210443dcc20e467e0d4f036ed0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2007-09-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * tmm.el: Remove spurious * in docstrings.
+       (tmm-prompt): Use with-current-buffer.
+
        * vcursor.el: Remove spurious * in docstrings.
        (vcursor-map): Initialize in the declaration.
        (vcursor-use-vcursor-map): Use define-minor-mode.

diff --git a/lisp/tmm.el b/lisp/tmm.el
index e4436fc68ff2ff8d6201d1980413f221157f2cde..6deed45bf5c1cb3e1f48f4f5fd1b04c4416e3038 100644 (file)
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -100,7 +100,7 @@ See the documentation for `tmm-prompt'."
   (tmm-menubar (car (posn-x-y (event-start event)))))
 
 (defcustom tmm-mid-prompt "==>"
-  "*String to insert between shortcut and menu item.
+  "String to insert between shortcut and menu item.
 If nil, there will be no shortcuts. It should not consist only of spaces,
 or else the correct item might not be found in the `*Completions*' buffer."
   :type 'string
@@ -115,14 +115,14 @@ Alternatively, you can use Up/Down keys (or your History keys) to change
 the item in the minibuffer, and press RET when you are done, or press the
 marked letters to pick up your choice.  Type C-g or ESC ESC ESC to cancel.
 "
-  "*Help text to insert on the top of the completion buffer.
+  "Help text to insert on the top of the completion buffer.
 To save space, you can set this to nil,
 in which case the standard introduction text is deleted too."
   :type '(choice string (const nil))
   :group 'tmm)
 
 (defcustom tmm-shortcut-style '(downcase upcase)
-  "*What letters to use as menu shortcuts.
+  "What letters to use as menu shortcuts.
 Must be either one of the symbols `downcase' or `upcase',
 or else a list of the two in the order you prefer."
   :type '(choice (const downcase)
@@ -131,7 +131,7 @@ or else a list of the two in the order you prefer."
   :group 'tmm)
 
 (defcustom tmm-shortcut-words 2
-  "*How many successive words to try for shortcuts, nil means all.
+  "How many successive words to try for shortcuts, nil means all.
 If you use only one of `downcase' or `upcase' for `tmm-shortcut-style',
 specify nil for this variable."
   :type '(choice integer (const nil))
@@ -231,13 +231,11 @@ Its value should be an event that has a binding in MENU."
                            tmm-km-list nil t nil
                            (cons 'history
                                  (- (* 2 history-len) index-of-default))))
-                  (save-excursion
-                    (remove-hook 'minibuffer-setup-hook 'tmm-add-prompt)
-                    (if (get-buffer "*Completions*")
-                        (progn
-                          (set-buffer "*Completions*")
-                          (use-local-map tmm-old-comp-map)
-                          (bury-buffer (current-buffer))))))))))
+                   (remove-hook 'minibuffer-setup-hook 'tmm-add-prompt)
+                   (if (get-buffer "*Completions*")
+                       (with-current-buffer "*Completions*"
+                         (use-local-map tmm-old-comp-map)
+                         (bury-buffer (current-buffer)))))))))
       (setq choice (cdr (assoc out tmm-km-list)))
       (and (null choice)
           (> (length out) (length tmm-c-prompt))
@@ -565,9 +563,10 @@ of `menu-bar-final-items'."
          ;; Return that keymap.
          bind))))
 
+;; Huh?  What's that about?  --Stef
 (add-hook 'calendar-load-hook (lambda () (require 'cal-menu)))
 
 (provide 'tmm)
 
-;;; arch-tag: e7ddbdb6-4b95-4da3-afbe-ad6063d112f4
+;; arch-tag: e7ddbdb6-4b95-4da3-afbe-ad6063d112f4
 ;;; tmm.el ends here