comparison lisp/ChangeLog @ 4349:9b8a5d78e07a

Merge.
author Stephen J. Turnbull <stephen@xemacs.org>
date Sat, 22 Dec 2007 02:05:07 -0800
parents 6b571dc4ba3f
children d2f4dd8611d9
comparison
equal deleted inserted replaced
4348:0831a73486ff 4349:9b8a5d78e07a
1 2007-12-18 Mike Sperber <mike@xemacs.org> 1 2007-12-18 Mike Sperber <mike@xemacs.org>
2 2
3 * autoload.el (process-one-lisp-autoload): Insert <immediate> into 3 * autoload.el (process-one-lisp-autoload): Insert <immediate> into
4 the section header for immediate autoloads, to make sure the 4 the section header for immediate autoloads, to make sure the
5 upstream doesn't think there aren't any autoloads at all. 5 upstream doesn't think there aren't any autoloads at all.
6
7 2007-12-19 Mike Sperber <mike@xemacs.org>
8
9 * startup.el (ask-about-user-init-file-migration-p): Factored out
10 check.
11 (maybe-migrate-user-init-file):
12 (migrate-user-init-file): Don't do a backup of ~/.emacs anymore.
13 Instead, make only a manual adjustment of the file, if at all,
14 i.e. don't go through customize magic anymore.
15 (unmigrate-user-init-file): Don't use customize to set
16 `load-home-init-file' anymore.
17 (set-load-home-init-file): Add; performs the modification
18 previously done through customize.
19 (unmigrate-user-init-file): Use `set-load-home-init-file' instead
20 of customize.
21 (command-line-1): Only wait for the first event if we're not going
22 to ask about migration.
6 23
7 2007-12-18 Aidan Kehoe <kehoea@parhasard.net> 24 2007-12-18 Aidan Kehoe <kehoea@parhasard.net>
8 25
9 * help.el (describe-function-1): 26 * help.el (describe-function-1):
10 Give details of bindings for commands, taking into account 27 Give details of bindings for commands, taking into account