Re: Diary

[Tassilo Horn <tassilo@member.fsf.org>]

Sean Sieger <sean.sieger@gmail.com> writes:

>    The shell utility `calendar' is not in modern GNU/Linux.
>
> sean@6dfpj71:~$ which calendar
> /usr/bin/calendar
>
> or do I not get what you are saying?

Not all modern distributions install the BSD calendar program by
default, so a sentence like "the file format is essentially the same as
that used by the external utility `calendar'" may mislead users.  But
since all the syntax is explained in the emacs manual, too, I don't see
a problem with that.

Maybe it would be a good idea to move that sentence after the example.

--8<---------------cut here---------------start------------->8---
Index: doc/emacs/calendar.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/emacs/calendar.texi,v
retrieving revision 1.3
diff -u -r1.3 calendar.texi
--- doc/emacs/calendar.texi	16 Sep 2007 02:29:50 -0000	1.3
+++ doc/emacs/calendar.texi	15 Oct 2007 18:04:47 -0000
@@ -990,8 +990,7 @@
 
   The name of the diary file is specified by the variable
 @code{diary-file}; @file{~/diary} is the default.  A sample diary file
-is (note that the file format is essentially the same as that used by
-the external shell utility @samp{calendar}):
+is:
 
 @example
 12/22/1988  Twentieth wedding anniversary!!
@@ -1011,6 +1010,10 @@
 This example uses extra spaces to align the event descriptions of most
 of the entries.  Such formatting is purely a matter of taste.
 
+  The file format is essentially the same as that used by the external
+shell utility @samp{calendar}.  If you've used that before, you'll feel
+right at home.
+
   Although you probably will start by creating a diary manually, Emacs
 provides a number of commands to let you view, add, and change diary
 entries.
Index: doc/emacs/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/doc/emacs/ChangeLog,v
retrieving revision 1.18
diff -u -r1.18 ChangeLog
--- doc/emacs/ChangeLog	15 Oct 2007 02:07:51 -0000	1.18
+++ doc/emacs/ChangeLog	15 Oct 2007 18:04:50 -0000
@@ -1,3 +1,8 @@
+2007-10-15  Tassilo Horn  <tassilo@member.fsf.org>
+
+	* calendar.texi (Diary): Move hint to external calendar program behind
+	the example.
+
 2007-10-13  Eric S. Raymond  <esr@snark.thyrsus.com>
 
 	* files.texi: Capitalize node names according to convention.
--8<---------------cut here---------------end--------------->8---

If someone with write access thinks it's a good idea, feel free to
install the patch.

Bye,
Tassilo