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

[Kim F . Storm]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.696 emacs/lisp/simple.el:1.697
*** emacs/lisp/simple.el:1.696  Mon Mar  7 11:12:31 2005
--- emacs/lisp/simple.el        Sun Mar 13 23:20:49 2005
***************
*** 3177,3184 ****
    :version "21.1"
    :group 'editing-basics)
  
! (defun next-line (&optional arg)
    "Move cursor vertically down ARG lines.
  If there is no character in the target line exactly under the current column,
  the cursor is positioned after the character in that line which spans this
  column, or at the end of the line if it is not long enough.
--- 3177,3185 ----
    :version "21.1"
    :group 'editing-basics)
  
! (defun next-line (&optional arg try-vscroll)
    "Move cursor vertically down ARG lines.
+ Interactively, vscroll tall lines if `auto-window-vscroll' is enabled.
  If there is no character in the target line exactly under the current column,
  the cursor is positioned after the character in that line which spans this
  column, or at the end of the line if it is not long enough.
***************
*** 3197,3203 ****
  If you are thinking of using this in a Lisp program, consider
  using `forward-line' instead.  It is usually easier to use
  and more reliable (no dependence on goal column, etc.)."
!   (interactive "p")
    (or arg (setq arg 1))
    (if (and next-line-add-newlines (= arg 1))
        (if (save-excursion (end-of-line) (eobp))
--- 3198,3204 ----
  If you are thinking of using this in a Lisp program, consider
  using `forward-line' instead.  It is usually easier to use
  and more reliable (no dependence on goal column, etc.)."
!   (interactive "p\np")
    (or arg (setq arg 1))
    (if (and next-line-add-newlines (= arg 1))
        (if (save-excursion (end-of-line) (eobp))
***************
*** 3205,3220 ****
          (let ((abbrev-mode nil))
            (end-of-line)
            (insert "\n"))
!       (line-move arg nil nil t))
      (if (interactive-p)
        (condition-case nil
!           (line-move arg nil nil t)
          ((beginning-of-buffer end-of-buffer) (ding)))
!       (line-move arg nil nil t)))
    nil)
  
! (defun previous-line (&optional arg)
    "Move cursor vertically up ARG lines.
  If there is no character in the target line exactly over the current column,
  the cursor is positioned after the character in that line which spans this
  column, or at the end of the line if it is not long enough.
--- 3206,3222 ----
          (let ((abbrev-mode nil))
            (end-of-line)
            (insert "\n"))
!       (line-move arg nil nil try-vscroll))
      (if (interactive-p)
        (condition-case nil
!           (line-move arg nil nil try-vscroll)
          ((beginning-of-buffer end-of-buffer) (ding)))
!       (line-move arg nil nil try-vscroll)))
    nil)
  
! (defun previous-line (&optional arg try-vscroll)
    "Move cursor vertically up ARG lines.
+ Interactively, vscroll tall lines if `auto-window-vscroll' is enabled.
  If there is no character in the target line exactly over the current column,
  the cursor is positioned after the character in that line which spans this
  column, or at the end of the line if it is not long enough.
***************
*** 3229,3241 ****
  If you are thinking of using this in a Lisp program, consider using
  `forward-line' with a negative argument instead.  It is usually easier
  to use and more reliable (no dependence on goal column, etc.)."
!   (interactive "p")
    (or arg (setq arg 1))
    (if (interactive-p)
        (condition-case nil
!         (line-move (- arg) nil nil t)
        ((beginning-of-buffer end-of-buffer) (ding)))
!     (line-move (- arg) nil nil t))
    nil)
  
  (defcustom track-eol nil
--- 3231,3243 ----
  If you are thinking of using this in a Lisp program, consider using
  `forward-line' with a negative argument instead.  It is usually easier
  to use and more reliable (no dependence on goal column, etc.)."
!   (interactive "p\np")
    (or arg (setq arg 1))
    (if (interactive-p)
        (condition-case nil
!         (line-move (- arg) nil nil try-vscroll)
        ((beginning-of-buffer end-of-buffer) (ding)))
!     (line-move (- arg) nil nil try-vscroll))
    nil)
  
  (defcustom track-eol nil
***************
*** 3274,3281 ****
          (assq prop buffer-invisibility-spec)))))
  
  ;; Perform vertical scrolling of tall images if necessary.
  (defun line-move (arg &optional noerror to-end try-vscroll)
!   (if (and auto-window-vscroll try-vscroll)
        (let ((forward (> arg 0))
            (part (nth 2 (pos-visible-in-window-p (point) nil t))))
        (if (and (consp part)
--- 3276,3286 ----
          (assq prop buffer-invisibility-spec)))))
  
  ;; Perform vertical scrolling of tall images if necessary.
+ ;; Don't vscroll in a keyboard macro.
  (defun line-move (arg &optional noerror to-end try-vscroll)
!   (if (and auto-window-vscroll try-vscroll
!          (not defining-kbd-macro)
!          (not executing-kbd-macro))
        (let ((forward (> arg 0))
            (part (nth 2 (pos-visible-in-window-p (point) nil t))))
        (if (and (consp part)