Update copyright.

[gnu-emacs] / lisp / tempo.el

diff --git a/lisp/tempo.el b/lisp/tempo.el
index ce712aa1382b905c1115be7f87e95db2277c3963..276a67657cc7403e04e811353b9b82d2e81dc170 100644 (file)
--- a/lisp/tempo.el
+++ b/lisp/tempo.el
@@ -1,11 +1,11 @@
 ;;; tempo.el --- Flexible template insertion
-;; Copyright (C) 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995 Free Software Foundation, Inc.
 
 ;; Author: David K}gedal <davidk@lysator.liu.se >
 ;; Created: 16 Feb 1994
-;; Version: 1.2.1
+;; Version: 1.2.2
 ;; Keywords: extensions, languages, tools
-;; $Revision: 1.29 $
+;; $Revision: 1.7 $
 
 ;; This file is part of GNU Emacs.
 
@@ -211,9 +211,9 @@ it recognizes the argument, and NIL otherwise")
        (l (car (cdr il))))
     (list 'tempo-mapc
          (list 'function (append (list 'lambda
-                                       (list (car il)))
+                                       (list i))
                                  forms))
-         (cadr il))))
+         l)))
 (put 'tempo-dolist 'lisp-indent-function 1)
 
 ;;
@@ -558,17 +558,18 @@ Whenever it is needed again it will be rebuilt."
 (defun tempo-build-collection ()
   "Build a collection of all the tags and return it.
 If `tempo-dirty-collection' is NIL, the old collection is reused."
-  (setq tempo-dirty nil)
-  (or (and (not tempo-dirty-collection)
-          tempo-collection)
-      (setq tempo-collection
-           (apply (function append)
-                  (mapcar (function (lambda (tag-list)
+  (prog1
+      (or (and (not tempo-dirty-collection)
+              tempo-collection)
+         (setq tempo-collection
+               (apply (function append)
+                      (mapcar (function (lambda (tag-list)
                                        ; If the format for
                                        ; tempo-local-tags changes,
                                        ; change this
-                                      (eval (car tag-list))))
-                          tempo-local-tags)))))
+                                          (eval (car tag-list))))
+                              tempo-local-tags))))
+    (setq tempo-dirty-collection nil)))
 
 ;;;
 ;;; tempo-find-match-string
@@ -597,7 +598,7 @@ if no reasonable string is found."
 (defun tempo-complete-tag (&optional silent)
   "Look for a tag and expand it.
 All the tags in the tag lists in `tempo-local-tags'
-(this includes `tempo-tags') are searched for a match for the text
+\(this includes `tempo-tags') are searched for a match for the text
 before the point.  The way the string to match for is determined can
 be altered with the variable `tempo-match-finder'. If
 `tempo-match-finder' returns nil, then the results are the same as