commit: Rework init-file migration.

changeset: 4347:6b571dc4ba3fe8413c178b8f1bba807925ffddf3 tag: tip user: Mike Sperber <sperber(a)deinprogramm.de&gt; date: Fri Dec 21 16:51:30 2007 +0100 files: lisp/ChangeLog lisp/startup.el description: Rework init-file migration. 2007-12-19 Mike Sperber <mike(a)xemacs.org&gt; * startup.el (user-init-file-migration-in-order-p): Factored out check. (maybe-migrate-user-init-file): (migrate-user-init-file): Don't do a backup of ~/.emacs anymore. Instead, make only a manual adjustment of the file, if at all, i.e. don't go through customize magic anymore. (unmigrate-user-init-file): Don't use customize to set `load-home-init-file' anymore. (set-load-home-init-file): Add; performs the modification previously done through customize. (unmigrate-user-init-file): Use `set-load-home-init-file' instead of customize. (command-line-1): Only wait for the first event if we're not going to ask about migration. diff -r ec1103d2c1c7f17396af875d6831bb049c8c0356 -r 6b571dc4ba3fe8413c178b8f1bba807925ffddf3 lisp/ChangeLog --- a/lisp/ChangeLog Fri Dec 21 03:39:10 2007 -0800 +++ b/lisp/ChangeLog Fri Dec 21 16:51:30 2007 +0100 ＠＠ -3,6 +3,23 ＠＠ 2007-12-18 Mike Sperber <mike(a)xemacs.o * autoload.el (process-one-lisp-autoload): Insert <immediate> into the section header for immediate autoloads, to make sure the upstream doesn't think there aren't any autoloads at all. + +2007-12-19 Mike Sperber <mike(a)xemacs.org&gt; + + * startup.el (ask-about-user-init-file-migration-p): Factored out + check. + (maybe-migrate-user-init-file): + (migrate-user-init-file): Don't do a backup of ~/.emacs anymore. + Instead, make only a manual adjustment of the file, if at all, + i.e. don't go through customize magic anymore. + (unmigrate-user-init-file): Don't use customize to set + `load-home-init-file' anymore. + (set-load-home-init-file): Add; performs the modification + previously done through customize. + (unmigrate-user-init-file): Use `set-load-home-init-file' instead + of customize. + (command-line-1): Only wait for the first event if we're not going + to ask about migration. 2007-12-18 Aidan Kehoe <kehoea(a)parhasard.net&gt; diff -r ec1103d2c1c7f17396af875d6831bb049c8c0356 -r 6b571dc4ba3fe8413c178b8f1bba807925ffddf3 lisp/startup.el --- a/lisp/startup.el Fri Dec 21 03:39:10 2007 -0800 +++ b/lisp/startup.el Fri Dec 21 16:51:30 2007 +0100 ＠＠ -849,12 +849,16 ＠＠ the menubar)." (or (find-user-init-directory-init-file init-directory) (find-user-home-directory-init-file home-directory)))) +(defun ask-about-user-init-file-migration-p () + "Check whether we want to ask the user if she wants to migrate the init file." + (and (not load-home-init-file) + (not (find-user-init-directory-init-file user-init-directory)) + (stringp user-init-file) + (file-readable-p user-init-file))) + (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) - (not (find-user-init-directory-init-file user-init-directory)) - (stringp user-init-file) - (file-readable-p user-init-file)) + (if (ask-about-user-init-file-migration-p) (if (with-output-to-temp-buffer (help-buffer-name nil) (progn (princ "XEmacs recommends that the initialization code in ＠＠ -881,7 +885,8 ＠＠ perform the migration at any time with M user-init-directory "? ")))) - (let ((backup (migrate-user-init-file))) + (progn + (migrate-user-init-file) (with-output-to-temp-buffer (help-buffer-name nil) (progn (princ "The initialization code has now been migrated to the ") ＠＠ -890,46 +895,63 ＠＠ perform the migration at any time with M For backwards compatibility with, for example, older versions of XEmacs, XEmacs can create a special old-style .emacs file in your home -directory which will load the relocated initialization code.") - (if backup - (progn - (princ "\nMoreover, a backup of your old .emacs file was created as\n") - (princ backup) - (princ ".\n"))) +directory which will load the relocated initialization code. + +NOTE THAT THIS WILL OVERWRITE YOUR EXISTING .emacs FILE!") (show-temp-buffer-in-current-frame standard-output) (maybe-create-compatibility-dot-emacs)))) - (customize-save-variable 'load-home-init-file t)))) + (set-load-home-init-file user-init-file t)))) (defun maybe-create-compatibility-dot-emacs () "Ask user if she wants to create a .emacs compatibility file." - (if (yes-or-no-p-minibuf "Create compatibility .emacs? ") + (if (yes-or-no-p-minibuf "Create compatibility .emacs?") (create-compatibility-dot-emacs))) (defun migrate-user-init-file () - "Migrate the init file from the home directory. -Return the name of backup file, if one was created." + "Migrate the init file from the home directory." (interactive) (if (not (file-exists-p user-init-directory)) (progn (message "Creating %s directory..." user-init-directory) (make-directory user-init-directory))) (message "Migrating custom file...") - (let* ((backup (concat user-init-file ".backup")) - (backup-p - (and (not (file-exists-p backup)) - (progn - (copy-file user-init-file backup) - t)))) - (customize-set-value 'load-home-init-file nil) - (custom-migrate-custom-file (make-custom-file-name user-init-file - 'force-new)) - (message "Moving init file...") - (let ((new-user-init-file (expand-file-name user-init-file-base - user-init-directory))) - (rename-file user-init-file new-user-init-file) - (setq user-init-file new-user-init-file)) - (message "Migration done.") - (and backup-p backup))) + (set-load-home-init-file user-init-file nil) + (setq custom-file (make-custom-file-name user-init-file 'force-new)) + (custom-save-all) + (message "Copying init file...") + (let ((new-user-init-file (expand-file-name user-init-file-base + user-init-directory))) + (copy-file user-init-file new-user-init-file) + (setq user-init-file new-user-init-file)) + (message "Migration done.")) + +(defun set-load-home-init-file (filename val) + "Put code in `filename' to set `load-home-init-file' to `val'. +More precisely, remove the first `setq' form for `load-home-init-file', +and replace it by (setq load-home-init-file t) if `val' is non-nil." + (save-excursion + (set-buffer (find-file-noselect filename)) + (goto-char (point-min)) + (condition-case nil + (block find-existing + (while (not (eobp)) + (forward-sexp 1) + (backward-sexp 1) + (let* ((beginning (point)) + (sexp (read (current-buffer)))) + (if (and (consp sexp) + (consp (cdr sexp)) + (eq 'setq (car sexp)) + (eq 'load-home-init-file (cadr sexp))) + (progn + (forward-line 1) + (delete-region beginning (point)) + (return-from find-existing nil)) + (forward-sexp 1))))) + (error nil)) ; ignore if there are no sexprs in the file + (if val + (insert "(setq load-home-init-file t) ; don't load init file from ~/.xemacs/init.el\n")) + (save-buffer))) (defun create-compatibility-dot-emacs () "Create .emacs compatibility file for migrated setup." ＠＠ -965,8 +987,9 ＠＠ Return the name of backup file, if one w (rename-file user-init-file target-file-name 'ok-if-already-exists) (setq user-init-file target-file-name) (let ((old-custom-file custom-file)) - (custom-migrate-custom-file target-file-name) - (customize-save-variable 'load-home-init-file t) + (setq custom-file target-file-name) + (custom-save-all) + (set-load-home-init-file user-init-file t) (delete-file old-custom-file)))) (defun load-user-init-file () ＠＠ -1089,7 +1112,8 ＠＠ a new format, when variables have change ;; Don't clobber a non-scratch buffer if init file ;; has selected it. - (when (string= (buffer-name) "*scratch*") + (when (and (string= (buffer-name) "*scratch*") + (not (ask-about-user-init-file-migration-p))) (unless (or inhibit-startup-message (input-pending-p)) (let (tmout) _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches