(skeleton-internal-1): Always push the mark for @.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7a7547eb8d64c80d326d7c2362fafc1f85cb81b8..1f5683ce2fdd629870e46b3476fc4206b6aae79d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-04  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * skeleton.el (skeleton-internal-1): Always push the mark for @.
+
 2001-02-02  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * info.el (info-initialize): If installation-directory is nil, for

diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index 9274c3ca8c94b704e42854c88af51169ad774e8e..0733f06526289c4c4c780c6a928a119024439b33 100644 (file)
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -451,9 +451,8 @@ automatically, and you are prompted to fill in the variable parts.")))
         (or skeleton-modified
             (setq skeleton (cdr skeleton))))
        ((eq element '@)
-        (if skeleton-point
-            (push (point) skeleton-positions)
-          (setq skeleton-point (point))))
+        (push (point) skeleton-positions)
+        (unless skeleton-point (setq skeleton-point (point))))
        ((eq 'quote (car-safe element))
         (eval (nth 1 element)))
        ((or (stringp (car-safe element))