* lisp/skeleton.el (skeleton-newline): Remove.

(skeleton-internal-1): Use (insert "\n") instead.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6f8636c8bd83b9ae64f5eb43622851858e7e133c..8dfd255304612d63730dc4c439b44035a5dfaf0d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-10-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * skeleton.el (skeleton-newline): Remove.
+       (skeleton-internal-1): Use (insert "\n") instead.
+
        * emacs-lisp/lisp.el (lisp-completion-at-point): Complete var names for
        let-bindings.
 

diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index a7eae7464e2c5cde4301bb9c503570d08275363f..27b672c55522b7632ce7f1e07d91221f56e08c7c 100644 (file)
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -356,15 +356,6 @@ 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
@@ -384,7 +375,7 @@ automatically, and you are prompted to fill in the variable parts.")))
     (let ((pos (if (eq element '>) (point))))
       (cond
        ((and skeleton-regions (eq (nth 1 skeleton-il) '_))
-       (or (eolp) (newline))
+       (or (eolp) (insert "\n"))
        (if pos (save-excursion (goto-char pos) (indent-according-to-mode)))
        (indent-region (line-beginning-position)
                       (car skeleton-regions) nil))
@@ -393,13 +384,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)))
-         (skeleton-newline)
+          (insert "\n")
          (indent-to (save-excursion
                       (goto-char pt)
                       (if pos (indent-according-to-mode))
                       (current-indentation)))))
        (t (if pos (reindent-then-newline-and-indent)
-           (skeleton-newline)
+           (insert "\n")
            (indent-according-to-mode))))))
    ((eq element '>)
     (if (and skeleton-regions (eq (nth 1 skeleton-il) '_))