*** empty log message ***

[gnu-emacs] / lisp / tempo.el

diff --git a/lisp/tempo.el b/lisp/tempo.el
index 915d3a430d80a13889fe15e4f08179791ebf0e20..62ba3c9acae7145ca9e74631046b7b253979e025 100644 (file)
--- a/lisp/tempo.el
+++ b/lisp/tempo.el
@@ -1,6 +1,7 @@
 ;;; tempo.el --- Flexible template insertion
 
-;; Copyright (C) 1994, 1995, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: David K}gedal <davidk@lysator.liu.se>
 ;; Created: 16 Feb 1994
@@ -303,7 +304,7 @@ mode, ON-REGION is ignored and assumed true if the region is active."
                     transient-mark-mode
                     mark-active)
                (if (featurep 'xemacs)
-                    zmacs-regions (mark)))
+                   (and zmacs-regions (mark))))
            (setq on-region t))
        (and on-region
             (set-marker tempo-region-start (min (mark) (point)))
@@ -716,11 +717,13 @@ non-nil, a buffer containing possible completions is displayed."
   (if tempo-leave-completion-buffer
       (with-output-to-temp-buffer "*Completions*"
        (display-completion-list
-        (all-completions string tag-list)))
+        (all-completions string tag-list)
+        string))
     (save-window-excursion
       (with-output-to-temp-buffer "*Completions*"
        (display-completion-list
-        (all-completions string tag-list)))
+        (all-completions string tag-list)
+        string))
       (sit-for 32767))))
 
 ;;;