date.
The name of the diary file is specified by the variable
-@code{diary-file}; @file{~/diary} is the default. Here's an example
-showing what that file looks like:
+@code{diary-file}. The default is @file{~/.emacs.d/diary}, though for
+compatibility with older versions Emacs will use @file{~/diary} if it
+exists. Here's an example showing what the file looks like:
@example
12/22/2012 Twentieth wedding anniversary!!
@vindex diary-file
Your @dfn{diary file} is a file that records events associated with
particular dates. The name of the diary file is specified by the
-variable @code{diary-file}; @file{~/diary} is the default. The
-@code{calendar} utility program supports a subset of the format allowed
-by the Emacs diary facilities, so you can use that utility to view the
-diary file, with reasonable results aside from the entries it cannot
-understand.
+variable @code{diary-file}. The @code{calendar} utility program
+supports a subset of the format allowed by the Emacs diary facilities,
+so you can use that utility to view the diary file, with reasonable
+results aside from the entries it cannot understand.
Each entry in the diary file describes one event and consists of one
or more lines. An entry always begins with a date specification at the
** Calendar and diary
++++
+*** The default `diary-file' is now located in .emacs.d.
+
+++
*** New commands to insert diary entries with Chinese dates:
`diary-chinese-insert-anniversary-entry' `diary-chinese-insert-entry'
'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
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)