>>>> "Martin" == Martin Buchholz
<martin(a)xemacs.org> writes:
Martin> There is a call to (load-user-custom-file) in lisp/startup.el, but no
Martin> definition anywhere that I can see. To those who have hacked on
Martin> custom or startup recently, could you please take a look?
Must have been me, I guess. Naturally, I have no memory of having
done it. Here's what I currently have for startup.el. I'll apply
tomorrow if nobody objects.
2000-07-16 Mike Sperber <mike(a)xemacs.org>
* startup.el (load-init-file): Remove silly call to
`load-user-custom-file`.
(maybe-migrate-user-init-file): Minor fixes.
Index: lisp/startup.el
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/lisp/startup.el,v
retrieving revision 1.24.2.18
diff -u -u -r1.24.2.18 startup.el
--- startup.el 2000/07/13 15:34:49 1.24.2.18
+++ startup.el 2000/07/16 10:22:51
@@ -685,17 +685,17 @@
(defun maybe-migrate-user-init-file ()
"Ask user if she wants to migrate the init file(s) to new location."
(if (and (not load-home-init-file)
- ;; must be replaced
(not (find-user-init-directory-init-file user-init-directory))
- (with-output-to-temp-buffer (help-buffer-name nil)
- (progn
- (princ "XEmacs recommends that the initialization code in
+ (file-exists-p user-init-file))
+ (if (with-output-to-temp-buffer (help-buffer-name nil)
+ (progn
+ (princ "XEmacs recommends that the initialization code in
")
- (princ user-init-file)
- (princ "
+ (princ user-init-file)
+ (princ "
be migrated to the ")
- (princ user-init-directory)
- (princ " directory. XEmacs can
+ (princ user-init-directory)
+ (princ " directory. XEmacs can
perform the migration automatically.
After the migration, init.el/init.elc holds user-written
@@ -705,12 +705,12 @@
If you choose not to do this now, XEmacs will not ask you this
question in the future. However, you can still make XEmacs
perform the migration at any time with M-x migrate-user-init-file.")
- (show-temp-buffer-in-current-frame standard-output)
- (y-or-n-p-minibuf (concat "Migrate init file to "
+ (show-temp-buffer-in-current-frame standard-output)
+ (yes-or-no-p-minibuf (concat "Migrate init file to "
user-init-directory
- "? ")))))
- (migrate-user-init-file)
- (customize-save-variable 'load-home-init-file t)))
+ "? "))))
+ (migrate-user-init-file)
+ (customize-save-variable 'load-home-init-file t))))
(defun migrate-user-init-file ()
"Migrate the init file from the home directory."
@@ -767,8 +767,7 @@
(if (and load-user-init-file-p init-file-debug)
(progn
;; Do this without a condition-case if the user wants to debug.
- (load-user-init-file)
- (load-user-custom-file))
+ (load-user-init-file))
(condition-case error
(progn
(if load-user-init-file-p
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla