Mercurial > hg > xemacs-beta
changeset 2305:69a0933b86f1
[xemacs-hg @ 2004-09-23 05:44:35 by stephent]
Fix Malcolm's address <877jql7dou.fsf_-_@tleepslib.sk.tsukuba.ac.jp>
| author | stephent |
|---|---|
| date | Thu, 23 Sep 2004 05:44:37 +0000 |
| parents | 7fc13d0eacd5 |
| children | 2194e7262cf3 |
| files | lisp/ChangeLog lisp/startup.el |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Sep 23 05:35:07 2004 +0000 +++ b/lisp/ChangeLog Thu Sep 23 05:44:37 2004 +0000 @@ -1,3 +1,9 @@ +2004-09-22 Stephen J. Turnbull <stephen@xemacs.org> + + * startup.el (load-init-file): + (load-user-init-file): + Remove bogus comments. + 2004-09-23 Stephen J. Turnbull <stephen@xemacs.org> * about.el (xemacs-hackers): Fix Malcolm's address.
--- a/lisp/startup.el Thu Sep 23 05:35:07 2004 +0000 +++ b/lisp/startup.el Thu Sep 23 05:44:37 2004 +0000 @@ -898,8 +898,6 @@ (find-user-init-file user-init-directory))) (if (not custom-file) (setq custom-file (make-custom-file-name user-init-file))) - ;; #### should test load-user-init-file-p here, not in load-init-file - ;; see comment there (if (and user-init-file (file-readable-p user-init-file)) (load user-init-file t t t)) @@ -937,8 +935,6 @@ (debug-on-error-initial (if (eq init-file-debug t) 'startup init-file-debug))) (let ((debug-on-error debug-on-error-initial)) - ;; #### I believe this test is incorrect, it leads to custom-file - ;; (at least) being undefined (if (and load-user-init-file-p init-file-debug) (progn ;; Do this without a condition-case if the user wants to debug.