diff options
| author | Kenichi Handa <handa@etlken> | 2010-04-22 13:07:11 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@etlken> | 2010-04-22 13:07:11 +0900 |
| commit | 8404c468113fb4189fe7d884959172987d650b78 (patch) | |
| tree | fd35e50cc730d82dc565834b7fe0801543c9b87a | |
| parent | ece33a6ecbfdad78c9ed21956efd68afd8e0bde0 (diff) | |
| parent | 6776e4c4b4cb55ef865601cb7ce5130468f460d9 (diff) | |
| download | emacs-8404c468113fb4189fe7d884959172987d650b78.tar.gz | |
merge trunk
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/calendar.texi | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 13fb0dc1e15..27955948e43 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2010-04-21 Glenn Morris <rgm@gnu.org> + + * calendar.texi (Displaying the Diary, Format of Diary File): + Fix external cross-references for TeX format output. + 2010-04-18 Chong Yidong <cyd@stupidchicken.com> * programs.texi (Semantic): New node. diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi index b2a356cb2cf..ae4333cefbb 100644 --- a/doc/emacs/calendar.texi +++ b/doc/emacs/calendar.texi @@ -1082,7 +1082,7 @@ of the new window shows the date of the diary entries. Holidays are shown either in the buffer or in the mode line, depending on the display method you choose @iftex -(@pxref{Diary Display,, emacs-xtra}). +(@pxref{Diary Display,,, emacs-xtra, Specialized Emacs Features}). @end iftex @ifnottex (@pxref{Diary Display}). @@ -1186,7 +1186,7 @@ punctuation). For example: This entry will have a different appearance if you use the simple diary display @iftex -(@pxref{Diary Display,, emacs-xtra}). +(@pxref{Diary Display,,, emacs-xtra, Specialized Emacs Features}). @end iftex @ifnottex (@pxref{Diary Display}). |