(tmm-completion-delete-prompt): Don't hardcode point-min==1.

(tmm-add-prompt): Make sure completion-setup-hook is preserved even in
case of an error in display-completion-list.

2 files changed, 10 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b26b793005..a43325c7b5b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2008-04-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * tmm.el (tmm-completion-delete-prompt): Don't hardcode point-min==1.
+        (tmm-add-prompt): Make sure completion-setup-hook is preserved even in
+        case of an error in display-completion-list.
+
         * filecache.el (file-cache-completions-keymap): Move init from
         file-cache-completion-setup-function into declaration.
         (file-cache-minibuffer-complete): Simplify.
diff --git a/lisp/tmm.el b/lisp/tmm.el
index e8d98388afc..b04e0c28d9f 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -345,8 +345,8 @@ Stores a list of all the shortcuts in the free variable `tmm-short-cuts'."
 
 (defun tmm-completion-delete-prompt ()
   (set-buffer standard-output)
-  (goto-char 1)
-  (delete-region 1 (search-forward "Possible completions are:\n")))
+  (goto-char (point-min))
+  (delete-region (point) (search-forward "Possible completions are:\n")))
 
 (defun tmm-remove-inactive-mouse-face ()
   "Remove the mouse-face property from inactive menu items."
@@ -378,9 +378,10 @@ Stores a list of all the shortcuts in the free variable `tmm-short-cuts'."
         (or tmm-completion-prompt
             (add-hook 'completion-setup-hook
                       'tmm-completion-delete-prompt 'append))
-        (with-output-to-temp-buffer "*Completions*"
-          (display-completion-list completions))
-        (remove-hook 'completion-setup-hook 'tmm-completion-delete-prompt))
+        (unwind-protect
+            (with-output-to-temp-buffer "*Completions*"
+              (display-completion-list completions))
+          (remove-hook 'completion-setup-hook 'tmm-completion-delete-prompt)))
       (set-buffer "*Completions*")
       (tmm-remove-inactive-mouse-face)
       (when tmm-completion-prompt