aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1996-12-28 19:33:20 +0000
committerRichard M. Stallman1996-12-28 19:33:20 +0000
commit157b7809ca8ce6126a90e962b7eef1a92aed5d89 (patch)
tree44ceee1f4186528b39b2c4938e8e934878885872
parenta6dccb5154ff3a536709e540de0dfb8e39e38ef5 (diff)
downloademacs-157b7809ca8ce6126a90e962b7eef1a92aed5d89.tar.gz
emacs-157b7809ca8ce6126a90e962b7eef1a92aed5d89.zip
(skeleton-positions): Renamed from skeleton-marks.
-rw-r--r--lisp/skeleton.el14
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index d10f2b5a896..a5bacfeb1b0 100644
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -100,10 +100,10 @@ skeleton elements.")
100(defvar skeleton-debug nil 100(defvar skeleton-debug nil
101 "*If non-nil `define-skeleton' will override previous definition.") 101 "*If non-nil `define-skeleton' will override previous definition.")
102 102
103(defvar skeleton-marks nil 103(defvar skeleton-positions nil
104 "Variable used to keep the list of positions marked with @ after 104 "List of positions marked with @, after skeleton insertion.
105skeleton insertion. The list is in the reverse order of the insertion 105The list describes the most recent skeleton insertion, and its elements
106order. This list is reseted before skeleton insertion.") 106are integer buffer positions in the reverse order of the insertion order.")
107 107
108;; reduce the number of compiler warnings 108;; reduce the number of compiler warnings
109(defvar skeleton) 109(defvar skeleton)
@@ -255,7 +255,7 @@ If ELEMENT is a string or a character it gets inserted (see also
255 \\n go to next line and indent according to mode 255 \\n go to next line and indent according to mode
256 _ interesting point, interregion here, point after termination 256 _ interesting point, interregion here, point after termination
257 > indent line (or interregion if > _) according to major mode 257 > indent line (or interregion if > _) according to major mode
258 @ add position to `skeleton-marks' 258 @ add position to `skeleton-positions'
259 & do next ELEMENT if previous moved point 259 & do next ELEMENT if previous moved point
260 | do next ELEMENT if previous didn't move point 260 | do next ELEMENT if previous didn't move point
261 -num delete num preceding characters (see `skeleton-untabify') 261 -num delete num preceding characters (see `skeleton-untabify')
@@ -305,7 +305,7 @@ When done with skeleton, but before going back to `_'-point call
305 (setq skeleton-regions (cdr skeleton-regions))) 305 (setq skeleton-regions (cdr skeleton-regions)))
306 (let ((beg (point)) 306 (let ((beg (point))
307 skeleton-modified skeleton-point resume: help input v1 v2) 307 skeleton-modified skeleton-point resume: help input v1 v2)
308 (setq skeleton-marks nil) 308 (setq skeleton-positions nil)
309 (unwind-protect 309 (unwind-protect
310 (eval `(let ,skeleton-further-elements 310 (eval `(let ,skeleton-further-elements
311 (skeleton-internal-list skeleton str))) 311 (skeleton-internal-list skeleton str)))
@@ -439,7 +439,7 @@ automatically, and you are prompted to fill in the variable parts.")))
439 (or skeleton-modified 439 (or skeleton-modified
440 (setq skeleton (cdr skeleton)))) 440 (setq skeleton (cdr skeleton))))
441 ((eq element '@) 441 ((eq element '@)
442 (setq skeleton-marks (cons (point) skeleton-marks))) 442 (setq skeleton-positions (cons (point) skeleton-positions)))
443 ((eq 'quote (car-safe element)) 443 ((eq 'quote (car-safe element))
444 (eval (nth 1 element))) 444 (eval (nth 1 element)))
445 ((or (stringp (car-safe element)) 445 ((or (stringp (car-safe element))