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/abbrev.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/abbrev.el')
| -rw-r--r-- | lisp/abbrev.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/abbrev.el b/lisp/abbrev.el index 4a2c57ddd60..6441381d171 100644 --- a/lisp/abbrev.el +++ b/lisp/abbrev.el @@ -27,7 +27,6 @@ ;; Todo: -;; - Make abbrev-file-name obey user-emacs-directory. ;; - Cleanup name space. ;;; Code: @@ -39,6 +38,11 @@ :link '(custom-manual "(emacs)Abbrevs") :group 'abbrev) +(defcustom abbrev-file-name + (locate-user-emacs-file "abbrev_defs" ".abbrev_defs") + "Default name of file to read abbrevs from." + :type 'file) + (defcustom only-global-abbrevs nil "Non-nil means user plans to use global abbrevs only. This makes the commands that normally define mode-specific abbrevs |