X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/5244bc019bf7376caff3bb198ff674e0ad9fb0e6..996ad1b846a0865245df008bdb551093278b3c30:/lisp/tempo.el

diff --git a/lisp/tempo.el b/lisp/tempo.el
index e279314540..15be01dcdf 100644
--- a/lisp/tempo.el
+++ b/lisp/tempo.el
@@ -1,10 +1,10 @@
 ;;; tempo.el --- Flexible template insertion
 
-;; Copyright (C) 1994-1995, 2001-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1995, 2001-2014 Free Software Foundation, Inc.
 
-;; Author: David K}gedal <davidk@lysator.liu.se>
+;; Author: David KÃ¥gedal <davidk@lysator.liu.se>
 ;; Created: 16 Feb 1994
-;; K}gedal's last version number: 1.2.4
+;; KÃ¥gedal's last version number: 1.2.4
 ;; Keywords: extensions, languages, tools
 
 ;; This file is part of GNU Emacs.
@@ -611,11 +611,7 @@ function or string that is used by `\\[tempo-complete-tag]' to find a
 string to match the tag against.  It has the same definition as the
 variable `tempo-match-finder'.  In this version, supplying a
 COMPLETION-FUNCTION just sets `tempo-match-finder' locally."
-  (let ((old (assq tag-list tempo-local-tags)))
-    (if old
-	(setcdr old completion-function)
-      (setq tempo-local-tags (cons (cons tag-list completion-function)
-				   tempo-local-tags))))
+  (setf (alist-get tag-list tempo-local-tags) completion-function)
   (if completion-function
       (setq tempo-match-finder completion-function))
   (tempo-invalidate-collection))
@@ -723,13 +719,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)
-	 string))
+	 (completion-hilit-commonality (all-completions string tag-list)
+				       (length string))))
     (save-window-excursion
       (with-output-to-temp-buffer "*Completions*"
 	(display-completion-list
-	 (all-completions string tag-list)
-	 string))
+	 (completion-hilit-commonality (all-completions string tag-list)
+				       (length string))))
       (sit-for 32767))))
 
 ;;;
@@ -763,3 +759,7 @@ space bar, and looks something like this:
 (provide 'tempo)
 
 ;;; tempo.el ends here
+
+;; Local Variables:
+;; coding: utf-8
+;; End: