# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 966792082 0
# Node ID e143c9fd35c96cdeb9f72e8eca9d237337a58bd8
# Parent  14c0286b43b56044a0dd00655036007323f832eb
Add display-buffer-reuse-frames,
file-coding-system-alist.

diff -r 14c0286b43b5 -r e143c9fd35c9 lisp/cus-start.el
--- a/lisp/cus-start.el	Sun Aug 20 17:12:03 2000 +0000
+++ b/lisp/cus-start.el	Sun Aug 20 17:21:22 2000 +0000
@@ -70,6 +70,19 @@
 	     (eol-mnemonic-unix mule string)
 	     (eol-mnemonic-dos mule string)
 	     (eol-mnemonic-mac mule string)
+	     (file-coding-system-alist
+	      mule
+	      (alist
+	       :key-type (regexp :tag "File regexp")
+	       :value-type (choice
+			    :value (undecided . undecided)
+			    (cons :tag "Encoding/decoding pair"
+				  :value (undecided . undecided)
+				  (coding-system :tag "Decoding")
+				  (coding-system :tag "Encoding"))
+			    (coding-system :tag "Single coding system"
+					   :value undecided)
+			    (function :value ignore))))
 	     ;; dired.c
 	     (completion-ignored-extensions dired 
 					    (repeat (string :format "%v")))
@@ -191,6 +204,7 @@
 	     (window-min-height windows integer)
 	     (window-min-width windows integer)
 	     (scroll-preserve-screen-position windows boolean)
+	     (display-buffer-reuse-frames windows boolean "21.1")
 	     ;; xdisp.c
 	     (scroll-step windows integer)
 	     (scroll-conservatively windows integer)