--- a/lisp/prim/simple.el	Mon Aug 13 09:12:43 2007 +0200
+++ b/lisp/prim/simple.el	Mon Aug 13 09:13:56 2007 +0200
@@ -1568,9 +1568,12 @@
 	  (goto-char opoint)
 	  (line-move arg)))
     (if (interactive-p)
+	;; XEmacs:  Not sure what to do about this.  It's inconsistent. -sb
 	(condition-case nil
 	    (line-move arg)
-	  ((beginning-of-buffer end-of-buffer) (ding nil 'buffer-bound)))
+	  ((beginning-of-buffer end-of-buffer)
+	   (when signal-error-on-buffer-boundary
+	     (ding nil 'buffer-bound))))
       (line-move arg)))
   nil)
 
@@ -1591,7 +1594,9 @@
   (if (interactive-p)
       (condition-case nil
 	  (line-move (- arg))
-	((beginning-of-buffer end-of-buffer) (ding nil 'buffer-bound)))
+	((beginning-of-buffer end-of-buffer)
+	 (when signal-error-on-buffer-boundary ; XEmacs
+	   (ding nil 'buffer-bound))))
     (line-move (- arg)))
   nil)
 
@@ -1614,7 +1619,7 @@
 (eval-when-compile
   (defvar inhibit-point-motion-hooks))
 
-(defvar line-move-ignore-invisible nil
+(defvar line-move-ignore-invisible t
   "*Non-nil means \\[next-line] and \\[previous-line] ignore invisible lines.
 Outline mode sets this.")