Now on revision 107313. ------------------------------------------------------------ revno: 107313 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-02-16 23:44:31 -0800 message: Fix cross-references between different manuals * emacs/maintaining.texi (Old Revisions): Fix cross-refs to Ediff manual. * lispintro/emacs-lisp-intro.texi (Design @value{COUNT-WORDS}, Syntax) (count-words-in-defun): Fix cross-refs to Emacs manual. * lispref/hooks.texi (Standard Hooks): Fix cross-ref to Emacs manual. * misc/gnus.texi (Posting Styles): * misc/remember.texi (Org): Fix cross-refs to other manuals. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-02-17 04:43:39 +0000 +++ doc/emacs/ChangeLog 2012-02-17 07:44:31 +0000 @@ -1,5 +1,7 @@ 2012-02-17 Glenn Morris + * maintaining.texi (Old Revisions): Fix cross-refs to Ediff manual. + * ack.texi (Acknowledgments): Mention Gnulib. * ack.texi, calendar.texi, cal-xtra.texi: Use "Bahá'í". === modified file 'doc/emacs/maintaining.texi' --- doc/emacs/maintaining.texi 2012-02-05 03:30:42 +0000 +++ doc/emacs/maintaining.texi 2012-02-17 07:44:31 +0000 @@ -725,7 +725,7 @@ @ifnottex @item M-x vc-ediff -Like @kbd{C-x v =}, but using Ediff. @xref{Top, Ediff, ediff, The +Like @kbd{C-x v =}, but using Ediff. @xref{Top,, Ediff, ediff, The Ediff Manual}. @end ifnottex @@ -777,7 +777,7 @@ @ifnottex @findex vc-ediff @kbd{M-x vc-ediff} works like @kbd{C-x v =}, except that it uses an -Ediff session. @xref{Top, Ediff, ediff, The Ediff Manual}. +Ediff session. @xref{Top,, Ediff, ediff, The Ediff Manual}. @end ifnottex @findex vc-root-diff === modified file 'doc/lispintro/ChangeLog' --- doc/lispintro/ChangeLog 2012-02-09 07:48:22 +0000 +++ doc/lispintro/ChangeLog 2012-02-17 07:44:31 +0000 @@ -1,3 +1,8 @@ +2012-02-17 Glenn Morris + + * emacs-lisp-intro.texi (Design @value{COUNT-WORDS}, Syntax) + (count-words-in-defun): Fix cross-refs to Emacs manual. + 2012-01-28 Andreas Schwab * emacs-lisp-intro.texi (Top): Move setting of COUNT-WORDS outside === modified file 'doc/lispintro/emacs-lisp-intro.texi' --- doc/lispintro/emacs-lisp-intro.texi 2012-01-28 19:16:02 +0000 +++ doc/lispintro/emacs-lisp-intro.texi 2012-02-17 07:44:31 +0000 @@ -13972,10 +13972,9 @@ @noindent The buffer's syntax table determines which characters are and are not -word constituents. (@xref{Syntax, , What Constitutes a Word or -Symbol?}, for more about syntax. Also, see @ref{Syntax, Syntax, The -Syntax Table, emacs, The GNU Emacs Manual}, and @ref{Syntax Tables, , -Syntax Tables, elisp, The GNU Emacs Lisp Reference Manual}.) +word constituents. For more information about syntax, +@pxref{Syntax Tables, , Syntax Tables, elisp, The GNU Emacs Lisp +Reference Manual}. @need 800 The search expression looks like this: @@ -14836,8 +14835,7 @@ one syntax category. Other syntax categories include the class of punctuation characters, such as the period and the comma, and the class of whitespace characters, such as the blank space and the tab -character. (For more information, see @ref{Syntax, Syntax, The Syntax -Table, emacs, The GNU Emacs Manual}, and @ref{Syntax Tables, , Syntax +character. (For more information, @pxref{Syntax Tables, , Syntax Tables, elisp, The GNU Emacs Lisp Reference Manual}.) Syntax tables specify which characters belong to which categories. @@ -15007,7 +15005,7 @@ jumps. The true-or-false-test for the @code{while} loop should test true so long as point should jump forward, and false when point is at the end of the definition. We have already redefined the regular -expression for this (@pxref{Syntax}), so the loop is straightforward: +expression for this, so the loop is straightforward: @smallexample @group === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2012-02-16 14:43:41 +0000 +++ doc/lispref/ChangeLog 2012-02-17 07:44:31 +0000 @@ -1,3 +1,7 @@ +2012-02-17 Glenn Morris + + * hooks.texi (Standard Hooks): Fix cross-ref to Emacs manual. + 2012-02-16 Chong Yidong * syntax.texi (Syntax Tables, Syntax Descriptors) === modified file 'doc/lispref/hooks.texi' --- doc/lispref/hooks.texi 2012-02-02 04:37:05 +0000 +++ doc/lispref/hooks.texi 2012-02-17 07:44:31 +0000 @@ -275,8 +275,7 @@ @item lisp-indent-function @item mail-setup-hook -@xref{Mail Mode Misc,, Mail Mode Miscellany, emacs, the GNU Emacs -Manual}. +@xref{Mail Misc,, Mail Miscellany, emacs, the GNU Emacs Manual}. @item menu-bar-update-hook @xref{Menu Bar}. === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2012-02-15 03:15:26 +0000 +++ doc/misc/ChangeLog 2012-02-17 07:44:31 +0000 @@ -1,3 +1,8 @@ +2012-02-17 Glenn Morris + + * gnus.texi (Posting Styles): + * remember.texi (Org): Fix cross-refs to other manuals. + 2012-02-15 Glenn Morris * smtpmail.texi (Emacs Speaks SMTP): General update for 24.1. === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2012-02-13 14:14:18 +0000 +++ doc/misc/gnus.texi 2012-02-17 07:44:31 +0000 @@ -12763,8 +12763,8 @@ In the case of a string value, if the @code{match} is a regular expression, a @samp{gnus-match-substitute-replacement} is proceed on the value to replace the positional parameters @samp{\@var{n}} by the -corresponding parenthetical matches (see @xref{Replacing the Text that -Matched, , Text Replacement, elisp, The Emacs Lisp Reference Manual}.) +corresponding parenthetical matches (see @xref{Replacing Match,, +Replacing the Text that Matched, elisp, The Emacs Lisp Reference Manual}.) @vindex message-reply-headers === modified file 'doc/misc/remember.texi' --- doc/misc/remember.texi 2012-01-19 07:21:25 +0000 +++ doc/misc/remember.texi 2012-02-17 07:44:31 +0000 @@ -389,8 +389,15 @@ @section Saving to an Org Mode file @cindex org mode, integration +@ignore +From org.texi: +Up to version 6.36 Org used a special setup +for @file{remember.el}. @file{org-remember.el} is still part of Org mode for +backward compatibility with existing setups. You can find the documentation +for org-remember at @url{http://orgmode.org/org-remember.pdf}. +@end ignore For instructions on how to integrate Remember with Org Mode, -consult @ref{Remember, , , org}. +consult @ref{Capture, , , org}. @node GNU Free Documentation License, Concept Index, Backends, Top @appendix GNU Free Documentation License ------------------------------------------------------------ revno: 107312 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Fri 2012-02-17 16:35:28 +0900 message: Make the default values of character properties name, old-name, and iso-10646-comment to nil. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2012-02-11 22:16:10 +0000 +++ admin/ChangeLog 2012-02-16 13:55:03 +0000 @@ -1,3 +1,9 @@ +2012-02-16 Kenichi Handa + + * unidata/unidata-gen.el (unidata-prop-alist): Change the default + values of name and old-name to nil. + (unidata-get-name): Return nil for the default value. + 2012-02-11 Glenn Morris * admin.el (cusver-find-files, cusver-scan, cusver-goto-xref) === modified file 'admin/unidata/unidata-gen.el' --- admin/unidata/unidata-gen.el 2011-11-19 09:18:31 +0000 +++ admin/unidata/unidata-gen.el 2012-02-16 13:55:03 +0000 @@ -166,9 +166,10 @@ '((name 1 unidata-gen-table-name "uni-name.el" "Unicode character name. -Property value is a string." +Property value is a string or nil. +The value nil stands for the default value \"null string\")." nil - "") + nil) (general-category 2 unidata-gen-table-symbol "uni-category.el" "Unicode general category. @@ -235,7 +236,8 @@ (old-name 10 unidata-gen-table-name "uni-old-name.el" "Unicode old names as published in Unicode 1.0. -Property value is a string.") +Property value is a string or nil. +The value nil stands for the default value \"null string\").") (iso-10646-comment 11 unidata-gen-table-name "uni-comment.el" "Unicode ISO 10646 comment. @@ -712,7 +714,7 @@ (aset table c name) (if (= c char) (setq val name)))) - (or val "")))) + val))) ((and (integerp val) (> val 0)) (let* ((symbol-table (aref (char-table-extra-slot table 4) 1)) @@ -738,9 +740,7 @@ ((eq sym 'CJK\ COMPATIBILITY\ IDEOGRAPH) (format "%s-%04X" sym char)) ((eq sym 'VARIATION\ SELECTOR) - (format "%s-%d" sym (+ (- char #xe0100) 17)))))) - - (t ""))) + (format "%s-%d" sym (+ (- char #xe0100) 17)))))))) ;; Store VAL as the name of CHAR in TABLE. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-16 08:21:30 +0000 +++ lisp/ChangeLog 2012-02-17 07:33:15 +0000 @@ -1,3 +1,10 @@ +2012-02-17 Kenichi Handa + + * international/charprop.el: + * international/uni-name.el: + * international/uni-old-name.el: + * international/uni-comment.el: Regenerate. + 2012-02-16 Glenn Morris * calendar/cal-hebrew.el (calendar-hebrew-list-yahrzeits): === modified file 'lisp/international/charprop.el' --- lisp/international/charprop.el 2011-08-23 11:48:07 +0000 +++ lisp/international/charprop.el 2012-02-16 13:55:03 +0000 @@ -2,7 +2,8 @@ ;; FILE: uni-name.el (define-char-code-property 'name "uni-name.el" "Unicode character name. -Property value is a string.") +Property value is a string or nil. +The value nil stands for the default value \"null string\").") ;; FILE: uni-category.el (define-char-code-property 'general-category "uni-category.el" "Unicode general category. @@ -48,7 +49,8 @@ ;; FILE: uni-old-name.el (define-char-code-property 'old-name "uni-old-name.el" "Unicode old names as published in Unicode 1.0. -Property value is a string.") +Property value is a string or nil. +The value nil stands for the default value \"null string\").") ;; FILE: uni-comment.el (define-char-code-property 'iso-10646-comment "uni-comment.el" "Unicode ISO 10646 comment. === modified file 'lisp/international/uni-comment.el' Binary files lisp/international/uni-comment.el 2011-08-23 11:48:07 +0000 and lisp/international/uni-comment.el 2012-02-16 13:55:03 +0000 differ === modified file 'lisp/international/uni-name.el' Binary files lisp/international/uni-name.el 2011-08-23 11:48:07 +0000 and lisp/international/uni-name.el 2012-02-16 13:55:03 +0000 differ === modified file 'lisp/international/uni-old-name.el' Binary files lisp/international/uni-old-name.el 2011-08-23 11:48:07 +0000 and lisp/international/uni-old-name.el 2012-02-16 13:55:03 +0000 differ ------------------------------------------------------------ revno: 107311 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-02-16 20:54:56 -0800 message: Adjust info-xref-check-all instructions in FOR-RELEASE diff: === modified file 'admin/FOR-RELEASE' --- admin/FOR-RELEASE 2012-02-17 04:28:53 +0000 +++ admin/FOR-RELEASE 2012-02-17 04:54:56 +0000 @@ -7,7 +7,7 @@ are correct. You can use something like the following in the info directory in the Emacs build tree: -emacs -Q --eval "(setq Info-default-directory-list '(\".\"))" \ +emacs -Q --eval "(progn (require 'info) (setq Info-directory-list '(\".\")))" \ -f info-xref-check-all make emacs.dvi, elisp.dvi, and deal with any errors (undefined ------------------------------------------------------------ revno: 107310 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-02-16 20:43:39 -0800 message: * doc/emacs/ack.texi (Acknowledgments): Mention Gnulib. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-02-17 04:37:58 +0000 +++ doc/emacs/ChangeLog 2012-02-17 04:43:39 +0000 @@ -1,5 +1,7 @@ 2012-02-17 Glenn Morris + * ack.texi (Acknowledgments): Mention Gnulib. + * ack.texi, calendar.texi, cal-xtra.texi: Use "Bahá'í". * calendar.texi: Misc small changes, including updating the dates === modified file 'doc/emacs/ack.texi' --- doc/emacs/ack.texi 2012-02-17 04:37:58 +0000 +++ doc/emacs/ack.texi 2012-02-17 04:43:39 +0000 @@ -287,6 +287,11 @@ Rolf Ebert co-wrote Ada mode. @item +Paul Eggert integrated the Gnulib portability library, and made many +other portability fixes to the C code; as well as his contributions +to VC and the calendar. + +@item Stephen Eglen wrote @file{mspools.el}, which tells you which Procmail folders have mail waiting in them; and @file{iswitchb.el}, a feature for incremental reading and completion of buffer names. ------------------------------------------------------------ revno: 107309 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-02-16 20:37:58 -0800 message: * ack.texi, calendar.texi, cal-xtra.texi: Use "Bahá'í". diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-02-17 04:28:53 +0000 +++ doc/emacs/ChangeLog 2012-02-17 04:37:58 +0000 @@ -1,5 +1,7 @@ 2012-02-17 Glenn Morris + * ack.texi, calendar.texi, cal-xtra.texi: Use "Bahá'í". + * calendar.texi: Misc small changes, including updating the dates of examples. === modified file 'doc/emacs/ack.texi' --- doc/emacs/ack.texi 2012-02-15 05:15:43 +0000 +++ doc/emacs/ack.texi 2012-02-17 04:37:58 +0000 @@ -1330,7 +1330,7 @@ John Wiegley wrote @file{align.el}, a set of commands for aligning text according to regular-expression based rules; @file{isearchb.el} for fast buffer switching; @file{timeclock.el}, a package for keeping track of -time spent on projects; the Baha'i calendar support; +time spent on projects; the Bahá'í calendar support; @file{pcomplete.el}, a programmable completion facility; @file{remember.el}, a mode for jotting down things to remember; @file{eudcb-mab.el}, an address book backend for the Emacs Unified === modified file 'doc/emacs/cal-xtra.texi' --- doc/emacs/cal-xtra.texi 2012-02-16 07:22:57 +0000 +++ doc/emacs/cal-xtra.texi 2012-02-17 04:37:58 +0000 @@ -1,5 +1,5 @@ -@c This is part of the Emacs manual. -@c Copyright (C) 2004-2012 Free Software Foundation, Inc. +@c This is part of the Emacs manual. -*- coding: iso-latin-1 -*- +@c Copyright (C) 2004-2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the @@ -95,7 +95,7 @@ general holidays (@code{holiday-general-holidays}), local holidays (@code{holiday-local-holidays}), sun- and moon-related holidays (@code{holiday-solar-holidays}), -Baha'i holidays (@code{holiday-bahai-holidays}), +Bahá'í holidays (@code{holiday-bahai-holidays}), Christian holidays (@code{holiday-christian-holidays}), Hebrew (Jewish) holidays (@code{holiday-hebrew-holidays}), Islamic (Muslim) holidays (@code{holiday-islamic-holidays}), @@ -202,7 +202,7 @@ @minus{}1 the last occurrence, @minus{}2 the second-to-last occurrence, and so on). - You can specify holidays that occur on fixed days of the Baha'i, + You can specify holidays that occur on fixed days of the Bahá'í, Chinese, Hebrew, Islamic, and Julian calendars too. For example, @smallexample @@ -419,7 +419,7 @@ @subsection Diary Entries Using non-Gregorian Calendars As well as entries based on the standard Gregorian calendar, your -diary can have entries based on Baha'i, Hebrew, or Islamic dates. +diary can have entries based on Bahá'í, Hebrew, or Islamic dates. Recognition of such entries can be time-consuming, however, and since most people don't use them, you must explicitly enable their use. If you want the diary to recognize Hebrew-date diary entries, for example, @@ -439,7 +439,7 @@ @end smallexample @noindent -Similarly, for Islamic and Baha'i entries, add +Similarly, for Islamic and Bahá'í entries, add @code{diary-islamic-list-entries} and @code{diary-islamic-mark-entries}, or @code{diary-bahai-list-entries} and @code{diary-bahai-mark-entries}. @@ -448,7 +448,7 @@ @vindex diary-islamic-entry-symbol These diary entries have the same formats as Gregorian-date diary entries; except that @code{diary-bahai-entry-symbol} (default @samp{B}) -must precede a Baha'i date, @code{diary-hebrew-entry-symbol} (default +must precede a Bahá'í date, @code{diary-hebrew-entry-symbol} (default @samp{H}) a Hebrew date, and @code{diary-islamic-entry-symbol} (default @samp{I}) an Islamic date. Moreover, non-Gregorian month names may not be abbreviated (because the first three letters are often not unique). @@ -475,7 +475,7 @@ Here is a table of commands used in the calendar to create diary entries that match the selected date and other dates that are similar in -the Baha'i, Hebrew, or Islamic calendars: +the Bahá'í, Hebrew, or Islamic calendars: @table @kbd @item i h d @@ -850,7 +850,7 @@ @item %%(diary-astro-day-number) Make a diary entry with today's equivalent astronomical (Julian) day number. @item %%(diary-bahai-date) -Make a diary entry with today's equivalent Baha'i calendar date. +Make a diary entry with today's equivalent Bahá'í calendar date. @item %%(diary-chinese-date) Make a diary entry with today's equivalent Chinese calendar date. @item %%(diary-coptic-date) === modified file 'doc/emacs/calendar.texi' --- doc/emacs/calendar.texi 2012-02-17 04:28:53 +0000 +++ doc/emacs/calendar.texi 2012-02-17 04:37:58 +0000 @@ -1,4 +1,4 @@ -@c This is part of the Emacs manual. +@c This is part of the Emacs manual. -*- coding: iso-latin-1 -*- @c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @@ -517,9 +517,8 @@ holidays centered around a different month, use @kbd{C-u M-x holidays}, which prompts for the month and year. -@c FIXME can we write Baha'i properly? The holidays known to Emacs include United States holidays and the -major Baha'i, Chinese, Christian, Islamic, and Jewish holidays; also the +major Bahá'í, Chinese, Christian, Islamic, and Jewish holidays; also the solstices and equinoxes. @findex list-holidays @@ -757,8 +756,8 @@ twelve ``terrestrial branches'' for a total of sixty names that are repeated in a cycle of sixty. -@cindex Baha'i calendar - The Baha'i calendar system is based on a solar cycle of 19 months with +@cindex Bahá'í calendar + The Bahá'í calendar system is based on a solar cycle of 19 months with 19 days each. The four remaining ``intercalary'' days are placed between the 18th and 19th months. @@ -798,7 +797,7 @@ (@code{calendar-french-print-date}). @findex calendar-bahai-print-date @item p b -Display Baha'i date for selected day +Display Bahá'í date for selected day (@code{calendar-bahai-print-date}). @findex calendar-chinese-print-date @item p C @@ -866,7 +865,7 @@ Move to a date specified with an astronomical (Julian) day number (@code{calendar-astro-goto-day-number}). @item g b -Move to a date specified in the Baha'i calendar +Move to a date specified in the Bahá'í calendar (@code{calendar-bahai-goto-date}). @item g h Move to a date specified in the Hebrew calendar ------------------------------------------------------------ revno: 107308 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-02-16 20:32:04 -0800 message: Tiny NEWS changes diff: === modified file 'etc/NEWS' --- etc/NEWS 2012-02-16 14:43:41 +0000 +++ etc/NEWS 2012-02-17 04:32:04 +0000 @@ -1432,7 +1432,8 @@ +++ *** Image mode can view any image type that ImageMagick supports. This requires Emacs to be built with ImageMagick support. -Then the function `imagemagick-types' returns a list of image file +If your Emacs has ImageMagick support, then the function +`imagemagick-types' is defined, and returns a list of image file extensions that your installation of ImageMagick supports. The function `imagemagick-register-types' enables ImageMagick support for these image types, minus those listed in `imagemagick-types-inhibit'. @@ -1456,11 +1457,12 @@ *** New library `gnutls.el'. This requires Emacs to have been built with GnuTLS support. -The main functions are `open-gnutls-stream' and `gnutls-negotiate'. -It's easiest to use these functions through `open-network-stream' -because it can upgrade connections through STARTTLS opportunistically -or use plain SSL, depending on your needs. For debugging, set -`gnutls-log-level' greater than 0. +If your Emacs has GnuTLS support, the function gnutls-available-p is +defined and returns non-nil. The main functions are `open-gnutls-stream' +and `gnutls-negotiate'. It's easiest to use these functions through +`open-network-stream' because it can upgrade connections through +STARTTLS opportunistically or use plain SSL, depending on your needs. +For debugging, set `gnutls-log-level' greater than 0. ** Isearch ------------------------------------------------------------ revno: 107307 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-02-16 20:28:53 -0800 message: Check calendar.texi * doc/emacs/calendar.texi: Misc small changes, including updating the dates of examples. * admin/FOR-RELEASE: Related markup. diff: === modified file 'admin/FOR-RELEASE' --- admin/FOR-RELEASE 2012-02-16 14:43:41 +0000 +++ admin/FOR-RELEASE 2012-02-17 04:28:53 +0000 @@ -126,7 +126,7 @@ basic.texi cyd buffers.texi cyd building.texi cyd -calendar.texi +calendar.texi rgm cal-xtra.texi cmdargs.texi cyd commands.texi cyd === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-02-16 08:23:54 +0000 +++ doc/emacs/ChangeLog 2012-02-17 04:28:53 +0000 @@ -1,3 +1,8 @@ +2012-02-17 Glenn Morris + + * calendar.texi: Misc small changes, including updating the dates + of examples. + 2012-02-16 Glenn Morris * calendar.texi: Misc small changes. === modified file 'doc/emacs/calendar.texi' --- doc/emacs/calendar.texi 2012-02-16 08:23:54 +0000 +++ doc/emacs/calendar.texi 2012-02-17 04:28:53 +0000 @@ -910,6 +910,7 @@ this command first asks you for the date of death and the range of years, and then displays the list of yahrzeit dates. +@c FIXME move to emacs-xtra. @node Mayan Calendar @subsection Converting from the Mayan Calendar @@ -972,7 +973,7 @@ @findex calendar-mayan-next-haab-date @cindex Mayan haab calendar The Mayan haab calendar is a cycle of 365 days arranged as 18 months -of 20 days each, followed a 5-day monthless period. Like the tzolkin +of 20 days each, followed by a 5-day monthless period. Like the tzolkin cycle, this cycle repeats endlessly, and there are commands to move backward and forward to the previous or next point in the cycle. Type @kbd{g m p h} to go to the previous haab date; Emacs asks you for a haab @@ -1012,7 +1013,7 @@ showing what that file looks like: @example -12/22/1988 Twentieth wedding anniversary!! +12/22/2012 Twentieth wedding anniversary!! &1/1. Happy New Year! 10/22 Ruth's birthday. * 21, *: Payday @@ -1021,15 +1022,15 @@ 1/13/89 Friday the thirteenth!! &thu 4pm squash game with Lloyd. mar 16 Dad's birthday -April 15, 1989 Income tax due. +April 15, 2013 Income tax due. &* 15 time cards due. @end example @noindent -This format is essentially the same as the one used by the system's -@command{calendar} utility. This example uses extra spaces to align -the event descriptions of most of the entries. Such formatting is -purely a matter of taste. +This format is essentially the same as the one used by the separate +@command{calendar} utility that is present on some Unix systems. This +example uses extra spaces to align the event descriptions of most of +the entries. Such formatting is purely a matter of taste. Although you probably will start by creating a diary manually, Emacs provides a number of commands to let you view, add, and change diary @@ -1108,8 +1109,8 @@ @xref{Calendar Customizing, diary-entry-marker}. @end ifnottex - The command applies both to the currently visible months and to -other months that subsequently become visible by scrolling. To turn + This command applies both to the months that are currently visible +and to those that subsequently become visible after scrolling. To turn marking off and erase the current marks, type @kbd{u}, which also turns off holiday marks (@pxref{Holidays}). If the variable @code{calendar-mark-diary-entries-flag} is non-@code{nil}, creating or @@ -1133,13 +1134,13 @@ @end ifnottex If you put @code{(diary)} in your @file{.emacs} file, this -automatically displays a window with the day's diary entries, when you -enter Emacs. +automatically displays a window with the day's diary entries when you +start Emacs. @findex diary-mail-entries @vindex diary-mail-days - Many users like to receive notice of events in their diary as email. -To send such mail to yourself, use the command @kbd{M-x + Some people like to receive email notifications of events in their +diary. To send such mail to yourself, use the command @kbd{M-x diary-mail-entries}. A prefix argument specifies how many days (starting with today) to check; otherwise, the variable @code{diary-mail-days} says how many days. @@ -1170,7 +1171,7 @@ punctuation). For example: @example -02/11/1989 +02/11/2012 Bill B. visits Princeton today 2pm Cognitive Studies Committee meeting 2:30-5:30 Liz at Lawrenceville @@ -1195,10 +1196,11 @@ @vindex diary-nonmarking-symbol You can inhibit the marking of certain diary entries in the calendar -window; to do this, insert an ampersand @code{diary-nonmarking-symbol} -(default @samp{&}) at the beginning of the entry, before the date. This -has no effect on display of the entry in the diary window; it affects -only marks on dates in the calendar window. Nonmarking entries are +window; to do this, insert the string that +@code{diary-nonmarking-symbol} specifies (default @samp{&}) at the +beginning of the entry, before the date. This +has no effect on display of the entry in the diary window; it only +affects marks on dates in the calendar window. Nonmarking entries are especially useful for generic entries that would otherwise mark many different dates. @@ -1211,14 +1213,14 @@ month, year) and ISO order (year, month, day) as options. @example -4/20/93 Switch-over to new tabulation system +4/20/12 Switch-over to new tabulation system apr. 25 Start tabulating annual results 4/30 Results for April are due */25 Monthly cycle finishes Friday Don't leave without backing up files @end example - The first entry appears only once, on April 20, 1993. The second and + The first entry appears only once, on April 20, 2012. The second and third appear every year on the specified dates, and the fourth uses a wildcard (asterisk) for the month, so it appears on the 25th of every month. The final entry appears every week on Friday. @@ -1228,7 +1230,7 @@ This must be followed by a nondigit. In the date itself, @var{month} and @var{day} are numbers of one or two digits. The optional @var{year} is also a number, and may be abbreviated to the last two digits; that -is, you can use @samp{11/12/1989} or @samp{11/12/89}. +is, you can use @samp{11/12/2012} or @samp{11/12/12}. Dates can also have the form @samp{@var{monthname} @var{day}} or @samp{@var{monthname} @var{day}, @var{year}}, where the month's name can @@ -1242,7 +1244,7 @@ A date may be @dfn{generic}; that is, partially unspecified. Then the entry applies to all dates that match the specification. If the date does not contain a year, it is generic and applies to any year. -Alternatively, @var{month}, @var{day}, or @var{year} can be a @samp{*}; +Alternatively, @var{month}, @var{day}, or @var{year} can be @samp{*}; this matches any month, day, or year, respectively. Thus, a diary entry @samp{3/*/*} matches any day in March of any year; so does @samp{march *}. @@ -1308,7 +1310,7 @@ yearly diary entry with the @kbd{i y} command. All of the above commands make marking diary entries by default. To -make a nonmarking diary entry, give a numeric argument to the command. +make a nonmarking diary entry, give a prefix argument to the command. For example, @kbd{C-u i w} makes a nonmarking weekly diary entry. When you modify the diary file, be sure to save the file before @@ -1365,15 +1367,15 @@ A @dfn{block} diary entry applies to a specified range of consecutive dates. Here is a block diary entry that applies to all dates from June -24, 1990 through July 10, 1990: +24, 2012 through July 10, 2012: @findex diary-block @example -%%(diary-block 6 24 1990 7 10 1990) Vacation +%%(diary-block 6 24 2012 7 10 2012) Vacation @end example @noindent -The @samp{6 24 1990} indicates the starting date and the @samp{7 10 1990} +The @samp{6 24 2012} indicates the starting date and the @samp{7 10 2012} indicates the stopping date. (Again, if you are using the European or ISO calendar style, the input order of month, day and year is different.) @@ -1393,23 +1395,23 @@ @findex diary-cyclic @example -%%(diary-cyclic 50 3 1 1990) Renew medication +%%(diary-cyclic 50 3 1 2012) Renew medication @end example @noindent -This entry applies to March 1, 1990 and every 50th day following; -@samp{3 1 1990} specifies the starting date. (If you are using the +This entry applies to March 1, 2012 and every 50th day following; +@samp{3 1 2012} specifies the starting date. (If you are using the European or ISO calendar style, the input order of month, day and year is different.) All three of these commands make marking diary entries. To insert a -nonmarking entry, give a numeric argument to the command. For example, +nonmarking entry, give a prefix argument to the command. For example, @kbd{C-u i a} makes a nonmarking anniversary diary entry. - Marking sexp diary entries in the calendar is @emph{extremely} -time-consuming, since every date visible in the calendar window must be -individually checked. So it's a good idea to make sexp diary entries -nonmarking (with @samp{&}) when possible. + Marking sexp diary entries in the calendar can be time-consuming, +since every date visible in the calendar window must be individually +checked. So it's a good idea to make sexp diary entries nonmarking +(with @samp{&}) when possible. Another sophisticated kind of sexp entry, a @dfn{floating} diary entry, specifies a regularly occurring event by offsets specified in days, @@ -1451,8 +1453,8 @@ @vindex appt-audible @vindex appt-display-mode-line If you have a diary entry for an appointment, and that diary entry -begins with a recognizable time of day, Emacs can warn you several -minutes beforehand that that appointment is pending. Emacs alerts you +begins with a recognizable time of day, Emacs can warn you in advance +that an appointment is pending. Emacs alerts you to the appointment by displaying a message in your chosen format, as specified by the variable @code{appt-display-format}. If the value of @code{appt-audible} is non-@code{nil}, the warning includes an audible @@ -1539,6 +1541,7 @@ recognize additional appointment message formats by customizing the variable @code{diary-outlook-formats}. +@c FIXME the name of the RFC is hardly very relevant. @cindex iCalendar support The icalendar package allows you to transfer data between your Emacs diary file and iCalendar files, which are defined in ``RFC @@ -1553,7 +1556,7 @@ @findex icalendar-import-buffer The command @code{icalendar-import-buffer} extracts -iCalendar data from the current buffer and adds it to your (default) +iCalendar data from the current buffer and adds it to your diary file. This function is also suitable for automatic extraction of iCalendar data; for example with the Rmail mail client one could use: @@ -1585,7 +1588,7 @@ Use @code{icalendar-export-file} to interactively export an entire Emacs diary file to iCalendar format. To export only a part of a diary file, mark the relevant area, and call @code{icalendar-export-region}. -In both cases the result is appended to the target file. +In both cases, Emacs appends the result to the target file. @node Daylight Saving @section Daylight Saving Time @@ -1691,7 +1694,7 @@ @vindex timeclock-ask-before-exiting Terminating the current Emacs session might or might not mean that you have stopped working on the project and, by default, Emacs asks -you. You can, however, set customize the value of the variable +you. You can, however, customize the value of the variable @code{timeclock-ask-before-exiting} to @code{nil} to avoid the question; then, only an explicit @kbd{M-x timeclock-out} or @kbd{M-x timeclock-change} will tell Emacs that the current interval is over. ------------------------------------------------------------ revno: 107306 committer: Chong Yidong branch nick: trunk timestamp: Thu 2012-02-16 22:43:41 +0800 message: Update Syntax chapter of Lisp manual. * doc/lispref/syntax.texi (Syntax Tables, Syntax Descriptors) (Syntax Table Functions): Copyedits. (Syntax Basics): Don't repeat the material in the preceding node. (Syntax Class Table): Use a table. (Syntax Properties): Document syntax-propertize-function and syntax-propertize-extend-region-functions. (Motion via Parsing): Fix indentation. (Parser State): Update for the new "c" comment style. Fix description of item 7 (comment style). * doc/lispref/modes.texi (Syntactic Font Lock): Add xref to Syntactic Font Lock node. diff: === modified file 'admin/FOR-RELEASE' --- admin/FOR-RELEASE 2012-02-16 07:15:27 +0000 +++ admin/FOR-RELEASE 2012-02-16 14:43:41 +0000 @@ -220,7 +220,7 @@ streams.texi cyd strings.texi cyd symbols.texi cyd -syntax.texi +syntax.texi cyd text.texi tips.texi variables.texi cyd === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2012-02-16 06:04:38 +0000 +++ doc/lispref/ChangeLog 2012-02-16 14:43:41 +0000 @@ -1,5 +1,15 @@ 2012-02-16 Chong Yidong + * syntax.texi (Syntax Tables, Syntax Descriptors) + (Syntax Table Functions): Copyedits. + (Syntax Basics): Don't repeat the material in the preceding node. + (Syntax Class Table): Use a table. + (Syntax Properties): Document syntax-propertize-function and + syntax-propertize-extend-region-functions. + (Motion via Parsing): Clarify scan-lists. Fix indentation. + (Parser State): Update for the new "c" comment style. Fix + description of item 7 (comment style). + * modes.texi (Minor Modes): Update how mode commands should treat arguments now. (Mode Line Basics): Clarify force-mode-line-update. @@ -16,7 +26,8 @@ (Search-based Fontification): Emphasize that font-lock-keywords should not be set directly. (Faces for Font Lock): Avoid some confusing terminology. - (Syntactic Font Lock): Minor clarifications. + (Syntactic Font Lock): Minor clarifications. Add xref to + Syntactic Font Lock node. 2012-02-15 Chong Yidong === modified file 'doc/lispref/elisp.texi' --- doc/lispref/elisp.texi 2012-02-16 06:04:38 +0000 +++ doc/lispref/elisp.texi 2012-02-16 14:43:41 +0000 @@ -764,6 +764,7 @@ * Mode Line Format:: Customizing the text that appears in the mode line. * Imenu:: Providing a menu of definitions made in a buffer. * Font Lock Mode:: How modes can highlight text according to syntax. +* Auto-Indentation:: How to teach Emacs to indent for a major mode. * Desktop Save Mode:: How modes can have buffer state saved between Emacs sessions. === modified file 'doc/lispref/modes.texi' --- doc/lispref/modes.texi 2012-02-16 06:04:38 +0000 +++ doc/lispref/modes.texi 2012-02-16 14:43:41 +0000 @@ -2995,6 +2995,12 @@ that affect syntactic fontification; you should set them by means of @code{font-lock-defaults} (@pxref{Font Lock Basics}). + Whenever Font Lock mode performs syntactic fontification on a stretch +of text, it first calls the function specified by +@code{syntax-propertize-function}. Major modes can use this to apply +@code{syntax-table} text properties to override the buffer's syntax +table in special cases. @xref{Syntax Properties}. + @defvar font-lock-keywords-only If the value of this variable is non-@code{nil}, Font Lock does not do syntactic fontification, only search-based fontification based on @@ -3191,7 +3197,7 @@ @end defvar @node Auto-Indentation -@section Auto-indentation of code +@section Automatic Indentation of code For programming languages, an important feature of a major mode is to provide automatic indentation. This is controlled in Emacs by @@ -3214,7 +3220,7 @@ indentation code will want to be somewhat friendly to syntactically incorrect code. -Good maintainable indentation functions usually fall into 2 categories: +Good maintainable indentation functions usually fall into two categories: either parsing forward from some ``safe'' starting point until the position of interest, or parsing backward from the position of interest. Neither of the two is a clearly better choice than the other: parsing === modified file 'doc/lispref/syntax.texi' --- doc/lispref/syntax.texi 2012-02-16 06:04:38 +0000 +++ doc/lispref/syntax.texi 2012-02-16 14:43:41 +0000 @@ -10,17 +10,15 @@ @cindex syntax table @cindex text parsing - A @dfn{syntax table} specifies the syntactic textual function of each -character. This information is used by the @dfn{parsing functions}, the -complex movement commands, and others to determine where words, symbols, -and other syntactic constructs begin and end. The current syntax table -controls the meaning of the word motion functions (@pxref{Word Motion}) -and the list motion functions (@pxref{List Motion}), as well as the -functions in this chapter. + A @dfn{syntax table} specifies the syntactic role of each character +in a buffer. It can be used to determine where words, symbols, and +other syntactic constructs begin and end. This information is used by +many Emacs facilities, including Font Lock mode (@pxref{Font Lock +Mode}) and the various complex movement commands (@pxref{Motion}). @menu * Basics: Syntax Basics. Basic concepts of syntax tables. -* Desc: Syntax Descriptors. How characters are classified. +* Syntax Descriptors:: How characters are classified. * Syntax Table Functions:: How to create, examine and alter syntax tables. * Syntax Properties:: Overriding syntax with text properties. * Motion and Syntax:: Moving over characters with certain syntaxes. @@ -34,17 +32,6 @@ @node Syntax Basics @section Syntax Table Concepts -@ifnottex - A @dfn{syntax table} provides Emacs with the information that -determines the syntactic use of each character in a buffer. This -information is used by the parsing commands, the complex movement -commands, and others to determine where words, symbols, and other -syntactic constructs begin and end. The current syntax table controls -the meaning of the word motion functions (@pxref{Word Motion}) and the -list motion functions (@pxref{List Motion}) as well as the functions in -this chapter. -@end ifnottex - A syntax table is a char-table (@pxref{Char-Tables}). The element at index @var{c} describes the character with code @var{c}. The element's value should be a list that encodes the syntax of the character in @@ -57,16 +44,15 @@ feature out of Emacs Lisp for simplicity.) Each buffer has its own major mode, and each major mode has its own -idea of the syntactic class of various characters. For example, in Lisp -mode, the character @samp{;} begins a comment, but in C mode, it +idea of the syntactic class of various characters. For example, in +Lisp mode, the character @samp{;} begins a comment, but in C mode, it terminates a statement. To support these variations, Emacs makes the -choice of syntax table local to each buffer. Typically, each major -mode has its own syntax table and installs that table in each buffer -that uses that mode. Changing this table alters the syntax in all -those buffers as well as in any buffers subsequently put in that mode. -Occasionally several similar modes share one syntax table. -@xref{Example Major Modes}, for an example of how to set up a syntax -table. +syntax table local to each buffer. Typically, each major mode has its +own syntax table and installs that table in each buffer that uses that +mode. Changing this table alters the syntax in all those buffers as +well as in any buffers subsequently put in that mode. Occasionally +several similar modes share one syntax table. @xref{Example Major +Modes}, for an example of how to set up a syntax table. A syntax table can inherit the data for some characters from the standard syntax table, while specifying other characters itself. The @@ -82,30 +68,38 @@ @section Syntax Descriptors @cindex syntax class - This section describes the syntax classes and flags that denote the -syntax of a character, and how they are represented as a @dfn{syntax -descriptor}, which is a Lisp string that you pass to -@code{modify-syntax-entry} to specify the syntax you want. - - The syntax table specifies a syntax class for each character. There + The syntactic role of a character is called its @dfn{syntax class}. +Each syntax table specifies the syntax class of each character. There is no necessary relationship between the class of a character in one syntax table and its class in any other table. - Each class is designated by a mnemonic character, which serves as the -name of the class when you need to specify a class. Usually the -designator character is one that is often assigned that class; however, -its meaning as a designator is unvarying and independent of what syntax -that character currently has. Thus, @samp{\} as a designator character -always gives ``escape character'' syntax, regardless of what syntax -@samp{\} currently has. + Each syntax class is designated by a mnemonic character, which +serves as the name of the class when you need to specify a class. +Usually, this designator character is one that is often assigned that +class; however, its meaning as a designator is unvarying and +independent of what syntax that character currently has. Thus, +@samp{\} as a designator character always means ``escape character'' +syntax, regardless of whether the @samp{\} character actually has that +syntax in the current syntax table. +@ifnottex +@xref{Syntax Class Table}, for a list of syntax classes. +@end ifnottex @cindex syntax descriptor - A syntax descriptor is a Lisp string that specifies a syntax class, a -matching character (used only for the parenthesis classes) and flags. -The first character is the designator for a syntax class. The second -character is the character to match; if it is unused, put a space there. -Then come the characters for any desired flags. If no matching -character or flags are needed, one character is sufficient. + A @dfn{syntax descriptor} is a Lisp string that describes the syntax +classes and other syntactic properties of a character. When you want +to modify the syntax of a character, that is done by calling the +function @code{modify-syntax-entry} and passing a syntax descriptor as +one of its arguments (@pxref{Syntax Table Functions}). + + The first character in a syntax descriptor designates the syntax +class. The second character specifies a matching character (e.g.@: in +Lisp, the matching character for @samp{(} is @samp{)}); if there is no +matching character, put a space there. Then come the characters for +any desired flags. + + If no matching character or flags are needed, only one character +(specifying the syntax class) is sufficient. For example, the syntax descriptor for the character @samp{*} in C mode is @code{". 23"} (i.e., punctuation, matching character slot @@ -122,70 +116,58 @@ @node Syntax Class Table @subsection Table of Syntax Classes - Here is a table of syntax classes, the characters that stand for them, -their meanings, and examples of their use. - -@deffn {Syntax class} @w{whitespace character} -@dfn{Whitespace characters} (designated by @w{@samp{@ }} or @samp{-}) -separate symbols and words from each other. Typically, whitespace -characters have no other syntactic significance, and multiple -whitespace characters are syntactically equivalent to a single one. -Space, tab, and formfeed are classified as whitespace in almost all -major modes. -@end deffn - -@deffn {Syntax class} @w{word constituent} -@dfn{Word constituents} (designated by @samp{w}) are parts of words in -human languages, and are typically used in variable and command names -in programs. All upper- and lower-case letters, and the digits, are -typically word constituents. -@end deffn - -@deffn {Syntax class} @w{symbol constituent} -@dfn{Symbol constituents} (designated by @samp{_}) are the extra -characters that are used in variable and command names along with word -constituents. For example, the symbol constituents class is used in -Lisp mode to indicate that certain characters may be part of symbol -names even though they are not part of English words. These characters -are @samp{$&*+-_<>}. In standard C, the only non-word-constituent + Here is a table of syntax classes, the characters that designate +them, their meanings, and examples of their use. + +@table @asis +@item Whitespace characters: @samp{@ } or @samp{-} +Characters that separate symbols and words from each other. +Typically, whitespace characters have no other syntactic significance, +and multiple whitespace characters are syntactically equivalent to a +single one. Space, tab, and formfeed are classified as whitespace in +almost all major modes. + +This syntax class can be designated by either @w{@samp{@ }} or +@samp{-}. Both designators are equivalent. + +@item Word constituents: @samp{w} +Parts of words in human languages. These are typically used in +variable and command names in programs. All upper- and lower-case +letters, and the digits, are typically word constituents. + +@item Symbol constituents: @samp{_} +Extra characters used in variable and command names along with word +constituents. Examples include the characters @samp{$&*+-_<>} in Lisp +mode, which may be part of a symbol name even though they are not part +of English words. In standard C, the only non-word-constituent character that is valid in symbols is underscore (@samp{_}). -@end deffn - -@deffn {Syntax class} @w{punctuation character} -@dfn{Punctuation characters} (designated by @samp{.}) are those -characters that are used as punctuation in English, or are used in some -way in a programming language to separate symbols from one another. -Some programming language modes, such as Emacs Lisp mode, have no -characters in this class since the few characters that are not symbol or -word constituents all have other uses. Other programming language modes, -such as C mode, use punctuation syntax for operators. -@end deffn - -@deffn {Syntax class} @w{open parenthesis character} -@deffnx {Syntax class} @w{close parenthesis character} -@cindex parenthesis syntax -Open and close @dfn{parenthesis characters} are characters used in -dissimilar pairs to surround sentences or expressions. Such a grouping -is begun with an open parenthesis character and terminated with a close. -Each open parenthesis character matches a particular close parenthesis -character, and vice versa. Normally, Emacs indicates momentarily the -matching open parenthesis when you insert a close parenthesis. -@xref{Blinking}. - -The class of open parentheses is designated by @samp{(}, and that of -close parentheses by @samp{)}. - -In English text, and in C code, the parenthesis pairs are @samp{()}, -@samp{[]}, and @samp{@{@}}. In Emacs Lisp, the delimiters for lists and -vectors (@samp{()} and @samp{[]}) are classified as parenthesis -characters. -@end deffn - -@deffn {Syntax class} @w{string quote} -@dfn{String quote characters} (designated by @samp{"}) are used in -many languages, including Lisp and C, to delimit string constants. The -same string quote character appears at the beginning and the end of a -string. Such quoted strings do not nest. + +@item Punctuation characters: @samp{.} +Characters used as punctuation in a human language, or used in a +programming language to separate symbols from one another. Some +programming language modes, such as Emacs Lisp mode, have no +characters in this class since the few characters that are not symbol +or word constituents all have other uses. Other programming language +modes, such as C mode, use punctuation syntax for operators. + +@item Open parenthesis characters: @samp{(} +@itemx Close parenthesis characters: @samp{)} +Characters used in dissimilar pairs to surround sentences or +expressions. Such a grouping is begun with an open parenthesis +character and terminated with a close. Each open parenthesis +character matches a particular close parenthesis character, and vice +versa. Normally, Emacs indicates momentarily the matching open +parenthesis when you insert a close parenthesis. @xref{Blinking}. + +In human languages, and in C code, the parenthesis pairs are +@samp{()}, @samp{[]}, and @samp{@{@}}. In Emacs Lisp, the delimiters +for lists and vectors (@samp{()} and @samp{[]}) are classified as +parenthesis characters. + +@item String quotes: @samp{"} +Characters used to delimit string constants. The same string quote +character appears at the beginning and the end of a string. Such +quoted strings do not nest. The parsing facilities of Emacs consider a string as a single token. The usual syntactic meanings of the characters in the string are @@ -197,94 +179,79 @@ double-quote for strings, and single-quote (@samp{'}) for character constants. -English text has no string quote characters because English is not a -programming language. Although quotation marks are used in English, -we do not want them to turn off the usual syntactic properties of -other characters in the quotation. -@end deffn +Human text has no string quote characters. We do not want quotation +marks to turn off the usual syntactic properties of other characters +in the quotation. -@deffn {Syntax class} @w{escape-syntax character} -An @dfn{escape character} (designated by @samp{\}) starts an escape -sequence such as is used in C string and character constants. The -character @samp{\} belongs to this class in both C and Lisp. (In C, it -is used thus only inside strings, but it turns out to cause no trouble -to treat it this way throughout C code.) +@item Escape-syntax characters: @samp{\} +Characters that start an escape sequence, such as is used in string +and character constants. The character @samp{\} belongs to this class +in both C and Lisp. (In C, it is used thus only inside strings, but +it turns out to cause no trouble to treat it this way throughout C +code.) Characters in this class count as part of words if @code{words-include-escapes} is non-@code{nil}. @xref{Word Motion}. -@end deffn -@deffn {Syntax class} @w{character quote} -A @dfn{character quote character} (designated by @samp{/}) quotes the -following character so that it loses its normal syntactic meaning. This -differs from an escape character in that only the character immediately -following is ever affected. +@item Character quotes: @samp{/} +Characters used to quote the following character so that it loses its +normal syntactic meaning. This differs from an escape character in +that only the character immediately following is ever affected. Characters in this class count as part of words if @code{words-include-escapes} is non-@code{nil}. @xref{Word Motion}. This class is used for backslash in @TeX{} mode. -@end deffn - -@deffn {Syntax class} @w{paired delimiter} -@dfn{Paired delimiter characters} (designated by @samp{$}) are like -string quote characters except that the syntactic properties of the -characters between the delimiters are not suppressed. Only @TeX{} mode -uses a paired delimiter presently---the @samp{$} that both enters and -leaves math mode. -@end deffn - -@deffn {Syntax class} @w{expression prefix} -An @dfn{expression prefix operator} (designated by @samp{'}) is used for -syntactic operators that are considered as part of an expression if they -appear next to one. In Lisp modes, these characters include the -apostrophe, @samp{'} (used for quoting), the comma, @samp{,} (used in -macros), and @samp{#} (used in the read syntax for certain data types). -@end deffn - -@deffn {Syntax class} @w{comment starter} -@deffnx {Syntax class} @w{comment ender} + +@item Paired delimiters: @samp{$} +Similar to string quote characters, except that the syntactic +properties of the characters between the delimiters are not +suppressed. Only @TeX{} mode uses a paired delimiter presently---the +@samp{$} that both enters and leaves math mode. + +@item Expression prefixes: @samp{'} +Characters used for syntactic operators that are considered as part of +an expression if they appear next to one. In Lisp modes, these +characters include the apostrophe, @samp{'} (used for quoting), the +comma, @samp{,} (used in macros), and @samp{#} (used in the read +syntax for certain data types). + +@item Comment starters: @samp{<} +@itemx Comment enders: @samp{>} @cindex comment syntax -The @dfn{comment starter} and @dfn{comment ender} characters are used in -various languages to delimit comments. These classes are designated -by @samp{<} and @samp{>}, respectively. - -English text has no comment characters. In Lisp, the semicolon -(@samp{;}) starts a comment and a newline or formfeed ends one. -@end deffn - -@deffn {Syntax class} @w{inherit standard syntax} -This syntax class does not specify a particular syntax. It says to look -in the standard syntax table to find the syntax of this character. The -designator for this syntax class is @samp{@@}. -@end deffn - -@deffn {Syntax class} @w{generic comment delimiter} -A @dfn{generic comment delimiter} (designated by @samp{!}) starts -or ends a special kind of comment. @emph{Any} generic comment delimiter -matches @emph{any} generic comment delimiter, but they cannot match -a comment starter or comment ender; generic comment delimiters can only -match each other. +Characters used in various languages to delimit comments. Human text +has no comment characters. In Lisp, the semicolon (@samp{;}) starts a +comment and a newline or formfeed ends one. + +@item Inherit standard syntax: @samp{@@} +This syntax class does not specify a particular syntax. It says to +look in the standard syntax table to find the syntax of this +character. + +@item Generic comment delimiters: @samp{!} +Characters that start or end a special kind of comment. @emph{Any} +generic comment delimiter matches @emph{any} generic comment +delimiter, but they cannot match a comment starter or comment ender; +generic comment delimiters can only match each other. This syntax class is primarily meant for use with the -@code{syntax-table} text property (@pxref{Syntax Properties}). You can -mark any range of characters as forming a comment, by giving the first -and last characters of the range @code{syntax-table} properties +@code{syntax-table} text property (@pxref{Syntax Properties}). You +can mark any range of characters as forming a comment, by giving the +first and last characters of the range @code{syntax-table} properties identifying them as generic comment delimiters. -@end deffn -@deffn {Syntax class} @w{generic string delimiter} -A @dfn{generic string delimiter} (designated by @samp{|}) starts or ends -a string. This class differs from the string quote class in that @emph{any} -generic string delimiter can match any other generic string delimiter; but -they do not match ordinary string quote characters. +@item Generic string delimiters: @samp{|} +Characters that start or end a string. This class differs from the +string quote class in that @emph{any} generic string delimiter can +match any other generic string delimiter; but they do not match +ordinary string quote characters. This syntax class is primarily meant for use with the -@code{syntax-table} text property (@pxref{Syntax Properties}). You can -mark any range of characters as forming a string constant, by giving the -first and last characters of the range @code{syntax-table} properties -identifying them as generic string delimiters. -@end deffn +@code{syntax-table} text property (@pxref{Syntax Properties}). You +can mark any range of characters as forming a string constant, by +giving the first and last characters of the range @code{syntax-table} +properties identifying them as generic string delimiters. +@end table @node Syntax Flags @subsection Syntax Flags @@ -419,25 +386,23 @@ @deffn Command modify-syntax-entry char syntax-descriptor &optional table This function sets the syntax entry for @var{char} according to -@var{syntax-descriptor}. @var{char} can be a character, or a cons +@var{syntax-descriptor}. @var{char} must be a character, or a cons cell of the form @code{(@var{min} . @var{max})}; in the latter case, the function sets the syntax entries for all characters in the range between @var{min} and @var{max}, inclusive. The syntax is changed only for @var{table}, which defaults to the -current buffer's syntax table, and not in any other syntax table. The -argument @var{syntax-descriptor} specifies the desired syntax; this is -a string beginning with a class designator character, and optionally -containing a matching character and flags as well. @xref{Syntax -Descriptors}. +current buffer's syntax table, and not in any other syntax table. + +The argument @var{syntax-descriptor} is a syntax descriptor for the +desired syntax (i.e.@: a string beginning with a class designator +character, and optionally containing a matching character and syntax +flags). An error is signaled if the first character is not one of the +seventeen syntax class designators. @xref{Syntax Descriptors}. This function always returns @code{nil}. The old syntax information in the table for this character is discarded. -An error is signaled if the first character of the syntax descriptor is not -one of the seventeen syntax class designator characters. An error is also -signaled if @var{char} is not a character. - @example @group @exdent @r{Examples:} @@ -534,21 +499,21 @@ @kindex syntax-table @r{(text property)} When the syntax table is not flexible enough to specify the syntax of -a language, you can use @code{syntax-table} text properties to -override the syntax table for specific character occurrences in the -buffer. @xref{Text Properties}. +a language, you can override the syntax table for specific character +occurrences in the buffer, by applying a @code{syntax-table} text +property. @xref{Text Properties}, for how to apply text properties. -The valid values of @code{syntax-table} text property are: + The valid values of @code{syntax-table} text property are: @table @asis @item @var{syntax-table} If the property value is a syntax table, that table is used instead of -the current buffer's syntax table to determine the syntax for this -occurrence of the character. +the current buffer's syntax table to determine the syntax for the +underlying text character. @item @code{(@var{syntax-code} . @var{matching-char})} -A cons cell of this format specifies the syntax for this -occurrence of the character. (@pxref{Syntax Table Internals}) +A cons cell of this format specifies the syntax for the underlying +text character. (@pxref{Syntax Table Internals}) @item @code{nil} If the property is @code{nil}, the character's syntax is determined from @@ -556,9 +521,41 @@ @end table @defvar parse-sexp-lookup-properties -If this is non-@code{nil}, the syntax scanning functions pay attention -to syntax text properties. Otherwise they use only the current syntax -table. +If this is non-@code{nil}, the syntax scanning functions, like +@code{forward-sexp}, pay attention to syntax text properties. +Otherwise they use only the current syntax table. +@end defvar + +@defvar syntax-propertize-function +This variable, if non-@code{nil}, should store a function for applying +@code{syntax-table} properties to a specified stretch of text. It is +intended to be used by major modes to install a function which applies +@code{syntax-table} properties in some mode-appropriate way. + +The function is called by @code{syntax-ppss} (@pxref{Position Parse}), +and by Font Lock mode during syntactic fontification (@pxref{Syntactic +Font Lock}). It is called with two arguments, @var{start} and +@var{end}, which are the starting and ending positions of the text on +which it should act. It is allowed to call @code{syntax-ppss} on any +position before @var{end}. However, it should not call +@code{syntax-ppss-flush-cache}; so, it is not allowed to call +@code{syntax-ppss} on some position and later modify the buffer at an +earlier position. +@end defvar + +@defvar syntax-propertize-extend-region-functions +This abnormal hook is run by the syntax parsing code prior to calling +@code{syntax-propertize-function}. Its role is to help locate safe +starting and ending buffer positions for passing to +@code{syntax-propertize-function}. For example, a major mode can add +a function to this hook to identify multi-line syntactic constructs, +and ensure that the boundaries do not fall in the middle of one. + +Each function in this hook should accept two arguments, @var{start} +and @var{end}. It should return either a cons cell of two adjusted +buffer positions, @code{(@var{new-start} . @var{new-end})}, or +@code{nil} if no adjustment is necessary. The hook functions are run +in turn, repeatedly, until they all return @code{nil}. @end defvar @node Motion and Syntax @@ -609,8 +606,9 @@ on languages other than Lisp. Basically, a sexp is either a balanced parenthetical grouping, a string, or a ``symbol'' (i.e.@: a sequence of characters whose syntax is either word constituent or symbol -constituent). However, characters whose syntax is expression prefix -are treated as part of the sexp if they appear next to it. +constituent). However, characters in the expression prefix syntax +class (@pxref{Syntax Class Table}) are treated as part of the sexp if +they appear next to it. The syntax table controls the interpretation of characters, so these functions can be used for Lisp expressions when in Lisp mode and for C @@ -652,11 +650,13 @@ from position @var{from}. It returns the position where the scan stops. If @var{count} is negative, the scan moves backwards. -If @var{depth} is nonzero, parenthesis depth counting begins from that -value. The only candidates for stopping are places where the depth in -parentheses becomes zero; @code{scan-lists} counts @var{count} such -places and then stops. Thus, a positive value for @var{depth} means go -out @var{depth} levels of parenthesis. +If @var{depth} is nonzero, assume that the starting point is already +@var{depth} parentheses deep. This function counts out @var{count} +number of points where the parenthesis depth goes back to zero, then +stops. Thus, a positive value for @var{depth} has the effect of +moving out @var{depth} levels of parenthesis, whereas a negative +@var{depth} has the effect of moving deeper by @var{-depth} levels of +parenthesis. Scanning ignores comments if @code{parse-sexp-ignore-comments} is non-@code{nil}. @@ -697,12 +697,12 @@ This function cannot tell whether the ``comments'' it traverses are embedded within a string. If they look like comments, it treats them as comments. -@end defun To move forward over all comments and whitespace following point, use -@code{(forward-comment (buffer-size))}. @code{(buffer-size)} is a good -argument to use, because the number of comments in the buffer cannot -exceed that many. +@code{(forward-comment (buffer-size))}. @code{(buffer-size)} is a +good argument to use, because the number of comments in the buffer +cannot exceed that many. +@end defun @node Position Parse @subsection Finding the Parse State for a Position @@ -712,22 +712,34 @@ position. This function does that conveniently. @defun syntax-ppss &optional pos -This function returns the parser state (see next section) that the -parser would reach at position @var{pos} starting from the beginning -of the buffer. This is equivalent to @code{(parse-partial-sexp -(point-min) @var{pos})}, except that @code{syntax-ppss} uses a cache -to speed up the computation. Due to this optimization, the 2nd value -(previous complete subexpression) and 6th value (minimum parenthesis -depth) of the returned parser state are not meaningful. -@end defun - - @code{syntax-ppss} automatically hooks itself to -@code{before-change-functions} to keep its cache consistent. But -updating can fail if @code{syntax-ppss} is called while +This function returns the parser state that the parser would reach at +position @var{pos} starting from the beginning of the buffer. +@iftex +See the next section for +@end iftex +@ifnottex +@xref{Parser State}, +@end ifnottex +for a description of the parser state. + +The return value is the same as if you call the low-level parsing +function @code{parse-partial-sexp} to parse from the beginning of the +buffer to @var{pos} (@pxref{Low-Level Parsing}). However, +@code{syntax-ppss} uses a cache to speed up the computation. Due to +this optimization, the second value (previous complete subexpression) +and sixth value (minimum parenthesis depth) in the returned parser +state are not meaningful. + +This function has a side effect: it adds a buffer-local entry to +@code{before-change-functions} (@pxref{Change Hooks}) for +@code{syntax-ppss-flush-cache} (see below). This entry keeps the +cache consistent as the buffer is modified. However, the cache might +not be updated if @code{syntax-ppss} is called while @code{before-change-functions} is temporarily let-bound, or if the -buffer is modified without obeying the hook, such as when using -@code{inhibit-modification-hooks}. For this reason, it is sometimes -necessary to flush the cache manually. +buffer is modified without running the hook, such as when using +@code{inhibit-modification-hooks}. In those cases, it is necessary to +call @code{syntax-ppss-flush-cache} explicitly. +@end defun @defun syntax-ppss-flush-cache beg &rest ignored-args This function flushes the cache used by @code{syntax-ppss}, starting @@ -752,18 +764,23 @@ @subsection Parser State @cindex parser state - A @dfn{parser state} is a list of ten elements describing the final -state of parsing text syntactically as part of an expression. The -parsing functions in the following sections return a parser state as -the value, and in some cases accept one as an argument also, so that -you can resume parsing after it stops. Here are the meanings of the -elements of the parser state: + A @dfn{parser state} is a list of ten elements describing the state +of the syntactic parser, after it parses the text between a specified +starting point and a specified end point in the buffer. Parsing +functions such as @code{syntax-ppss} +@ifnottex +(@pxref{Position Parse}) +@end ifnottex +return a parser state as the value. Some parsing functions accept a +parser state as an argument, for resuming parsing. + + Here are the meanings of the elements of the parser state: @enumerate 0 @item The depth in parentheses, counting from 0. @strong{Warning:} this can be negative if there are more close parens than open parens between -the start of the defun and point. +the parser's starting point and end point. @item @cindex innermost containing parentheses @@ -783,22 +800,22 @@ @item @cindex inside comment -@code{t} if inside a comment (of either style), -or the comment nesting level if inside a kind of comment -that can be nested. +@code{t} if inside a non-nestable comment (of any comment style; +@pxref{Syntax Flags}); or the comment nesting level if inside a +comment that can be nested. @item @cindex quote character -@code{t} if point is just after a quote character. +@code{t} if the end point is just after a quote character. @item The minimum parenthesis depth encountered during this scan. @item -What kind of comment is active: @code{nil} for a comment of style -``a'' or when not inside a comment, @code{t} for a comment of style -``b,'' and @code{syntax-table} for a comment that should be ended by a -generic comment delimiter character. +What kind of comment is active: @code{nil} if not in a comment or in a +comment of style @samp{a}; 1 for a comment of style @samp{b}; 2 for a +comment of style @samp{c}; and @code{syntax-table} for a comment that +should be ended by a generic comment delimiter character. @item The string or comment start position. While inside a comment, this is @@ -814,8 +831,8 @@ Elements 1, 2, and 6 are ignored in a state which you pass as an argument to continue parsing, and elements 8 and 9 are used only in -trivial cases. Those elements serve primarily to convey information -to the Lisp program which does the parsing. +trivial cases. Those elements are mainly used internally by the +parser code. One additional piece of useful information is available from a parser state using this function: === modified file 'doc/lispref/vol1.texi' --- doc/lispref/vol1.texi 2012-02-16 06:04:38 +0000 +++ doc/lispref/vol1.texi 2012-02-16 14:43:41 +0000 @@ -785,6 +785,7 @@ * Mode Line Format:: Customizing the text that appears in the mode line. * Imenu:: Providing a menu of definitions made in a buffer. * Font Lock Mode:: How modes can highlight text according to syntax. +* Auto-Indentation:: How to teach Emacs to indent for a major mode. * Desktop Save Mode:: How modes can have buffer state saved between Emacs sessions. === modified file 'doc/lispref/vol2.texi' --- doc/lispref/vol2.texi 2012-02-16 06:04:38 +0000 +++ doc/lispref/vol2.texi 2012-02-16 14:43:41 +0000 @@ -784,6 +784,7 @@ * Mode Line Format:: Customizing the text that appears in the mode line. * Imenu:: Providing a menu of definitions made in a buffer. * Font Lock Mode:: How modes can highlight text according to syntax. +* Auto-Indentation:: How to teach Emacs to indent for a major mode. * Desktop Save Mode:: How modes can have buffer state saved between Emacs sessions. === modified file 'etc/NEWS' --- etc/NEWS 2012-02-15 08:48:45 +0000 +++ etc/NEWS 2012-02-16 14:43:41 +0000 @@ -1349,6 +1349,7 @@ not just image libraries. The previous name is still available as an obsolete alias. ++++ ** New variable `syntax-propertize-function'. This replaces `font-lock-syntactic-keywords' which is now obsolete. This allows syntax-table properties to be set independently from font-lock: ------------------------------------------------------------ revno: 107305 committer: Leo Liu branch nick: trunk timestamp: Thu 2012-02-16 22:33:58 +0800 message: Use add-to-list instead of push in gnus-1 to avoid duplicate entries. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-02-15 09:36:28 +0000 +++ lisp/gnus/ChangeLog 2012-02-16 14:33:58 +0000 @@ -1,3 +1,7 @@ +2012-02-16 Leo Liu + + * gnus-start.el (gnus-1): Avoid duplicate entries. + 2012-02-15 Lars Ingebrigtsen * shr.el (shr-remove-trailing-whitespace): Really delete the padding on === modified file 'lisp/gnus/gnus-start.el' --- lisp/gnus/gnus-start.el 2012-01-27 14:32:25 +0000 +++ lisp/gnus/gnus-start.el 2012-02-16 14:33:58 +0000 @@ -763,8 +763,8 @@ ;; Add "native" to gnus-predefined-server-alist just to have a ;; name for the native select method. (when gnus-select-method - (push (cons "native" gnus-select-method) - gnus-predefined-server-alist)) + (add-to-list 'gnus-predefined-server-alist + (cons "native" gnus-select-method))) (if gnus-agent (gnus-agentize)) ------------------------------------------------------------ revno: 107304 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-02-16 00:23:54 -0800 message: * doc/emacs/calendar.texi: Misc small changes. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-02-16 07:22:57 +0000 +++ doc/emacs/ChangeLog 2012-02-16 08:23:54 +0000 @@ -1,5 +1,7 @@ 2012-02-16 Glenn Morris + * calendar.texi: Misc small changes. + * vc1-xtra.texi (VC Delete/Rename, CVS Options): * cal-xtra.texi (Diary Display): Fix TeX cross-refs to other manuals. === modified file 'doc/emacs/calendar.texi' --- doc/emacs/calendar.texi 2012-01-19 07:21:25 +0000 +++ doc/emacs/calendar.texi 2012-02-16 08:23:54 +0000 @@ -143,8 +143,7 @@ A week (or month, or year) is not just a quantity of days; we think of weeks (months, years) as starting on particular dates. So Calendar mode -provides commands to move to the beginning or end of a week, month or -year: +provides commands to move to the start or end of a week, month or year: @table @kbd @kindex C-a @r{(Calendar mode)} @@ -246,12 +245,10 @@ Scroll calendar one month backward (@code{calendar-scroll-right}). @item C-v @itemx @key{next} -Scroll calendar three months forward -(@code{calendar-scroll-left-three-months}). +Scroll three months forward (@code{calendar-scroll-left-three-months}). @item M-v @itemx @key{prior} -Scroll calendar three months backward -(@code{calendar-scroll-right-three-months}). +Scroll three months backward (@code{calendar-scroll-right-three-months}). @end table @kindex > @r{(Calendar mode)} @@ -290,7 +287,8 @@ @kindex M-= @r{(Calendar mode)} @findex calendar-count-days-region - To determine the number of days in the region, type @kbd{M-=} + To determine the number of days in a range, set the mark on one +date using @kbd{C-SPC}, move point to another date, and type @kbd{M-=} (@code{calendar-count-days-region}). The numbers of days shown is @emph{inclusive}; that is, it includes the days specified by mark and point. @@ -342,6 +340,8 @@ calendar deletes or iconifies that frame depending on the value of @code{calendar-remove-frame-by-deleting}.) +@c FIXME this mentions holidays and diary entries, albeit briefly, so +@c should it be moved after those sections? Or at least xref them. @node Writing Calendar Files @section Writing Calendar Files @@ -427,7 +427,7 @@ Some of these commands print the calendar sideways (in ``landscape mode''), so it can be wider than it is long. Some of them use Filofax paper size (3.75in x 6.75in). All of these commands accept a prefix -argument which specifies how many days, weeks, months or years to print +argument, which specifies how many days, weeks, months or years to print (starting always with the selected one). If the variable @code{cal-tex-holidays} is non-@code{nil} (the default), @@ -452,11 +452,10 @@ and can display them. You can add your own holidays to the default list. @table @kbd -@item h +@item Mouse-3 Holidays +@itemx h Display holidays for the selected date (@code{calendar-cursor-holidays}). -@item Mouse-3 Holidays -Display any holidays for the date you click on. @item x Mark holidays in the calendar window (@code{calendar-mark-holidays}). @item u @@ -518,6 +517,7 @@ holidays centered around a different month, use @kbd{C-u M-x holidays}, which prompts for the month and year. +@c FIXME can we write Baha'i properly? The holidays known to Emacs include United States holidays and the major Baha'i, Chinese, Christian, Islamic, and Jewish holidays; also the solstices and equinoxes. @@ -541,11 +541,10 @@ times of sunrise and sunset for any date. @table @kbd -@item S +@item Mouse-3 Sunrise/sunset +@itemx S Display times of sunrise and sunset for the selected date (@code{calendar-sunrise-sunset}). -@item Mouse-3 Sunrise/sunset -Display times of sunrise and sunset for the date you click on. @item M-x sunrise-sunset Display times of sunrise and sunset for today's date. @item C-u M-x sunrise-sunset @@ -615,9 +614,8 @@ As a user, you might find it convenient to set the calendar location variables for your usual physical location in your @file{.emacs} file. -And when you install Emacs on a machine, you can create a -@file{default.el} file which sets them properly for the typical location -of most users of that machine. @xref{Init File}. +If you are a system administrator, you may want to set these variables +for all users in a @file{default.el} file. @xref{Init File}. @node Lunar Phases @section Phases of the Moon @@ -666,8 +664,8 @@ it did not fully displace the Julian calendar and gain universal acceptance until the early twentieth century. The Emacs calendar can display any month since January, year 1 of the current era, but the -calendar displayed is the Gregorian, even for a date at which the -Gregorian calendar did not exist. +calendar displayed is always the Gregorian, even for a date at which +the Gregorian calendar did not exist. While Emacs cannot display other calendars, it can convert dates to and from several other calendars. @@ -680,11 +678,13 @@ * Mayan Calendar:: Moving to a date specified in a Mayan calendar. @end menu +@c FIXME perhaps most of the details should be moved to cal-xtra. +@c Just list the major supported systems here? @node Calendar Systems @subsection Supported Calendar Systems @cindex ISO commercial calendar - The ISO commercial calendar is used largely in Europe. + The ISO commercial calendar is often used in business. @cindex Julian calendar The Julian calendar, named after Julius Caesar, was the one used in Europe @@ -745,7 +745,8 @@ the astronomical Persian calendar, which is based on astronomical events. As of this writing the first future discrepancy is projected to occur on March 20, 2025. It is currently not clear what the -official calendar of Iran will be that far into the future. +official calendar of Iran will be at that time. +@c FIXME not so far in the future now. @cindex Chinese calendar The Chinese calendar is a complicated system of lunar months arranged @@ -768,11 +769,10 @@ in various other calendar systems: @table @kbd -@item Mouse-3 Other calendars -Display the date that you click on, expressed in various other calendars. @kindex p @r{(Calendar mode)} @findex calendar-print-other-dates -@item p o +@item Mouse-3 Other calendars +@itemx p o Display the selected date in various other calendars. (@code{calendar-print-other-dates}). @findex calendar-iso-print-date @@ -821,18 +821,16 @@ Display Mayan date for selected day (@code{calendar-mayan-print-date}). @end table - If you are using a graphic display, the easiest way to translate a -date into other calendars is to click on it with @kbd{Mouse-3}, then -choose @kbd{Other calendars} from the menu that appears. This displays -the equivalent forms of the date in all the calendars Emacs understands, -in the form of a menu. (Choosing an alternative from this menu doesn't -actually do anything---the menu is used only for display.) - Otherwise, move point to the date you want to convert, then type the appropriate command starting with @kbd{p} from the table above. The prefix @kbd{p} is a mnemonic for ``print,'' since Emacs ``prints'' the equivalent date in the echo area. @kbd{p o} displays the -date in all forms known to Emacs. +date in all forms known to Emacs. You can also use @kbd{Mouse-3} and +then choose @kbd{Other calendars} from the menu that appears. This +displays the equivalent forms of the date in all the calendars Emacs +understands, in the form of a menu. (Choosing an alternative from +this menu doesn't actually do anything---the menu is used only for +display.) @node From Other Calendar @subsection Converting From Other Calendars @@ -903,7 +901,7 @@ @c FIXME move? @findex calendar-hebrew-list-yahrzeits @cindex yahrzeits - One common question concerning the Hebrew calendar is the computation + One common issue concerning the Hebrew calendar is the computation of the anniversary of a date of death, called a ``yahrzeit.'' The Emacs calendar includes a facility for such calculations. If you are in the calendar, the command @kbd{M-x calendar-hebrew-list-yahrzeits} asks you for @@ -1053,11 +1051,10 @@ following, key bindings refer to the Calendar buffer. @table @kbd -@item d +@item Mouse-3 Diary +@itemx d Display all diary entries for the selected date (@code{diary-view-entries}). -@item Mouse-3 Diary -Display all diary entries for the date you click on. @item s Display the entire diary file (@code{diary-show-all-entries}). @item m ------------------------------------------------------------ revno: 107303 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-02-16 00:21:30 -0800 message: calendar-hebrew-list-yahrzeits tweak * lisp/calendar/cal-hebrew.el (calendar-hebrew-list-yahrzeits): Interactively in calendar buffer, give an error if not on a date. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-15 13:45:02 +0000 +++ lisp/ChangeLog 2012-02-16 08:21:30 +0000 @@ -1,3 +1,8 @@ +2012-02-16 Glenn Morris + + * calendar/cal-hebrew.el (calendar-hebrew-list-yahrzeits): + Interactively in calendar buffer, give an error if not on a date. + 2012-02-15 Glenn Morris * shell.el (shell-delimiter-argument-list): === modified file 'lisp/calendar/cal-hebrew.el' --- lisp/calendar/cal-hebrew.el 2012-01-19 07:21:25 +0000 +++ lisp/calendar/cal-hebrew.el 2012-02-16 08:21:30 +0000 @@ -731,7 +731,7 @@ (interactive (let* ((death-date (if (equal (current-buffer) (get-buffer calendar-buffer)) - (calendar-cursor-to-date) + (calendar-cursor-to-date t) (let* ((today (calendar-current-date)) (year (calendar-read "Year of death (>0): " ------------------------------------------------------------ revno: 107302 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-02-15 23:22:57 -0800 message: Fix some emacs-xtra.pdf cross-references to other manuals * doc/emacs/vc1-xtra.texi (VC Delete/Rename, CVS Options): * doc/emacs/cal-xtra.texi (Diary Display): Fix TeX cross-refs to other manuals. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-02-16 07:15:27 +0000 +++ doc/emacs/ChangeLog 2012-02-16 07:22:57 +0000 @@ -1,5 +1,8 @@ 2012-02-16 Glenn Morris + * vc1-xtra.texi (VC Delete/Rename, CVS Options): + * cal-xtra.texi (Diary Display): Fix TeX cross-refs to other manuals. + * dired-xtra.texi (Subdir Switches): Small fixes. * fortran-xtra.texi: Tiny changes and some adjustments to line breaks. === modified file 'doc/emacs/cal-xtra.texi' --- doc/emacs/cal-xtra.texi 2012-01-19 07:21:25 +0000 +++ doc/emacs/cal-xtra.texi 2012-02-16 07:22:57 +0000 @@ -538,7 +538,13 @@ days to be shown in the fancy diary buffer, set the variable @code{diary-list-include-blanks} to @code{t}.@refill - The fancy diary buffer enables View mode (@pxref{View Mode}). + The fancy diary buffer enables View mode +@iftex +(@pxref{View Mode,,, emacs, the Emacs Manual}). +@end iftex +@ifnottex +(@pxref{View Mode}). +@end ifnottex The alternative display method @code{diary-simple-display} shows the actual diary buffer, and uses invisible text to hide entries that don't @@ -569,7 +575,13 @@ hidden. After preparing the buffer, it runs the hook @code{diary-print-entries-hook}. The default value of this hook sends the data directly to the printer with the command @code{lpr-buffer} -(@pxref{Printing}). If you want to use a different command to do the +@iftex +(@pxref{Printing,,, emacs, the Emacs Manual}). +@end iftex +@ifnottex +(@pxref{Printing}). +@end ifnottex +If you want to use a different command to do the printing, just change the value of this hook. Other uses might include, for example, rearranging the lines into order by day and time. === modified file 'doc/emacs/vc1-xtra.texi' --- doc/emacs/vc1-xtra.texi 2012-01-19 07:21:25 +0000 +++ doc/emacs/vc1-xtra.texi 2012-02-16 07:22:57 +0000 @@ -123,7 +123,7 @@ it via the version control system. The file is removed from the working tree, and in the VC Directory buffer @iftex -(@pxref{VC Directory Mode}), +(@pxref{VC Directory Mode,,, emacs, the Emacs Manual}), @end iftex @ifnottex (@pxref{VC Directory Mode}), @@ -438,4 +438,10 @@ locking-like behavior using its @env{CVSREAD} or @dfn{watch} feature; see the CVS documentation for details. If that case, you can use @kbd{C-x v v} in Emacs to toggle locking, as you would for a -locking-based version control system (@pxref{VC With A Locking VCS}). +locking-based version control system +@iftex +(@pxref{VC With A Locking VCS,,,emacs, the Emacs Manual}). +@end iftex +@ifnottex +(@pxref{VC With A Locking VCS}). +@end ifnottex ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.