From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 17 Jan 2003 20:35:48 +0000 (+0000)
Subject: (skeleton-internal-list, skeleton-internal-1):
X-Git-Tag: ttn-vms-21-2-B4~11604
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=da8249b4a93f530830e5bc9ae941e5091de88eba;p=emacs.git

(skeleton-internal-list, skeleton-internal-1):
Don't treat \n specially in sub-skeletons.
---

diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index 2b31194e7f1..05841a4dee1 100644
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -381,7 +381,7 @@ automatically, and you are prompted to fill in the variable parts.")))
 	 opoint)
     (or str
 	(setq str `(setq str (skeleton-read ',(car skeleton) nil ,recursive))))
-    (when (and (eq (cadr skeleton) '\n)
+    (when (and (eq (cadr skeleton) '\n) (not recursive)
 	       (save-excursion (skip-chars-backward " \t") (bolp)))
       (setq skeleton (cons nil (cons '> (cddr skeleton)))))
     (while (setq skeleton-modified (eq opoint (point))
@@ -432,7 +432,7 @@ automatically, and you are prompted to fill in the variable parts.")))
 	(indent-region (line-beginning-position)
 		       (car skeleton-regions) nil))
        ;; \n as last element only inserts \n if not at eol.
-       ((and (null (cdr skeleton)) (eolp))
+       ((and (null (cdr skeleton)) (not recursive) (eolp))
 	(if pos (indent-according-to-mode)))
        (skeleton-newline-indent-rigidly
 	(let ((pt (point)))