diff options
| author | Glenn Morris <rgm@gnu.org> | 2015-06-15 20:46:01 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2015-06-15 20:46:01 -0400 |
| commit | 6ebbc2f69825e9fdc5a5658047469ad541cf3dce (patch) | |
| tree | 2b5c9c2626ad597ce8c8904f3026cfd4904ea976 /lisp/calendar | |
| parent | c57b0e4b243a7a4a92549e833c7266b0be39f906 (diff) | |
| download | emacs-6ebbc2f69825e9fdc5a5658047469ad541cf3dce.tar.gz | |
* lisp/calendar/calendar.el (diary-file): Use locate-user-emacs-file.
* doc/emacs/calendar.texi (Diary, Format of Diary File):
Update for above diary-file change.
: * etc/NEWS: Mention this.
Diffstat (limited to 'lisp/calendar')
| -rw-r--r-- | lisp/calendar/calendar.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 233d2cfcd22..fd2580e385e 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -566,7 +566,7 @@ See also `calendar-intermonth-header'." 'font-lock-face 'font-lock-function-name-face))) :version "23.1") -(defcustom diary-file "~/diary" +(defcustom diary-file (locate-user-emacs-file "diary" "diary") "Name of the file in which one's personal diary of dates is kept. The file's entries are lines beginning with any of the forms @@ -653,6 +653,7 @@ documentation of these hooks for details. Diary files can contain directives to include the contents of other files; for details, see the documentation for the variable `diary-list-entries-hook'." + :version "25.1" ; ~/diary -> locate-user-emacs-file :type 'file :group 'diary) |