diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-08-29 19:22:38 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-08-29 19:22:38 +0000 |
| commit | 2aa0e5bf920dee0e2bc7b07c11adaa45636c40f2 (patch) | |
| tree | c60fe2cf701387ed22a675286cfc1cc3f082bbf2 /lisp/calc/calc.el | |
| parent | db167d28c634931c7cc72640edb23b141050fd33 (diff) | |
| download | emacs-2aa0e5bf920dee0e2bc7b07c11adaa45636c40f2.tar.gz emacs-2aa0e5bf920dee0e2bc7b07c11adaa45636c40f2.tar.bz2 emacs-2aa0e5bf920dee0e2bc7b07c11adaa45636c40f2.zip | |
* paths.el (abbrev-file-name): Move to abbrev.el.
* abbrev.el (abbrev-file-name): Move from paths.el.
Obey user-emacs-directory.
* calc/calc.el (calc-settings-file): Don't autoload and instead obey
user-emacs-directory.
* dos-fns.el (dos-reevaluate-defcustoms): Don't reevaluate
abbrev-file-name and calc-settings-file any more.
* startup.el (command-line): Recompute abbrev-file-name and
abbreviated-home-dir.
(normal-no-mouse-startup-screen): Improve the generic code and get rid
of the special code for when C-h bindings haven't been changed.
(display-startup-echo-area-message): Use with-current-buffer.
(command-line-1): Use a list of strings, rather than a list of lists
of strings for longopts.
Diffstat (limited to 'lisp/calc/calc.el')
| -rw-r--r-- | lisp/calc/calc.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index 8e6af0db7e1..790647d62ca 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el @@ -227,9 +227,10 @@ :tag "Calc" :group 'applications) -;;;###autoload +;; Do not autoload, so it is evaluated at run-time rather than at dump time. +;; ;;;###autoload (defcustom calc-settings-file - (convert-standard-filename "~/.calc.el") + (locate-user-emacs-file "calc.el" ".calc.el") "File in which to record permanent settings." :group 'calc :type '(file)) |