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

[Juanma Barranquero]

Index: emacs/lisp/skeleton.el
diff -c emacs/lisp/skeleton.el:1.32 emacs/lisp/skeleton.el:1.33
*** emacs/lisp/skeleton.el:1.32 Tue May  6 13:51:08 2003
--- emacs/lisp/skeleton.el      Sun May 18 19:58:08 2003
***************
*** 262,267 ****
--- 262,269 ----
  
        \\n     go to next line and indent according to mode
        _       interesting point, interregion here
+       -       interesting point, no interregion interaction, overrides
+               interesting point set by _
        >       indent line (or interregion if > _) according to major mode
        @       add position to `skeleton-positions'
        &       do next ELEMENT iff previous moved point
***************
*** 270,277 ****
        resume: skipped, continue here if quit is signaled
        nil     skipped
  
! After termination, point will be positioned at the first occurrence
! of _ or @ or at the end of the inserted text.
  
  Further elements can be defined via `skeleton-further-elements'.  ELEMENT may
  itself be a SKELETON with an INTERACTOR.  The user is prompted repeatedly for
--- 272,279 ----
        resume: skipped, continue here if quit is signaled
        nil     skipped
  
! After termination, point will be positioned at the last occurrence of -
! or at the first occurrence of _ or at the end of the inserted text.
  
  Further elements can be defined via `skeleton-further-elements'.  ELEMENT may
  itself be a SKELETON with an INTERACTOR.  The user is prompted repeatedly for
***************
*** 455,473 ****
          (goto-char (pop skeleton-regions))
          (and (<= (current-column) (current-indentation))
               (eq (nth 1 skeleton) '\n)
!              (end-of-line 0)))
!       (or skeleton-point
!         (setq skeleton-point (point)))))
        ((eq element '&)
!     (when skeleton-modified (pop skeleton)))
!    ((eq element '|)
!     (unless skeleton-modified (pop skeleton)))
!    ((eq element '@)
!     (push (point) skeleton-positions)
!     (unless skeleton-point (setq skeleton-point (point))))
!    ((eq 'quote (car-safe element))
!     (eval (nth 1 element)))
!    ((or (stringp (car-safe element))
        (consp (car-safe element)))
      (if (symbolp (car-safe (car element)))
        (while (skeleton-internal-list element nil t))
--- 457,476 ----
          (goto-char (pop skeleton-regions))
          (and (<= (current-column) (current-indentation))
               (eq (nth 1 skeleton) '\n)
!                   (end-of-line 0)))
!          (or skeleton-point
!              (setq skeleton-point (point)))))
!       ((eq element '-)
!        (setq skeleton-point (point)))
        ((eq element '&)
!        (when skeleton-modified (pop skeleton)))
!       ((eq element '|)
!        (unless skeleton-modified (pop skeleton)))
!       ((eq element '@)
!        (push (point) skeleton-positions))
!       ((eq 'quote (car-safe element))
!        (eval (nth 1 element)))
!       ((or (stringp (car-safe element))
        (consp (car-safe element)))
      (if (symbolp (car-safe (car element)))
        (while (skeleton-internal-list element nil t))