summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/skeleton.el5
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7a7547eb8d6..1f5683ce2fd 100644
--- 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 9274c3ca8c9..0733f065262 100644
--- 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))