[Emacs-diffs] Changes to emacs/lisp/skeleton.el

[Miles Bader]

Index: emacs/lisp/skeleton.el
diff -c emacs/lisp/skeleton.el:1.30 emacs/lisp/skeleton.el:1.31
*** emacs/lisp/skeleton.el:1.30 Tue May 14 10:14:11 2002
--- emacs/lisp/skeleton.el      Fri Jan 17 15:35:48 2003
***************
*** 381,387 ****
         opoint)
      (or str
        (setq str `(setq str (skeleton-read ',(car skeleton) nil ,recursive))))
!     (when (and (eq (cadr skeleton) '\n)
               (save-excursion (skip-chars-backward " \t") (bolp)))
        (setq skeleton (cons nil (cons '> (cddr skeleton)))))
      (while (setq skeleton-modified (eq opoint (point))
--- 381,387 ----
         opoint)
      (or str
        (setq str `(setq str (skeleton-read ',(car skeleton) nil ,recursive))))
!     (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,438 ****
        (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))
        (if pos (indent-according-to-mode)))
         (skeleton-newline-indent-rigidly
        (let ((pt (point)))
--- 432,438 ----
        (indent-region (line-beginning-position)
                       (car skeleton-regions) nil))
         ;; \n as last element only inserts \n if not at eol.
!        ((and (null (cdr skeleton)) (not recursive) (eolp))
        (if pos (indent-according-to-mode)))
         (skeleton-newline-indent-rigidly
        (let ((pt (point)))