diff options
| author | Stefan Monnier | 2003-01-17 20:35:48 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2003-01-17 20:35:48 +0000 |
| commit | da8249b4a93f530830e5bc9ae941e5091de88eba (patch) | |
| tree | 650928de13a8aa9ff682e65ded6e6bf5706e4ceb | |
| parent | 3f4a4bdf31863607bc882022c5d3d3a46a0de473 (diff) | |
| download | emacs-da8249b4a93f530830e5bc9ae941e5091de88eba.tar.gz emacs-da8249b4a93f530830e5bc9ae941e5091de88eba.zip | |
(skeleton-internal-list, skeleton-internal-1):
Don't treat \n specially in sub-skeletons.
| -rw-r--r-- | lisp/skeleton.el | 4 |
1 files changed, 2 insertions, 2 deletions
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."))) | |||
| 381 | opoint) | 381 | opoint) |
| 382 | (or str | 382 | (or str |
| 383 | (setq str `(setq str (skeleton-read ',(car skeleton) nil ,recursive)))) | 383 | (setq str `(setq str (skeleton-read ',(car skeleton) nil ,recursive)))) |
| 384 | (when (and (eq (cadr skeleton) '\n) | 384 | (when (and (eq (cadr skeleton) '\n) (not recursive) |
| 385 | (save-excursion (skip-chars-backward " \t") (bolp))) | 385 | (save-excursion (skip-chars-backward " \t") (bolp))) |
| 386 | (setq skeleton (cons nil (cons '> (cddr skeleton))))) | 386 | (setq skeleton (cons nil (cons '> (cddr skeleton))))) |
| 387 | (while (setq skeleton-modified (eq opoint (point)) | 387 | (while (setq skeleton-modified (eq opoint (point)) |
| @@ -432,7 +432,7 @@ automatically, and you are prompted to fill in the variable parts."))) | |||
| 432 | (indent-region (line-beginning-position) | 432 | (indent-region (line-beginning-position) |
| 433 | (car skeleton-regions) nil)) | 433 | (car skeleton-regions) nil)) |
| 434 | ;; \n as last element only inserts \n if not at eol. | 434 | ;; \n as last element only inserts \n if not at eol. |
| 435 | ((and (null (cdr skeleton)) (eolp)) | 435 | ((and (null (cdr skeleton)) (not recursive) (eolp)) |
| 436 | (if pos (indent-according-to-mode))) | 436 | (if pos (indent-according-to-mode))) |
| 437 | (skeleton-newline-indent-rigidly | 437 | (skeleton-newline-indent-rigidly |
| 438 | (let ((pt (point))) | 438 | (let ((pt (point))) |