mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

* lisp/skeleton.el (skeleton-newline): New function.

Browse Source 
(skeleton-internal-1): Use it.
(skeleton-read): Don't use `newline' since it may strip trailing space.
This commit is contained in:
Stefan Monnier 2010-11-12 08:33:44 -05:00
parent c156a63bb3
commit 4490f87580
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,5 +1,10 @@
2010-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
* skeleton.el (skeleton-read): Don't use `newline' since it may strip
trailing space.
(skeleton-newline): New function.
(skeleton-internal-1): Use it.
* simple.el (open-line): `newline' may strip trailing space.
2010-11-12 Kevin Ryde <user42@zip.com.au>

19
lisp/skeleton.el
View File

@ -299,7 +299,10 @@ automatically, and you are prompted to fill in the variable parts.")))
(eolp (eolp)))
;; since Emacs doesn't show main window's cursor, do something noticeable
(or eolp
(open-line 1))
;; We used open-line before, but that can do a lot more than we want,
;; since it runs self-insert-command. E.g. it may remove spaces
;; before point.
(save-excursion (insert "\n")))
(unwind-protect
(setq prompt (if (stringp prompt)
(read-string (format prompt skeleton-subprompt)
@ -352,6 +355,16 @@ automatically, and you are prompted to fill in the variable parts.")))
(signal 'quit 'recursive)
recursive))
(defun skeleton-newline ()
(if (or (eq (point) skeleton-point)
(eq (point) (car skeleton-positions)))
;; If point is recorded, avoid `newline' since it may do things like
;; strip trailing spaces, and since recorded points are commonly placed
;; right after a trailing space, calling `newline' can destroy the
;; position and renders the recorded position incorrect.
(insert "\n")
(newline)))
(defun skeleton-internal-1 (element &optional literal recursive)
(cond
((or (integerp element) (stringp element))
@ -379,13 +392,13 @@ automatically, and you are prompted to fill in the variable parts.")))
(if pos (indent-according-to-mode)))
(skeleton-newline-indent-rigidly
(let ((pt (point)))
(newline)
(skeleton-newline)
(indent-to (save-excursion
(goto-char pt)
(if pos (indent-according-to-mode))
(current-indentation)))))
(t (if pos (reindent-then-newline-and-indent)
(newline)
(skeleton-newline)
(indent-according-to-mode))))))
((eq element '>)
(if (and skeleton-regions (eq (nth 1 skeleton-il) '_))