--- a/lisp/ChangeLog	Sun Nov 07 22:52:23 2004 +0000
+++ b/lisp/ChangeLog	Mon Nov 08 14:17:03 2004 +0000
@@ -1,3 +1,15 @@
+2004-09-22  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* menubar-items.el (save-options-file):
+	(save-options-init-file):
+	(options-save-faces):
+	Remove obsolete and unused variables.
+
+2004-09-22  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* menubar-items.el (init-menubar-at-startup):
+	XEmacs loads "init files", not ".emacs".
+
 2004-11-07  Malcolm Purvis  <malcolmp@xemacs.org>
 
 	* about.el (about-personal-info): Added my personal details.

--- a/lisp/menubar-items.el	Sun Nov 07 22:52:23 2004 +0000
+++ b/lisp/menubar-items.el	Mon Nov 08 14:17:03 2004 +0000
@@ -1717,16 +1717,16 @@
 
 (defun init-menubar-at-startup ()
   "Don't call this.
-Adds `Load .emacs' button to menubar when starting up with -q."
-  (when (and (not load-user-init-file-p)
-	     (file-exists-p (expand-file-name ".emacs" "~")))
+Adds `Load init files' button to menubar when starting up with -q."
+  ;; load-user-init-file finds the init files itself now
+  (when (not load-user-init-file-p)
     (add-menu-button
      nil
-     ["%_Load .emacs"
+     ["%_Load init files"
       (progn
 	(mapc #'(lambda (buf)
 		 (with-current-buffer buf
-		   (delete-menu-item '("Load .emacs"))))
+		   (delete-menu-item '("Load init files"))))
 	      (buffer-list))
 	(load-user-init-file))
       ]
@@ -2046,35 +2046,6 @@
 	     'list-buffers)))
 
 
-;;; The Options menu
-
-;; We'll keep those variables here for a while, in order to provide a
-;; function for porting the old options file that a user may own to Custom.
-
-(defvar options-save-faces nil
-  "*Non-nil value means save-options will save information about faces.
-A nil value means save-options will not save face information.
-Set this non-nil only if you use M-x edit-faces to change face
-settings.  If you use M-x customize-face or the \"Browse Faces...\"
-menu entry, you will see a button in the Customize Face buffer that you
-can use to permanently save your face changes.
-
-M-x edit-faces is deprecated.  Support for it and this variable will
-be discontinued in a future release.")
-
-(defvar save-options-init-file nil
-  "File into which to save forms to load the options file (nil for .emacs).
-Normally this is nil, which means save into your .emacs file (the value
-of `user-init-file'.")
-
-(defvar save-options-file ".xemacs-options"
-  "File to save options into.
-This file is loaded from your .emacs file.
-If this is a relative filename, it is put into the same directory as your
-.emacs file.")
-
-
-
 ;;; The Help menu
 
 (defun tutorials-menu-filter (menu-items)