*** simple.el.~1.888.~	Sat Nov 10 09:23:20 2007
--- simple.el	Fri Nov 30 18:13:12 2007
***************
*** 3595,3601 ****
  	(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)
--- 3595,3606 ----
  	(line-move arg nil nil try-vscroll))
      (if (interactive-p)
  	(condition-case nil
! 	    (progn
! 	      (unless line-move-ignore-invisible
! 		;; Interactively, disable point-adjustment when
! 		;; `line-move-ignore-invisible' is nil.
! 		(setq disable-point-adjustment t))
! 	      (line-move arg nil nil try-vscroll))
  	  ((beginning-of-buffer end-of-buffer) (ding)))
        (line-move arg nil nil try-vscroll)))
    nil)
***************
*** 3621,3627 ****
    (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)
--- 3626,3637 ----
    (or arg (setq arg 1))
    (if (interactive-p)
        (condition-case nil
! 	    (progn
! 	      (unless line-move-ignore-invisible
! 		;; Interactively, disable point-adjustment when
! 		;; `line-move-ignore-invisible' is nil.
! 		(setq disable-point-adjustment t))
! 	      (line-move (- arg) nil nil try-vscroll))
  	((beginning-of-buffer end-of-buffer) (ding)))
      (line-move (- arg) nil nil try-vscroll))
    nil)
***************
*** 3862,3868 ****
  	     (save-excursion
  	       ;; Like end-of-line but ignores fields.
  	       (skip-chars-forward "^\n")
! 	       (while (and (not (eobp)) (invisible-p (point)))
  		 (goto-char (next-char-property-change (point)))
  		 (skip-chars-forward "^\n"))
  	       (point))))
--- 3872,3879 ----
  	     (save-excursion
  	       ;; Like end-of-line but ignores fields.
  	       (skip-chars-forward "^\n")
! 	       (while (and line-move-ignore-invisible
! 			   (not (eobp)) (invisible-p (point)))
  		 (goto-char (next-char-property-change (point)))
  		 (skip-chars-forward "^\n"))
  	       (point))))