# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 927402550 0
# Node ID 16c7330ad1162464a1389648d12337e98409aa26
# Parent  f4127409d184e89518e78dcd32ad14477d3e093b
(all): Delete selective-display.  Add scroll-margin,
scroll-preserve-screen-position, scroll-conservatively.

diff -r f4127409d184 -r 16c7330ad116 lisp/cus-start.el
--- a/lisp/cus-start.el	Sat May 22 19:42:01 1999 +0000
+++ b/lisp/cus-start.el	Sat May 22 19:49:10 1999 +0000
@@ -52,12 +52,6 @@
 	     (tab-width editing-basics integer)
 	     (ctl-arrow display boolean)
 	     (truncate-lines display boolean)
-	     (selective-display display 
-				(choice (const :tag "off" nil)
-					(integer :tag "space"
-						 :format "%v"
-						 1)
-					(other :tag "on" t)))
 	     (selective-display-ellipses display boolean)
 	     (transient-mark-mode editing-basics boolean)
 	     ;; callint.c
@@ -186,8 +180,11 @@
 	     (split-height-threshold windows integer)
 	     (window-min-height windows integer)
 	     (window-min-width windows integer)
+	     (scroll-preserve-screen-position windows bool)
 	     ;; xdisp.c
 	     (scroll-step windows integer)
+	     (scroll-conservatively windows integer)
+	     (scroll-margin windows integer)
 	     (truncate-partial-width-windows display boolean)
 	     (mode-line-inverse-video modeline boolean)
 	     (line-number-display-limit display integer)