Now on revision 107321. ------------------------------------------------------------ revno: 107321 committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-02-17 22:08:15 -0500 message: Use utf-8 Baha'i in calendar doc-strings, menus, etc * lisp/calendar/cal-menu.el (cal-menu-diary-menu, cal-menu-goto-menu): * lisp/calendar/calendar.el (diary-file, diary-bahai-entry-symbol) (calendar-bahai-all-holidays-flag, calendar-other-dates): * lisp/calendar/diary-lib.el (diary-abbreviated-year-flag): * lisp/calendar/holidays.el (holiday-bahai-holidays) (calendar-holidays, list-holidays): Use utf-8 Baha'i in doc-strings, menus, etc. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-17 20:19:30 +0000 +++ lisp/ChangeLog 2012-02-18 03:08:15 +0000 @@ -1,3 +1,13 @@ +2012-02-18 Glenn Morris + + * calendar/cal-menu.el (cal-menu-diary-menu, cal-menu-goto-menu): + * calendar/calendar.el (diary-file, diary-bahai-entry-symbol) + (calendar-bahai-all-holidays-flag, calendar-other-dates): + * calendar/diary-lib.el (diary-abbreviated-year-flag): + * calendar/holidays.el (holiday-bahai-holidays) + (calendar-holidays, list-holidays): + Use utf-8 Bahá'í in doc-strings, menus, etc. + 2012-02-17 Tassilo Horn * saveplace.el (save-place-ignore-files-regexp): New variable === modified file 'lisp/calendar/cal-menu.el' --- lisp/calendar/cal-menu.el 2012-01-19 07:21:25 +0000 +++ lisp/calendar/cal-menu.el 2012-02-18 03:08:15 +0000 @@ -52,7 +52,7 @@ ["Insert Anniversary" diary-insert-anniversary-entry] ["Insert Block" diary-insert-block-entry] ["Insert Cyclic" diary-insert-cyclic-entry] - ("Insert Baha'i" + ("Insert Bahá'í" ["One time" diary-bahai-insert-entry] ["Monthly" diary-bahai-insert-monthly-entry] ["Yearly" diary-bahai-insert-yearly-entry]) @@ -127,7 +127,7 @@ ["Astronomical Date" calendar-astro-goto-day-number] ["Hebrew Date" calendar-hebrew-goto-date] ["Persian Date" calendar-persian-goto-date] - ["Baha'i Date" calendar-bahai-goto-date] + ["Bahá'í Date" calendar-bahai-goto-date] ["Islamic Date" calendar-islamic-goto-date] ["Julian Date" calendar-julian-goto-date] ["Chinese Date" calendar-chinese-goto-date] @@ -282,4 +282,8 @@ (provide 'cal-menu) +;; Local Variables: +;; coding: utf-8 +;; End: + ;;; cal-menu.el ends here === modified file 'lisp/calendar/calendar.el' --- lisp/calendar/calendar.el 2012-01-19 07:21:25 +0000 +++ lisp/calendar/calendar.el 2012-02-18 03:08:15 +0000 @@ -41,7 +41,7 @@ ;; can be translated from the (usual) Gregorian calendar to the day of ;; the year/days remaining in year, to the ISO commercial calendar, to ;; the Julian (old style) calendar, to the Hebrew calendar, to the -;; Islamic calendar, to the Baha'i calendar, to the French +;; Islamic calendar, to the Bahá'í calendar, to the French ;; Revolutionary calendar, to the Mayan calendar, to the Chinese ;; calendar, to the Coptic calendar, to the Ethiopic calendar, and to ;; the astronomical (Julian) day number. Times of sunrise/sunset can @@ -52,7 +52,7 @@ ;; The following files are part of the calendar/diary code: ;; appt.el Appointment notification -;; cal-bahai.el Baha'i calendar +;; cal-bahai.el Bahá'í calendar ;; cal-china.el Chinese calendar ;; cal-coptic.el Coptic/Ethiopic calendars ;; cal-dst.el Daylight saving time rules @@ -642,7 +642,7 @@ November 10, 1990. See the documentation for the function `diary-list-sexp-entries' for more details. -Diary entries based on the Hebrew, the Islamic and/or the Baha'i +Diary entries based on the Hebrew, the Islamic and/or the Bahá'í calendar are also possible, but because these are somewhat slow, they are ignored unless you set the `diary-nongregorian-listing-hook' and the `diary-nongregorian-marking-hook' appropriately. See the @@ -679,7 +679,7 @@ 'diary-bahai-entry-symbol "23.1") (defcustom diary-bahai-entry-symbol "B" - "Symbol indicating a diary entry according to the Baha'i calendar." + "Symbol indicating a diary entry according to the Bahá'í calendar." :type 'string :group 'diary) @@ -1005,9 +1005,9 @@ 'calendar-bahai-all-holidays-flag "23.1") (defcustom calendar-bahai-all-holidays-flag nil - "If nil, show only major holidays from the Baha'i calendar. + "If nil, show only major holidays from the Bahá'í calendar. These are the days on which work and school must be suspended. -Otherwise, show all the holidays that would appear in a complete Baha'i +Otherwise, show all the holidays that would appear in a complete Bahá'í calendar." :type 'boolean :group 'holidays) @@ -2552,7 +2552,7 @@ (unless (string-equal (setq odate (calendar-bahai-date-string date)) "") - (format "Baha'i date: %s" odate)) + (format "Bahá'í date: %s" odate)) (format "Chinese date: %s" (calendar-chinese-date-string date)) (unless (string-equal @@ -2624,6 +2624,7 @@ ;; Local variables: ;; byte-compile-dynamic: t +;; coding: utf-8 ;; End: ;;; calendar.el ends here === modified file 'lisp/calendar/diary-lib.el' --- lisp/calendar/diary-lib.el 2012-01-19 07:21:25 +0000 +++ lisp/calendar/diary-lib.el 2012-02-18 03:08:15 +0000 @@ -337,7 +337,7 @@ (defcustom diary-abbreviated-year-flag t "Interpret a two-digit year DD in a diary entry as either 19DD or 20DD. -This applies to the Gregorian, Hebrew, Islamic, and Baha'i calendars. +This applies to the Gregorian, Hebrew, Islamic, and Bahá'í calendars. When the current century is added to a two-digit year, if the result is more than 50 years in the future, the previous century is assumed. If the result is more than 50 years in the past, the next century is assumed. @@ -2624,4 +2624,8 @@ (provide 'diary-lib) +;; Local Variables: +;; coding: utf-8 +;; End: + ;;; diary-lib.el ends here === modified file 'lisp/calendar/holidays.el' --- lisp/calendar/holidays.el 2012-01-19 07:21:25 +0000 +++ lisp/calendar/holidays.el 2012-02-18 03:08:15 +0000 @@ -292,16 +292,16 @@ (mapcar 'purecopy '((holiday-bahai-new-year) (holiday-bahai-ridvan) ; respects calendar-bahai-all-holidays-flag - (holiday-fixed 5 23 "Declaration of the Bab") - (holiday-fixed 5 29 "Ascension of Baha'u'llah") - (holiday-fixed 7 9 "Martyrdom of the Bab") - (holiday-fixed 10 20 "Birth of the Bab") - (holiday-fixed 11 12 "Birth of Baha'u'llah") + (holiday-fixed 5 23 "Declaration of the Báb") + (holiday-fixed 5 29 "Ascension of Bahá'u'lláh") + (holiday-fixed 7 9 "Martyrdom of the Báb") + (holiday-fixed 10 20 "Birth of the Báb") + (holiday-fixed 11 12 "Birth of Bahá'u'lláh") (if calendar-bahai-all-holidays-flag (append (holiday-fixed 11 26 "Day of the Covenant") - (holiday-fixed 11 28 "Ascension of `Abdu'l-Baha"))))) - "Baha'i holidays. + (holiday-fixed 11 28 "Ascension of `Abdu'l-Bahá"))))) + "Bahá'í holidays. See the documentation for `calendar-holidays' for details." :type 'sexp :group 'holidays) @@ -376,7 +376,7 @@ K>0, and MONTH's last day otherwise. (holiday-hebrew MONTH DAY STRING) a fixed date on the Hebrew calendar (holiday-islamic MONTH DAY STRING) a fixed date on the Islamic calendar - (holiday-bahai MONTH DAY STRING) a fixed date on the Baha'i calendar + (holiday-bahai MONTH DAY STRING) a fixed date on the Bahá'í calendar (holiday-julian MONTH DAY STRING) a fixed date on the Julian calendar (holiday-sexp SEXP STRING) SEXP is a Gregorian-date-valued expression in the variable `year'; if it evaluates to @@ -404,11 +404,11 @@ (holiday-islamic 3 12 \"Mohammed's Birthday\") since the Islamic months are numbered from 1 starting with Muharram. -To add an entry for the Baha'i festival of Ridvan, use +To add an entry for the Bahá'í festival of Ridvan, use (holiday-bahai 2 13 \"Festival of Ridvan\") -since the Baha'i months are numbered from 1 starting with Baha. +since the Bahá'í months are numbered from 1 starting with Bahá. To add Thomas Jefferson's birthday, April 2, 1743 (Julian), use (holiday-julian 4 2 \"Jefferson's Birthday\") @@ -582,7 +582,7 @@ (if holiday-islamic-holidays (cons "Islamic" holiday-islamic-holidays)) (if holiday-bahai-holidays - (cons "Baha'i" holiday-bahai-holidays)) + (cons "Bahá'í" holiday-bahai-holidays)) (if holiday-oriental-holidays (cons "Oriental" holiday-oriental-holidays)) (if holiday-solar-holidays @@ -920,4 +920,8 @@ (provide 'holidays) +;; Local Variables: +;; coding: utf-8 +;; End: + ;;; holidays.el ends here ------------------------------------------------------------ revno: 107320 committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-02-17 22:02:12 -0500 message: * doc/emacs/cal-xtra.texi: Copyedits. * admin/FOR-RELEASE: Related markup. diff: === modified file 'admin/FOR-RELEASE' --- admin/FOR-RELEASE 2012-02-17 04:54:56 +0000 +++ admin/FOR-RELEASE 2012-02-18 03:02:12 +0000 @@ -127,7 +127,7 @@ buffers.texi cyd building.texi cyd calendar.texi rgm -cal-xtra.texi +cal-xtra.texi rgm cmdargs.texi cyd commands.texi cyd custom.texi cyd === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-02-18 03:00:44 +0000 +++ doc/emacs/ChangeLog 2012-02-18 03:02:12 +0000 @@ -1,5 +1,7 @@ 2012-02-18 Glenn Morris + * cal-xtra.texi: Copyedits. + * emacs-xtra.texi: Set encoding to ISO-8859-1. 2012-02-17 Glenn Morris === modified file 'doc/emacs/cal-xtra.texi' --- doc/emacs/cal-xtra.texi 2012-02-17 04:37:58 +0000 +++ doc/emacs/cal-xtra.texi 2012-02-18 03:02:12 +0000 @@ -9,8 +9,8 @@ @node Advanced Calendar/Diary Usage @section Customizing the Calendar and Diary - There are many customizations that you can use to make the calendar and -diary suit your personal tastes. + There are many ways in which you can customize the calendar and +diary to suit your personal tastes. @menu * Calendar Customizing:: Calendar layout and hooks. @@ -43,12 +43,12 @@ @vindex diary-entry-marker @vindex calendar-today-marker The variable @code{calendar-holiday-marker} specifies how to mark a -date as being a holiday. Its value may be a single-character string to +date that is a holiday. Its value may be a single-character string to insert next to the date, or a face name to use for displaying the date. Likewise, the variable @code{diary-entry-marker} specifies how to mark a -date that has diary entries, and @code{calendar-today-marker} is used by -the function @code{calendar-mark-today} to mark today's date. By -default, the calendar uses faces named @code{holiday}, @code{diary}, and +date that has diary entries. The function @code{calendar-mark-today} +uses @code{calendar-today-marker} to mark today's date. By default, +the calendar uses faces named @code{holiday}, @code{diary}, and @code{calendar-today} for these purposes. @vindex calendar-load-hook @@ -65,7 +65,7 @@ @vindex calendar-today-visible-hook @findex calendar-star-date The variable @code{calendar-today-visible-hook} is a normal hook run -after the calendar buffer has been prepared with the calendar when the +after the calendar buffer has been prepared with the calendar, when the current date is visible in the window. One use of this hook is to mark today's date; to do that use either of the functions @code{calendar-mark-today} or @code{calendar-star-date}: @@ -90,28 +90,27 @@ @vindex calendar-holidays @vindex holiday-oriental-holidays @vindex holiday-solar-holidays - Emacs knows about holidays defined by entries on one of several lists. -The lists of holidays that Emacs uses are for -general holidays (@code{holiday-general-holidays}), -local holidays (@code{holiday-local-holidays}), -sun- and moon-related holidays (@code{holiday-solar-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}), -Oriental holidays (@code{holiday-oriental-holidays}), -and other holidays (@code{holiday-other-holidays}). + There are several variables listing the default holidays that Emacs +knows about. These are: @code{holiday-general-holidays}, +@code{holiday-local-holidays}, @code{holiday-solar-holidays}, +@code{holiday-bahai-holidays}, @code{holiday-christian-holidays}, +@code{holiday-hebrew-holidays}, @code{holiday-islamic-holidays}, +@code{holiday-oriental-holidays}, and @code{holiday-other-holidays}. +The names should be self-explanatory; e.g.@: @code{holiday-solar-holidays} +lists sun- and moon-related holidays. You can customize these lists of holidays to your own needs, deleting or adding holidays as described below. Set any of them to @code{nil} to -eliminate the associated holidays. +not show the associated holidays. @vindex holiday-general-holidays +@vindex holiday-local-holidays +@vindex holiday-other-holidays The general holidays are, by default, holidays common throughout the -United States. - -@vindex holiday-local-holidays - There are no default local holidays, but your site may supply some. +United States. In contrast, @code{holiday-local-holidays} and +@code{holiday-other-holidays} are both empty by default. These are +intended for system-wide settings and your individual use, +respectively. @vindex holiday-bahai-holidays @vindex holiday-christian-holidays @@ -129,18 +128,13 @@ @code{calendar-hebrew-all-holidays-flag}, or @code{calendar-islamic-all-holidays-flag} to @code{t}. -@vindex holiday-other-holidays - You can set the variable @code{holiday-other-holidays} to any list of -holidays. This list, normally empty, is intended for individual use. - @cindex holiday forms Each of the holiday variables is a list of @dfn{holiday forms}, each -form describing a holiday (or sometimes a list of holidays). - - Here is a table of the possible kinds of holiday form. Day numbers -and month numbers count starting from 1, but ``dayname'' numbers -count Sunday as 0. The element @var{string} is always the -description of the holiday, as a string. +form describing a holiday (or sometimes a list of holidays). Here is +a table of the possible kinds of holiday form. Day numbers and month +numbers count starting from 1, but ``dayname'' numbers count Sunday as +0. The argument @var{string} is always the description of the +holiday, as a string. @table @code @item (holiday-fixed @var{month} @var{day} @var{string}) @@ -256,15 +250,15 @@ visible in the calendar window, with descriptive strings, like this: @smallexample -(((6 27 1991) "Lunar Eclipse") ((7 11 1991) "Solar Eclipse") ... ) +(((6 4 2012) "Lunar Eclipse") ((11 13 2012) "Solar Eclipse") ... ) @end smallexample @node Date Display Format @subsection Date Display Format @vindex calendar-date-display-form - You can customize the manner of displaying dates in the diary, in mode -lines, and in messages by setting @code{calendar-date-display-form}. + You can customize the way dates are displayed in the diary, mode +lines, and messages by setting @code{calendar-date-display-form}. This variable holds a list of expressions that can involve the variables @code{month}, @code{day}, and @code{year}, which are all numbers in string form, and @code{monthname} and @code{dayname}, which are both @@ -291,7 +285,7 @@ @end smallexample @noindent -This specifies a typical American format: +Another typical American format is: @smallexample (month "/" day "/" (substring year -2)) @@ -358,7 +352,7 @@ Lisp Reference Manual}) or the symbols @code{month}, @code{day}, @code{year}, @code{monthname}, and @code{dayname}. All these elements serve as patterns that match certain kinds of text in the diary file. -In order for the date pattern, as a whole, to match, all of its elements +In order for the date pattern as a whole to match, all of its elements must match consecutively. A regular expression in a date pattern matches in its usual fashion, @@ -387,8 +381,8 @@ @end example @noindent -Other default styles are provided by @code{diary-european-date-forms} -and @code{diary-iso-date-forms}. +The variables @code{diary-european-date-forms} and +@code{diary-iso-date-forms} provide other default styles. The date patterns in the list must be @emph{mutually exclusive} and must not match any portion of the diary entry itself, just the date and @@ -627,7 +621,7 @@ variables @code{diary-comment-start} and @code{diary-comment-end} to strings that delimit comments. The fancy display does not print comments. You might want to put meta-data for the use of other packages -(e.g. the appointment package, +(e.g.@: the appointment package, @iftex @pxref{Appointments,,,emacs, the Emacs Manual}) @end iftex @@ -711,7 +705,7 @@ @findex diary-cyclic @smallexample -%%(diary-cyclic 50 1 1 1990) Renew medication (%d%s time) +%%(diary-cyclic 50 1 1 2012) Renew medication (%d%s time) @end smallexample @noindent @@ -722,9 +716,9 @@ @end smallexample @noindent -in the fancy diary display on September 8, 1990. +in the fancy diary display on September 7, 2012. - There is an early reminder diary sexp that includes its entry in the + There is an ``early reminder'' diary sexp that includes its entry in the diary not only on the date of occurrence, but also on earlier dates. For example, if you want a reminder a week before your anniversary, you can use ------------------------------------------------------------ revno: 107319 committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-02-17 22:00:44 -0500 message: * doc/emacs/emacs-xtra.texi: Set encoding to ISO-8859-1. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-02-17 07:44:31 +0000 +++ doc/emacs/ChangeLog 2012-02-18 03:00:44 +0000 @@ -1,3 +1,7 @@ +2012-02-18 Glenn Morris + + * emacs-xtra.texi: Set encoding to ISO-8859-1. + 2012-02-17 Glenn Morris * maintaining.texi (Old Revisions): Fix cross-refs to Ediff manual. === modified file 'doc/emacs/emacs-xtra.texi' --- doc/emacs/emacs-xtra.texi 2012-01-19 07:21:25 +0000 +++ doc/emacs/emacs-xtra.texi 2012-02-18 03:00:44 +0000 @@ -34,6 +34,8 @@ @end quotation @end copying +@documentencoding ISO-8859-1 + @dircategory Emacs @direntry * Emacs-Xtra: (emacs-xtra). Specialized Emacs features. ------------------------------------------------------------ revno: 107318 committer: Tassilo Horn branch nick: trunk timestamp: Fri 2012-02-17 21:19:30 +0100 message: 2012-02-17 Tassilo Horn * saveplace.el (save-place-ignore-files-regexp): New variable allowing for excluding files from saving their location. The default value matches the temporary commit message editing files from Git, SVN, Bazaar, and Mercurial. (save-place-to-alist): Use it. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-17 15:44:32 +0000 +++ lisp/ChangeLog 2012-02-17 20:19:30 +0000 @@ -1,3 +1,11 @@ +2012-02-17 Tassilo Horn + + * saveplace.el (save-place-ignore-files-regexp): New variable + allowing for excluding files from saving their location of point. + The default value matches the temporary commit message editing + files from Git, SVN, Bazaar, and Mercurial. + (save-place-to-alist): Use it. + 2012-02-17 Lawrence Mitchell Stefan Monnier === modified file 'lisp/saveplace.el' --- lisp/saveplace.el 2012-01-19 07:21:25 +0000 +++ lisp/saveplace.el 2012-02-17 20:19:30 +0000 @@ -130,6 +130,13 @@ removable and network volumes." :type 'regexp :group 'save-place) +(defcustom save-place-ignore-files-regexp + "\\(?:COMMIT_EDITMSG\\|hg-editor-[[:alnum:]]+\\.txt\\|svn-commit\\.tmp\\|bzr_log\\.[[:alnum:]]+\\)$" + "Regexp matching files for which no location should be recorded. +Useful for temporary file such as commit message files that are +automatically created by the VCS." + :type 'regexp :group 'save-place) + (defun toggle-save-place (&optional parg) "Toggle whether to save your place in this file between sessions. If this mode is enabled, point is recorded when you kill the buffer @@ -160,20 +167,21 @@ ;; file. If not, do so, then feel free to modify the alist. It ;; will be saved again when Emacs is killed. (or save-place-loaded (load-save-place-alist-from-file)) - (if buffer-file-name - (progn - (let ((cell (assoc buffer-file-name save-place-alist)) - (position (if (not (eq major-mode 'hexl-mode)) - (point) - (with-no-warnings - (1+ (hexl-current-address)))))) - (if cell - (setq save-place-alist (delq cell save-place-alist))) - (if (and save-place - (not (= position 1))) ;; Optimize out the degenerate case. - (setq save-place-alist - (cons (cons buffer-file-name position) - save-place-alist))))))) + (when (and buffer-file-name + (not (string-match save-place-ignore-files-regexp + buffer-file-name))) + (let ((cell (assoc buffer-file-name save-place-alist)) + (position (if (not (eq major-mode 'hexl-mode)) + (point) + (with-no-warnings + (1+ (hexl-current-address)))))) + (if cell + (setq save-place-alist (delq cell save-place-alist))) + (if (and save-place + (not (= position 1))) ;; Optimize out the degenerate case. + (setq save-place-alist + (cons (cons buffer-file-name position) + save-place-alist)))))) (defun save-place-forget-unreadable-files () "Remove unreadable files from `save-place-alist'. ------------------------------------------------------------ revno: 107317 fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8150 author: Lawrence Mitchell committer: Stefan Monnier branch nick: trunk timestamp: Fri 2012-02-17 10:44:32 -0500 message: * lisp/newcomment.el (uncomment-region-default): Don't leave extra space when an arg is provided. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-17 13:05:20 +0000 +++ lisp/ChangeLog 2012-02-17 15:44:32 +0000 @@ -1,6 +1,12 @@ +2012-02-17 Lawrence Mitchell + Stefan Monnier + + * newcomment.el (uncomment-region-default): Don't leave extra space + when an arg is provided (bug#8150). + 2012-02-17 Teodor Zlatanov - * net/gnutls.el (gnutls-trustfiles): Fixed Cygwin bundle location. + * net/gnutls.el (gnutls-trustfiles): Fix Cygwin bundle location. 2012-02-17 Glenn Morris @@ -327,8 +333,8 @@ 2012-02-07 Alan Mackenzie - * progmodes/cc-engine.el (c-forward-objc-directive): Prevent - looping in "#pragma mark @implementation". + * progmodes/cc-engine.el (c-forward-objc-directive): + Prevent looping in "#pragma mark @implementation". 2012-02-07 Michael Albinus @@ -568,8 +574,8 @@ (Bug#10254). (bibtex-mode): Call bibtex-set-dialect via hack-local-variables-hook. - (bibtex-dialect): Update docstring. Add - safe-local-variable predicate. + (bibtex-dialect): Update docstring. + Add safe-local-variable predicate. (bibtex-entry-alist, bibtex-field-alist): Initialize via bibtex-set-dialect. (bibtex-mode-map): Define menu for each dialect. @@ -610,8 +616,8 @@ 2012-01-28 Phil Hagelberg - * emacs-lisp/package.el (package-install): Run - package-refresh-contents if there is no archive yet (Bug#9798). + * emacs-lisp/package.el (package-install): + Run package-refresh-contents if there is no archive yet (Bug#9798). 2012-01-28 Chong Yidong @@ -788,8 +794,8 @@ 2012-01-19 Martin Rudalics * window.el (window--state-get-1, window-state-get): Do not use - special state value for window-persistent-parameters. Rename - argument IGNORE to WRITABLE. Rewrite doc-string. + special state value for window-persistent-parameters. + Rename argument IGNORE to WRITABLE. Rewrite doc-string. (window--state-put-2): Reset all window parameters to nil before assigning values of persistent parameters. @@ -879,8 +885,8 @@ c-mask-paragraph, pass in `fill-paragraph' rather than `fill-region-as-paragraph'. (This is a reversion of a previous change.) - * progmodes/cc-mode.el (c-basic-common-init): Make - fill-paragraph-handle-comment buffer local and set it to nil. + * progmodes/cc-mode.el (c-basic-common-init): + Make fill-paragraph-handle-comment buffer local and set it to nil. 2012-01-13 Glenn Morris === modified file 'lisp/newcomment.el' --- lisp/newcomment.el 2012-01-19 07:21:25 +0000 +++ lisp/newcomment.el 2012-02-17 15:44:32 +0000 @@ -872,14 +872,15 @@ (when (and sre (looking-at (concat "\\s-*\n\\s-*" srei))) (goto-char (match-end 0))) (if (null arg) (delete-region (point-min) (point)) - (skip-syntax-backward " ") - (delete-char (- numarg)) - (unless (or (bobp) - (save-excursion (goto-char (point-min)) - (looking-at comment-start-skip))) - ;; If there's something left but it doesn't look like - ;; a comment-start any more, just remove it. - (delete-region (point-min) (point)))) + (let* ((opoint (point-marker)) + (nchar (skip-syntax-backward " "))) + (delete-char (- numarg)) + (unless (and (not (bobp)) + (save-excursion (goto-char (point-min)) + (looking-at comment-start-skip))) + ;; If there's something left but it doesn't look like + ;; a comment-start any more, just remove it. + (delete-region (point-min) opoint)))) ;; Remove the end-comment (and leading padding and such). (goto-char (point-max)) (comment-enter-backward) ------------------------------------------------------------ revno: 107316 fixes bug(s): http://debbugs.gnu.org/10833 committer: Chong Yidong branch nick: trunk timestamp: Fri 2012-02-17 22:01:05 +0800 message: Clarify doc of scan-lists. * doc/lispref/syntax.texi (Motion via Parsing): Doc fix for scan-lists. * src/syntax.c (Fscan_lists): Doc fix. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2012-02-17 07:44:31 +0000 +++ doc/lispref/ChangeLog 2012-02-17 14:01:05 +0000 @@ -1,3 +1,7 @@ +2012-02-17 Chong Yidong + + * syntax.texi (Motion via Parsing): Doc fix for scan-lists. + 2012-02-17 Glenn Morris * hooks.texi (Standard Hooks): Fix cross-ref to Emacs manual. === modified file 'doc/lispref/syntax.texi' --- doc/lispref/syntax.texi 2012-02-16 14:43:41 +0000 +++ doc/lispref/syntax.texi 2012-02-17 14:01:05 +0000 @@ -646,25 +646,25 @@ based on parsing expressions. @defun scan-lists from count depth -This function scans forward @var{count} balanced parenthetical groupings -from position @var{from}. It returns the position where the scan stops. -If @var{count} is negative, the scan moves backwards. +This function scans forward @var{count} balanced parenthetical +groupings 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, 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. +If @var{depth} is nonzero, treat the starting position as being +@var{depth} parentheses deep. The scanner moves forward or backward +through the buffer until the depth changes to zero @var{count} times. +Hence, a positive value for @var{depth} has the effect of moving out +@var{depth} levels of parenthesis from the starting position, while 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}. -If the scan reaches the beginning or end of the buffer (or its -accessible portion), and the depth is not zero, an error is signaled. -If the depth is zero but the count is not used up, @code{nil} is -returned. +If the scan reaches the beginning or end of the accessible part of the +buffer before it has scanned over @var{count} parenthetical groupings, +the return value is @code{nil} if the depth at that point is zero; if +the depth is non-zero, a @code{scan-error} error is signaled. @end defun @defun scan-sexps from count === modified file 'src/ChangeLog' --- src/ChangeLog 2012-02-15 06:40:08 +0000 +++ src/ChangeLog 2012-02-17 14:01:05 +0000 @@ -1,3 +1,7 @@ +2012-02-17 Chong Yidong + + * syntax.c (Fscan_lists): Doc fix (Bug#10833). + 2012-02-15 Paul Eggert * image.c (MAX_IMAGE_SIZE): Increase from 6.0 to 10.0; see === modified file 'src/syntax.c' --- src/syntax.c 2012-01-19 07:21:25 +0000 +++ src/syntax.c 2012-02-17 14:01:05 +0000 @@ -2844,18 +2844,23 @@ DEFUN ("scan-lists", Fscan_lists, Sscan_lists, 3, 3, 0, doc: /* Scan from character number FROM by COUNT lists. -Returns the character number of the position thus found. - -If DEPTH is nonzero, paren depth begins counting from that value, -only places where the depth in parentheses becomes zero -are candidates for stopping; COUNT such places are counted. -Thus, a positive value for DEPTH means go out levels. +Scan forward if COUNT is positive, backward if COUNT is negative. +Return the character number of the position thus found. + +A \"list", in this context, refers to a balanced parenthetical +grouping, as determined by the syntax table. + +If DEPTH is nonzero, treat that as the nesting depth of the starting +point (i.e. the starting point is DEPTH parentheses deep). This +function scans over parentheses until the depth goes to zero COUNT +times. Hence, positive DEPTH moves out that number of levels of +paretheses, while negative DEPTH moves to a deeper level. Comments are ignored if `parse-sexp-ignore-comments' is non-nil. -If the beginning or end of (the accessible part of) the buffer is reached -and the depth is wrong, an error is signaled. -If the depth is right but the count is not used up, nil is returned. */) +If we reach the beginning or end of the accessible part of the buffer +before we have scanned over COUNT lists, return nil if the depth at +that point is zero, and signal a error if the depth is nonzero. */) (Lisp_Object from, Lisp_Object count, Lisp_Object depth) { CHECK_NUMBER (from); ------------------------------------------------------------ revno: 107315 committer: Ted Zlatanov branch nick: quickfixes timestamp: Fri 2012-02-17 08:05:20 -0500 message: * net/gnutls.el (gnutls-trustfiles): Fixed Cygwin bundle location. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-17 08:19:12 +0000 +++ lisp/ChangeLog 2012-02-17 13:05:20 +0000 @@ -1,3 +1,7 @@ +2012-02-17 Teodor Zlatanov + + * net/gnutls.el (gnutls-trustfiles): Fixed Cygwin bundle location. + 2012-02-17 Glenn Morris * net/socks.el: Require network-stream. (Bug#10599) === modified file 'lisp/net/gnutls.el' --- lisp/net/gnutls.el 2012-02-14 13:13:24 +0000 +++ lisp/net/gnutls.el 2012-02-17 13:05:20 +0000 @@ -56,7 +56,7 @@ "/etc/ssl/certs/ca-certificates.crt" ; Debian, Ubuntu, Gentoo and Arch Linux "/etc/pki/tls/certs/ca-bundle.crt" ; Fedora and RHEL "/etc/ssl/ca-bundle.pem" ; Suse - "/usr/ssl/cert/ca-bundle.crt" ; Cygwin + "/usr/ssl/certs/ca-bundle.crt" ; Cygwin ) "List of CA bundle location filenames or a function returning said list. The files may be in PEM or DER format, as per the GnuTLS documentation. ------------------------------------------------------------ revno: 107314 fixes bug(s): http://debbugs.gnu.org/10599 committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-02-17 00:19:12 -0800 message: * lisp/net/socks.el: Require network-stream. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-17 07:33:15 +0000 +++ lisp/ChangeLog 2012-02-17 08:19:12 +0000 @@ -1,3 +1,7 @@ +2012-02-17 Glenn Morris + + * net/socks.el: Require network-stream. (Bug#10599) + 2012-02-17 Kenichi Handa * international/charprop.el: === modified file 'lisp/net/socks.el' --- lisp/net/socks.el 2012-01-19 07:21:25 +0000 +++ lisp/net/socks.el 2012-02-17 08:19:12 +0000 @@ -35,6 +35,8 @@ (require 'wid-edit)) (require 'custom) +;; FIXME this is bad practice, and who is it for anyway, since Emacs +;; has split-string since at least 21.1. (if (not (fboundp 'split-string)) (defun split-string (string &optional pattern) "Return a list of substrings of STRING which are separated by PATTERN. @@ -335,10 +337,17 @@ (declare-function socks-original-open-network-stream "socks") ; fset +;; FIXME this is a terrible idea. +;; It is not even compatible with the argument spec of open-network-stream +;; in 24.1. If this is really necessary, open-network-stream +;; could get a wrapper hook, or defer to open-network-stream-function. + (defvar socks-override-functions nil "*Whether to overwrite the open-network-stream function with the SOCKSified version.") +(require 'network-stream) + (if (fboundp 'socks-original-open-network-stream) nil ; Do nothing, we've been here already (defalias 'socks-original-open-network-stream ------------------------------------------------------------ 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