Commit 157b7809 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(skeleton-positions): Renamed from skeleton-marks.

parent a6dccb51
...@@ -100,10 +100,10 @@ skeleton elements.") ...@@ -100,10 +100,10 @@ skeleton elements.")
(defvar skeleton-debug nil (defvar skeleton-debug nil
"*If non-nil `define-skeleton' will override previous definition.") "*If non-nil `define-skeleton' will override previous definition.")
(defvar skeleton-marks nil (defvar skeleton-positions nil
"Variable used to keep the list of positions marked with @ after "List of positions marked with @, after skeleton insertion.
skeleton insertion. The list is in the reverse order of the insertion The list describes the most recent skeleton insertion, and its elements
order. This list is reseted before skeleton insertion.") are integer buffer positions in the reverse order of the insertion order.")
;; reduce the number of compiler warnings ;; reduce the number of compiler warnings
(defvar skeleton) (defvar skeleton)
...@@ -255,7 +255,7 @@ If ELEMENT is a string or a character it gets inserted (see also ...@@ -255,7 +255,7 @@ If ELEMENT is a string or a character it gets inserted (see also
\\n go to next line and indent according to mode \\n go to next line and indent according to mode
_ interesting point, interregion here, point after termination _ interesting point, interregion here, point after termination
> indent line (or interregion if > _) according to major mode > indent line (or interregion if > _) according to major mode
@ add position to `skeleton-marks' @ add position to `skeleton-positions'
& do next ELEMENT if previous moved point & do next ELEMENT if previous moved point
| do next ELEMENT if previous didn't move point | do next ELEMENT if previous didn't move point
-num delete num preceding characters (see `skeleton-untabify') -num delete num preceding characters (see `skeleton-untabify')
...@@ -305,7 +305,7 @@ When done with skeleton, but before going back to `_'-point call ...@@ -305,7 +305,7 @@ When done with skeleton, but before going back to `_'-point call
(setq skeleton-regions (cdr skeleton-regions))) (setq skeleton-regions (cdr skeleton-regions)))
(let ((beg (point)) (let ((beg (point))
skeleton-modified skeleton-point resume: help input v1 v2) skeleton-modified skeleton-point resume: help input v1 v2)
(setq skeleton-marks nil) (setq skeleton-positions nil)
(unwind-protect (unwind-protect
(eval `(let ,skeleton-further-elements (eval `(let ,skeleton-further-elements
(skeleton-internal-list skeleton str))) (skeleton-internal-list skeleton str)))
...@@ -439,7 +439,7 @@ automatically, and you are prompted to fill in the variable parts."))) ...@@ -439,7 +439,7 @@ automatically, and you are prompted to fill in the variable parts.")))
(or skeleton-modified (or skeleton-modified
(setq skeleton (cdr skeleton)))) (setq skeleton (cdr skeleton))))
((eq element '@) ((eq element '@)
(setq skeleton-marks (cons (point) skeleton-marks))) (setq skeleton-positions (cons (point) skeleton-positions)))
((eq 'quote (car-safe element)) ((eq 'quote (car-safe element))
(eval (nth 1 element))) (eval (nth 1 element)))
((or (stringp (car-safe element)) ((or (stringp (car-safe element))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment