From: Dan Nicolaescu <done@ece.arizona.edu>
Date: Mon, 20 Apr 1998 03:35:05 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-20.3~1406
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f9e9ac1ddebce30fd644f9c854edfbc40a93d4d5;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/avoid.el b/lisp/avoid.el
index e9351844989..0ce9e479229 100644
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@@ -89,7 +89,8 @@ You must modify via \\[customize] for this variable to have an effect."
 		 (const animate) (const exile) (const proteus)
 		 )
   :group 'avoid
-  :require 'avoid)
+  :require 'avoid
+  :version "20.3")
 
 
 (defcustom mouse-avoidance-nudge-dist 15
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 94b698f62e4..ae7a9d218a0 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -269,6 +269,9 @@ is okay.  See `mode-line-format'.")
 	"^Buffer .* doesn't exist$"
 	"^There is no file to merge$"
 	"^Version control package .*.el not found. Use vc.el instead$"
+	
+	;; cus-edit
+	"^No user options have changed defaults in recent Emacs versions$"
 
 	;; BBDB
 	"^no previous record$"
diff --git a/lisp/hscroll.el b/lisp/hscroll.el
index a3da7913ced..0bcac3a1fa0 100644
--- a/lisp/hscroll.el
+++ b/lisp/hscroll.el
@@ -67,7 +67,8 @@ You must modify via \\[customize] for this variable to have an effect."
   :initialize 'custom-initialize-default
   :group 'hscroll
   :type 'boolean
-  :require 'hscroll)
+  :require 'hscroll
+  :version "20.3")
 
 (defcustom hscroll-margin 5 
   "*How many columns away from the edge of the window point is allowed to get
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index fa7775c122c..14ca13b8b17 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -141,7 +141,8 @@
   :set '(lambda (symbol value)
 	  (setq mail-abbrevs-mode value)
 	  (if value (mail-abbrevs-enable) (mail-abbrevs-disable)))
-  :initialize 'custom-initialize-default)
+  :initialize 'custom-initialize-default
+  :version "20.3")
 
 (defcustom mail-abbrevs-only nil
   "*Non-nil means only mail abbrevs should expand automatically.
diff --git a/lisp/msb.el b/lisp/msb.el
index 6c4e472ec9e..95d0fc1b302 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -278,7 +278,8 @@ error every time you do \\[msb]."
   "The sort key for files sorted by mode."
   :type 'integer
   :set 'msb-custom-set
-  :group 'msb)
+  :group 'msb
+  :version "20.3")
 
 (defcustom msb-separator-diff 100
   "*Non-nil means use separators.
diff --git a/lisp/rsz-mini.el b/lisp/rsz-mini.el
index d1f7e441a59..f1cc6d6e95b 100644
--- a/lisp/rsz-mini.el
+++ b/lisp/rsz-mini.el
@@ -7,7 +7,7 @@
 ;; Maintainer: friedman@prep.ai.mit.edu
 ;; Keywords: minibuffer, window, frame, display
 
-;; $Id: rsz-mini.el,v 1.18 1998/01/03 07:17:25 rms Exp $
+;; $Id: rsz-mini.el,v 1.19 1998/03/23 13:18:54 schwab Exp done $
 
 ;; This file is part of GNU Emacs.
 
@@ -69,7 +69,8 @@ You must modify via \\[customize] for this variable to have an effect."
   :initialize 'custom-initialize-default
   :type 'boolean
   :group 'resize-minibuffer
-  :require 'rsz-mini)
+  :require 'rsz-mini
+  :version "20.3")
 
 ;;;###autoload
 (defcustom resize-minibuffer-window-max-height nil
diff --git a/lisp/time.el b/lisp/time.el
index 9c405c2a1aa..d03b033884a 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -42,7 +42,8 @@ You must modify via \\[customize] for this variable to have an effect."
   :initialize 'custom-initialize-default
   :type 'boolean
   :group 'display-time
-  :require 'time)
+  :require 'time
+  :version "20.3")
 
 
 (defcustom display-time-mail-file nil
diff --git a/lisp/type-break.el b/lisp/type-break.el
index d3070544d0b..2e0025ce888 100644
--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@@ -8,7 +8,7 @@
 ;; Status: Works in GNU Emacs 19.25 or later, some versions of XEmacs
 ;; Created: 1994-07-13
 
-;; $Id: type-break.el,v 1.13 1998/01/29 09:26:38 stephen Exp rms $
+;; $Id: type-break.el,v 1.14 1998/03/14 04:47:44 rms Exp done $
 
 ;; This file is part of GNU Emacs.
 
@@ -84,7 +84,8 @@ You must modify via \\[customize] for this variable to have an effect."
   :initialize 'custom-initialize-default  
   :type 'boolean
   :group 'type-break
-  :require 'type-break)
+  :require 'type-break
+  :version "20.3")
 
 ;;;###autoload
 (defcustom type-break-interval (* 60 60)