Now on revision 105949. Conflicting tags: mh-e-doc-8.3 mh-e-8.3 ------------------------------------------------------------ revno: 105949 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2011-09-28 09:03:55 +0000 message: gnus-uu.el (gnus-uu-grab-articles): Require gnus-async so that `gnus-asynchronous' isn't shadowed. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-09-27 06:01:27 +0000 +++ lisp/gnus/ChangeLog 2011-09-28 09:03:55 +0000 @@ -3,6 +3,11 @@ * plstore.el (plstore-select-keys, plstore-encrypt-to): Clarify documentation. +2011-09-27 Lars Magne Ingebrigtsen + + * gnus-uu.el (gnus-uu-grab-articles): Require gnus-async so that + `gnus-asynchronous' isn't shadowed. + 2011-09-26 Lars Magne Ingebrigtsen * nnimap.el (nnimap-wait-for-response): Message less (bug#9540). === modified file 'lisp/gnus/gnus-uu.el' --- lisp/gnus/gnus-uu.el 2011-03-06 00:08:33 +0000 +++ lisp/gnus/gnus-uu.el 2011-09-28 09:03:55 +0000 @@ -1290,6 +1290,7 @@ ;; the process-function has been successful and nil otherwise. (defun gnus-uu-grab-articles (articles process-function &optional sloppy limit no-errors) + (require 'gnus-async) (let ((state 'first) (gnus-asynchronous nil) (gnus-inhibit-treatment t) ------------------------------------------------------------ revno: 105948 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2011-09-27 22:19:56 -0400 message: * lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): Don't confuse "y => 3" as the beginning of a `y' operation. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-28 01:20:41 +0000 +++ lisp/ChangeLog 2011-09-28 02:19:56 +0000 @@ -1,5 +1,8 @@ 2011-09-28 Stefan Monnier + * progmodes/perl-mode.el (perl-syntax-propertize-function): + Don't confuse "y => 3" as the beginning of a `y' operation. + * emacs-lisp/debug.el (debug-convert-byte-code): Don't assume the object has more than 4 slots (bug#9613). === modified file 'lisp/progmodes/perl-mode.el' --- lisp/progmodes/perl-mode.el 2011-05-08 18:23:11 +0000 +++ lisp/progmodes/perl-mode.el 2011-09-28 02:19:56 +0000 @@ -304,11 +304,12 @@ (put-text-property (match-beginning 2) (match-end 2) 'syntax-table (string-to-syntax "\"")) (perl-syntax-propertize-special-constructs end))))) - ("\\(^\\|[?:.,;=!~({[ \t]\\)\\([msy]\\|q[qxrw]?\\|tr\\)\\>\\s-*\\([^])}> \n\t]\\)" + ("\\(^\\|[?:.,;=!~({[ \t]\\)\\([msy]\\|q[qxrw]?\\|tr\\)\\>\\s-*\\(?:\\([^])}>= \n\t]\\)\\|\\(?3:=\\)[^>]\\)" ;; Nasty cases: ;; /foo/m $a->m $#m $m @m %m ;; \s (appears often in regexps). ;; -s file + ;; y => 3 ;; sub tr {...} (3 (ignore (if (save-excursion (goto-char (match-beginning 0)) ------------------------------------------------------------ revno: 105947 fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9613 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2011-09-27 21:20:41 -0400 message: * lisp/emacs-lisp/debug.el (debug-convert-byte-code): Don't assume the object has more than 4 slots. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-28 00:59:28 +0000 +++ lisp/ChangeLog 2011-09-28 01:20:41 +0000 @@ -1,3 +1,8 @@ +2011-09-28 Stefan Monnier + + * emacs-lisp/debug.el (debug-convert-byte-code): Don't assume the + object has more than 4 slots (bug#9613). + 2011-09-28 Juanma Barranquero * subr.el (with-output-to-temp-buffer): === modified file 'lisp/emacs-lisp/debug.el' --- lisp/emacs-lisp/debug.el 2011-09-19 21:14:23 +0000 +++ lisp/emacs-lisp/debug.el 2011-09-28 01:20:41 +0000 @@ -869,8 +869,10 @@ ,defn ,@(remq '&rest (remq '&optional args)))))) (if (> (length defn) 5) + ;; The mere presence of field 5 is sufficient to make + ;; it interactive. (push `(interactive ,(aref defn 5)) body)) - (if (aref defn 4) + (if (and (> (length defn) 4) (aref defn 4)) ;; Use `documentation' here, to get the actual string, ;; in case the compiled function has a reference ;; to the .elc file. ------------------------------------------------------------ revno: 105946 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2011-09-28 02:59:28 +0200 message: Fix typos. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-09-25 15:08:25 +0000 +++ doc/lispref/ChangeLog 2011-09-28 00:59:28 +0000 @@ -1,3 +1,7 @@ +2011-09-28 Juanma Barranquero + + * windows.texi (Splitting Windows): Fix typos. + 2011-09-25 Martin Rudalics * windows.texi (Windows and Frames, Display Action Functions) === modified file 'doc/lispref/windows.texi' --- doc/lispref/windows.texi 2011-09-25 15:08:25 +0000 +++ doc/lispref/windows.texi 2011-09-28 00:59:28 +0000 @@ -1178,7 +1178,7 @@ penultimate configuration from the previous scenario from where we can continue as described before. - Another strategy starts with splitting an inital window @code{W6} by + Another strategy starts with splitting an initial window @code{W6} by evaluating @code{(split-window W6 nil nil t)} with the following result: @smallexample @group @@ -1259,11 +1259,11 @@ @defopt window-splits If this variable is nil, the function @code{split-window} can split a window if and only if that window's screen estate is sufficiently large -to accomodate both--itself and the new window. +to accommodate both--itself and the new window. If this variable is non-@code{nil}, @code{split-window} tries to resize all windows that are part of the same combination as the old window to -accomodate the new window. Hence, the new window can be also created if +accommodate the new window. Hence, the new window can be also created if the old window is of fixed size or too small to split (@pxref{Window Sizes}). === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-27 18:51:05 +0000 +++ lisp/ChangeLog 2011-09-28 00:59:28 +0000 @@ -1,3 +1,9 @@ +2011-09-28 Juanma Barranquero + + * subr.el (with-output-to-temp-buffer): + * net/quickurl.el (quickurl, quickurl-browse-url): + Fix typos in docstrings. + 2011-09-27 Eli Zaretskii * minibuffer.el (completion-styles) === modified file 'lisp/ChangeLog.13' --- lisp/ChangeLog.13 2011-01-25 04:08:28 +0000 +++ lisp/ChangeLog.13 2011-09-28 00:59:28 +0000 @@ -1743,7 +1743,7 @@ auto-composition-function to it. (toggle-auto-composition): New function. - * international/characters.el: Make all chararacters in the + * international/characters.el: Make all characters in the charset tibetan to tibetan script. * international/mule-conf.el (tibetan): Fix :code-space property. === modified file 'lisp/net/quickurl.el' --- lisp/net/quickurl.el 2011-08-25 05:43:57 +0000 +++ lisp/net/quickurl.el 2011-09-28 00:59:28 +0000 @@ -307,7 +307,7 @@ "Insert a URL based on LOOKUP. If not supplied LOOKUP is taken to be the word at point in the current -buffer, this default action can be modifed via +buffer, this default action can be modified via `quickurl-grab-lookup-function'." (interactive) (when (or lookup @@ -402,7 +402,7 @@ "Browse the URL associated with LOOKUP. If not supplied LOOKUP is taken to be the word at point in the -current buffer, this default action can be modifed via +current buffer, this default action can be modified via `quickurl-grab-lookup-function'." (interactive) (when (or lookup === modified file 'lisp/subr.el' --- lisp/subr.el 2011-09-23 14:32:36 +0000 +++ lisp/subr.el 2011-09-28 00:59:28 +0000 @@ -3002,7 +3002,7 @@ generated with `prin1' and similar functions in BODY goes into the buffer. -At the end of BODY, this marks buffer BUFNAME unmodifed and displays +At the end of BODY, this marks buffer BUFNAME unmodified and displays it in a window, but does not select it. The normal way to do this is by calling `display-buffer', then running `temp-buffer-show-hook'. However, if `temp-buffer-show-function' is non-nil, it calls that === modified file 'src/ChangeLog' --- src/ChangeLog 2011-09-27 17:18:31 +0000 +++ src/ChangeLog 2011-09-28 00:59:28 +0000 @@ -1,3 +1,7 @@ +2011-09-28 Juanma Barranquero + + * lread.c (Fread_from_string): Fix typo in docstring. + 2011-09-27 Eli Zaretskii * xdisp.c (handle_invisible_prop): If invisible text ends on a === modified file 'src/ChangeLog.11' --- src/ChangeLog.11 2011-09-26 03:20:03 +0000 +++ src/ChangeLog.11 2011-09-28 00:59:28 +0000 @@ -4547,7 +4547,7 @@ * composite.c (composition_compute_stop_pos): In forward search, pay attention to the possibility that some character after ENDPOS - will be composed with charactrs before ENDPOS. + will be composed with characters before ENDPOS. 2010-08-24 Chong Yidong === modified file 'src/ChangeLog.9' --- src/ChangeLog.9 2011-06-30 02:56:57 +0000 +++ src/ChangeLog.9 2011-09-28 00:59:28 +0000 @@ -10460,7 +10460,7 @@ (Fkey_description): Likewise. * lread.c (read1): On reading multibyte string, be sure to make - all 8-bit chararacters in valid multibyte form. + all 8-bit characters in valid multibyte form. (readchar): Use FETCH_STRING_CHAR_ADVANCE unconditionally. * print.c (print_object): Use FETCH_STRING_CHAR_ADVANCE === modified file 'src/lread.c' --- src/lread.c 2011-09-27 08:37:07 +0000 +++ src/lread.c 2011-09-28 00:59:28 +0000 @@ -1966,7 +1966,7 @@ doc: /* Read one Lisp expression which is represented as text by STRING. Returns a cons: (OBJECT-READ . FINAL-STRING-INDEX). FINAL-STRING-INDEX is an integer giving the position of the next - remaining chararacter in STRING. + remaining character in STRING. START and END optionally delimit a substring of STRING from which to read; they default to 0 and (length STRING) respectively. */) (Lisp_Object string, Lisp_Object start, Lisp_Object end) ------------------------------------------------------------ revno: 105945 [merge] committer: Ulf Jasper branch nick: trunk timestamp: Tue 2011-09-27 21:17:33 +0200 message: Move test/newsticker-testsuite.el to automated/newsticker-tests.el 2011-09-27 Ulf Jasper * automated/newsticker-tests.el: Move newsticker-testsuite.el to automated/newsticker-tests.el. Convert to ERT. diff: === modified file 'test/ChangeLog' --- test/ChangeLog 2011-07-26 15:36:04 +0000 +++ test/ChangeLog 2011-09-27 18:52:00 +0000 @@ -1,3 +1,8 @@ +2011-09-27 Ulf Jasper + + * automated/newsticker-tests.el: Move newsticker-testsuite.el + to automated/newsticker-tests.el. Convert to ERT. + 2011-07-26 Ulf Jasper * automated/icalendar-tests.el (icalendar-tests--compare-strings): === renamed file 'test/newsticker-testsuite.el' => 'test/automated/newsticker-tests.el' --- test/newsticker-testsuite.el 2011-01-25 04:08:28 +0000 +++ test/automated/newsticker-tests.el 2011-09-27 18:52:00 +0000 @@ -3,12 +3,7 @@ ;; Copyright (C) 2003-2011 Free Software Foundation, Inc. ;; Author: Ulf Jasper -;; Filename: newsticker-testsuite.el -;; URL: http://www.nongnu.org/newsticker ;; Keywords: News, RSS, Atom -;; Time-stamp: "14. Juni 2008, 12:09:39 (ulf)" - -;; ====================================================================== ;; This file is part of GNU Emacs. @@ -25,42 +20,26 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see . -;; ====================================================================== - ;;; Commentary: ;;; Code: -(require 'cl) ; assert - -;; ====================================================================== -;; Entry point -;; ====================================================================== -(defun newsticker--testsuite () - "Unit test for newsticker. -Subtests signal errors if something goes wrong." - (interactive) - (newsticker--test--guid) - (newsticker--test--cache-contains) - (newsticker--test--decode-iso8601-date) - (newsticker--test--decode-rfc822-date) - (newsticker--test--group-manage-orphan-feeds) - (message "All tests passed successfully.")) +(require 'ert) +(require 'newsticker) ;; ====================================================================== ;; Tests for newsticker-backend ;; ====================================================================== -(defun newsticker--test--guid () - "Test `newsticker-guid-*'. +(ert-deftest newsticker--guid () + "Test for `newsticker--guid-*'. Signals an error if something goes wrong." - (assert (string= "blah" (newsticker--guid-to-string "blah"))) - (assert (string= "myguid" (newsticker--guid '("title1" "description1" "link1" + (should (string= "blah" (newsticker--guid-to-string "blah"))) + (should (string= "myguid" (newsticker--guid '("title1" "description1" "link1" nil 'new 42 nil nil ((guid () "myguid"))))))) -(defun newsticker--test--cache-contains () - "Test `newsticker--test--cache-contains'. -Signals an error if something goes wrong." +(ert-deftest newsticker--cache-contains () + "Test for `newsticker--cache-contains'." (let ((newsticker--cache '((feed1 ("title1" "description1" "link1" nil 'new 42 nil nil ((guid () "myguid"))))))) @@ -68,78 +47,68 @@ (assoc 'guid (newsticker--extra '("title1" "description1" "link1" nil 'new 42 nil nil ((guid "myguid")))))) - (assert (newsticker--cache-contains newsticker--cache 'feed1 "WRONGTITLE" + (should (newsticker--cache-contains newsticker--cache 'feed1 "WRONGTITLE" "description1" "link1" 'new "myguid")) - (assert (not (newsticker--cache-contains newsticker--cache 'feed1 "title1" + (should (not (newsticker--cache-contains newsticker--cache 'feed1 "title1" "description1" "link1" 'new "WRONG GUID"))) - (assert (newsticker--cache-contains newsticker--cache 'feed1 "title1" + (should (newsticker--cache-contains newsticker--cache 'feed1 "title1" "description1" "link1" 'new "myguid"))) (let ((newsticker--cache '((feed1 ("title1" "description1" "link1" nil 'new 42 nil nil ((guid () "myguid1"))) ("title1" "description1" "link1" nil 'new 42 nil nil ((guid () "myguid2"))))))) - (assert (not (newsticker--cache-contains newsticker--cache 'feed1 "title1" + (should (not (newsticker--cache-contains newsticker--cache 'feed1 "title1" "description1" "link1" 'new "myguid"))) - (assert (string= "myguid1" + (should (string= "myguid1" (newsticker--guid (newsticker--cache-contains newsticker--cache 'feed1 "title1" "description1" "link1" 'new "myguid1")))) - (assert (string= "myguid2" + (should (string= "myguid2" (newsticker--guid (newsticker--cache-contains newsticker--cache 'feed1 "title1" "description1" "link1" 'new "myguid2")))))) -(defun newsticker--do-test--decode-iso8601-date (input expected) +(defun newsticker-tests--decode-iso8601-date (input expected) "Actually test `newsticker--decode-iso8601-date'. -Signals an error if iso8601-encoded INPUT does not match EXPECTED." +Apply to INPUT and compare with EXPECTED." (let ((result (format-time-string "%Y-%m-%dT%H:%M:%S" (newsticker--decode-iso8601-date input) t))) - (assert (string= result expected) - nil "Error decoding '%s': found '%s' but expected '%s'." - input result expected))) + (should (string= result expected)))) -(defun newsticker--test--decode-iso8601-date () +(ert-deftest newsticker--decode-iso8601-date () "Test `newsticker--decode-iso8601-date'." - (newsticker--decode-iso8601-date "2004-09-17T05:09:49+00:00") - (newsticker--decode-iso8601-date "2004-09-17T05:09+00:00") - (newsticker--decode-iso8601-date "2004-09-17T05:09:49") - (newsticker--decode-iso8601-date "2004-09-17T05:09") - (newsticker--decode-iso8601-date "2004-09-17") - (newsticker--decode-iso8601-date "2004-09") - (newsticker--do-test--decode-iso8601-date "2004" - "2004-01-01T00:00:00") - (newsticker--do-test--decode-iso8601-date "2004-09" - "2004-09-01T00:00:00") - (newsticker--do-test--decode-iso8601-date "2004-09-17" - "2004-09-17T00:00:00") - (newsticker--do-test--decode-iso8601-date "2004-09-17T05:09" - "2004-09-17T05:09:00") - (newsticker--do-test--decode-iso8601-date "2004-09-17T05:09:49" - "2004-09-17T05:09:49") - (newsticker--do-test--decode-iso8601-date "2004-09-17T05:09:49.123" - "2004-09-17T05:09:49") - (newsticker--do-test--decode-iso8601-date "2004-09-17T05:09+01:00" - "2004-09-17T04:09:00") - (newsticker--do-test--decode-iso8601-date "2004-09-17T05:09-02:00" - "2004-09-17T07:09:00")) + (newsticker-tests--decode-iso8601-date "2004" + "2004-01-01T00:00:00") + (newsticker-tests--decode-iso8601-date "2004-09" + "2004-09-01T00:00:00") + (newsticker-tests--decode-iso8601-date "2004-09-17" + "2004-09-17T00:00:00") + (newsticker-tests--decode-iso8601-date "2004-09-17T05:09" + "2004-09-17T05:09:00") + (newsticker-tests--decode-iso8601-date "2004-09-17T05:09:49" + "2004-09-17T05:09:49") + (newsticker-tests--decode-iso8601-date "2004-09-17T05:09:49.123" + "2004-09-17T05:09:49") + (newsticker-tests--decode-iso8601-date "2004-09-17T05:09+01:00" + "2004-09-17T04:09:00") + (newsticker-tests--decode-iso8601-date "2004-09-17T05:09-02:00" + "2004-09-17T07:09:00")) (defun newsticker--do-test--decode-rfc822-date (input expected) "Actually test `newsticker--decode-rfc822-date'. -Signals an error if rfc822-encoded INPUT does not match EXPECTED." +Apply to INPUT and compare with EXPECTED." (let ((result (format-time-string "%Y-%m-%dT%H:%M:%S" (newsticker--decode-rfc822-date input) t))) - (assert (string= result expected) - nil "Error decoding '%s': found '%s' but expected '%s'." - input result expected))) + (should (string= result expected)))) -(defun newsticker--test--decode-rfc822-date () +(ert-deftest newsticker--decode-rfc822-date () "Test `newsticker--decode-rfc822-date'." (newsticker--do-test--decode-rfc822-date "Mon, 10 Mar 2008 19:27:52 +0100" "2008-03-10T18:27:52") @@ -164,16 +133,16 @@ ;; ====================================================================== ;; Tests for newsticker-treeview ;; ====================================================================== -(defun newsticker--test--group-manage-orphan-feeds () +(ert-deftest newsticker--group-manage-orphan-feeds () "Test `newsticker--group-manage-orphan-feeds'. Signals an error if something goes wrong." (let ((newsticker-groups '("Feeds")) (newsticker-url-list-defaults nil) (newsticker-url-list '(("feed1") ("feed2") ("feed3")))) (newsticker--group-manage-orphan-feeds) - (assert (equal '("Feeds" "feed3" "feed2" "feed1") + (should (equal '("Feeds" "feed3" "feed2" "feed1") newsticker-groups)))) -(provide 'newsticker-testsuite) +(provide 'newsticker-tests) -;;; newsticker-testsuite.el ends here +;;; newsticker-tests.el ends here ------------------------------------------------------------ revno: 105944 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2011-09-27 21:51:05 +0300 message: Improve doc strings for completion styles. lisp/minibuffer.el (completion-styles) (completion-category-overrides): Cross reference each other in doc strings. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-27 18:09:43 +0000 +++ lisp/ChangeLog 2011-09-27 18:51:05 +0000 @@ -1,3 +1,9 @@ +2011-09-27 Eli Zaretskii + + * minibuffer.el (completion-styles) + (completion-category-overrides): Cross reference each other in doc + strings. + 2011-09-27 Glenn Morris * pcmpl-cvs.el (pcmpl-cvs-entries): Update for Emacs 22.1 changes === modified file 'lisp/minibuffer.el' --- lisp/minibuffer.el 2011-09-20 01:06:29 +0000 +++ lisp/minibuffer.el 2011-09-27 18:51:05 +0000 @@ -482,7 +482,10 @@ ;; and simply add "bar" to the end of the result. emacs22) "List of completion styles to use. -The available styles are listed in `completion-styles-alist'." +The available styles are listed in `completion-styles-alist'. + +Note that `completion-category-overrides' may override these +styles for specific categories, such as files, buffers, etc." :type `(repeat (choice ,@(mapcar (lambda (x) (list 'const (car x))) completion-styles-alist))) :group 'minibuffer @@ -490,7 +493,7 @@ (defcustom completion-category-overrides '((buffer (styles . (basic substring)))) - "List of overrides for specific categories. + "List of `completion-styles' overrides for specific categories. Each override has the shape (CATEGORY . ALIST) where ALIST is an association list that can specify properties such as: - `styles': the list of `completion-styles' to use for that category. ------------------------------------------------------------ revno: 105943 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-09-27 14:09:43 -0400 message: pcmpl-cvs.el fix for bug#9606 * lisp/pcmpl-cvs.el (pcmpl-cvs-entries): Update for Emacs 22.1 changes to split-string. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-27 17:45:18 +0000 +++ lisp/ChangeLog 2011-09-27 18:09:43 +0000 @@ -1,3 +1,8 @@ +2011-09-27 Glenn Morris + + * pcmpl-cvs.el (pcmpl-cvs-entries): Update for Emacs 22.1 changes + to split-string. (Bug#9606) + 2011-09-27 Lars Magne Ingebrigtsen * mail/smtpmail.el (smtpmail-via-smtp): Fix STARTTLS detection === modified file 'lisp/pcmpl-cvs.el' --- lisp/pcmpl-cvs.el 2011-01-25 04:08:28 +0000 +++ lisp/pcmpl-cvs.el 2011-09-27 18:09:43 +0000 @@ -169,13 +169,13 @@ (insert-file-contents (concat dir "CVS/Entries")) (goto-char (point-min)) (while (not (eobp)) - (let* ((line (buffer-substring (line-beginning-position) - (line-end-position))) - (fields (split-string line "/")) - text) - (if (eq (aref line 0) ?/) - (setq fields (cons "" fields))) - (setq text (nth 1 fields)) + ;; Normal file: /NAME -> "" "NAME" + ;; Directory : D/NAME -> "D" "NAME" + (let* ((fields (split-string (buffer-substring + (line-beginning-position) + (line-end-position)) + "/")) + (text (nth 1 fields))) (when text (if (string= (nth 0 fields) "D") (setq text (file-name-as-directory text))) ------------------------------------------------------------ revno: 105942 fixes bug(s): http://debbugs.gnu.org/9615 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Tue 2011-09-27 19:45:18 +0200 message: * mail/smtpmail.el (smtpmail-via-smtp): Fix STARTTLS detection. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-27 15:58:13 +0000 +++ lisp/ChangeLog 2011-09-27 17:45:18 +0000 @@ -1,3 +1,8 @@ +2011-09-27 Lars Magne Ingebrigtsen + + * mail/smtpmail.el (smtpmail-via-smtp): Fix STARTTLS detection + (bug#9615). + 2011-09-27 Chong Yidong * emacs-lisp/package.el (list-packages): Fix echo area message. === modified file 'lisp/mail/smtpmail.el' --- lisp/mail/smtpmail.el 2011-09-18 07:36:20 +0000 +++ lisp/mail/smtpmail.el 2011-09-27 17:45:18 +0000 @@ -658,7 +658,7 @@ :always-query-capabilities t :starttls-function (lambda (capabilities) - (and (string-match "-STARTTLS" capabilities) + (and (string-match "[ -]STARTTLS" capabilities) "STARTTLS\r\n")) :client-certificate t :use-starttls-if-possible t))) ------------------------------------------------------------ revno: 105941 fixes bug(s): http://debbugs.gnu.org/9610 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2011-09-27 20:18:31 +0300 message: Fix bug #9610 with slow cursor motion in buffers with invisible text. src/xdisp.c (handle_invisible_prop): If invisible text ends on a newline, reseat the iterator instead of bidi-iterating there one character at a time. (Bug#9610) (BUFFER_POS_REACHED_P, move_it_in_display_line_to): Bail when past TO_CHARPOS if the bidi iterator is at base embedding level. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-09-27 08:37:07 +0000 +++ src/ChangeLog 2011-09-27 17:18:31 +0000 @@ -1,3 +1,11 @@ +2011-09-27 Eli Zaretskii + + * xdisp.c (handle_invisible_prop): If invisible text ends on a + newline, reseat the iterator instead of bidi-iterating there one + character at a time. (Bug#9610) + (BUFFER_POS_REACHED_P, move_it_in_display_line_to): Bail when past + TO_CHARPOS if the bidi iterator is at base embedding level. + 2011-09-27 Andreas Schwab * lread.c (readevalloop): Use correct code for NBSP. === modified file 'src/xdisp.c' --- src/xdisp.c 2011-09-24 16:28:25 +0000 +++ src/xdisp.c 2011-09-27 17:18:31 +0000 @@ -4056,40 +4056,67 @@ /* The position newpos is now either ZV or on visible text. */ if (it->bidi_p && newpos < ZV) { - /* With bidi iteration, the region of invisible text - could start and/or end in the middle of a non-base - embedding level. Therefore, we need to skip - invisible text using the bidi iterator, starting at - IT's current position, until we find ourselves - outside the invisible text. Skipping invisible text - _after_ bidi iteration avoids affecting the visual - order of the displayed text when invisible properties - are added or removed. */ - if (it->bidi_it.first_elt && it->bidi_it.charpos < ZV) - { - /* If we were `reseat'ed to a new paragraph, - determine the paragraph base direction. We need - to do it now because next_element_from_buffer may - not have a chance to do it, if we are going to - skip any text at the beginning, which resets the - FIRST_ELT flag. */ - bidi_paragraph_init (it->paragraph_embedding, - &it->bidi_it, 1); - } - do - { - bidi_move_to_visually_next (&it->bidi_it); - } - while (it->stop_charpos <= it->bidi_it.charpos - && it->bidi_it.charpos < newpos); - IT_CHARPOS (*it) = it->bidi_it.charpos; - IT_BYTEPOS (*it) = it->bidi_it.bytepos; - /* If we overstepped NEWPOS, record its position in the - iterator, so that we skip invisible text if later the - bidi iteration lands us in the invisible region - again. */ - if (IT_CHARPOS (*it) >= newpos) - it->prev_stop = newpos; + EMACS_INT bpos = CHAR_TO_BYTE (newpos); + + if (FETCH_BYTE (bpos) == '\n' + || (newpos > BEGV && FETCH_BYTE (bpos - 1) == '\n')) + { + /* If the invisible text ends on a newline or the + character after a newline, we can avoid the + costly, character by character, bidi iteration to + newpos, and instead simply reseat the iterator + there. That's because all bidi reordering + information is tossed at the newline. This is a + big win for modes that hide complete lines, like + Outline, Org, etc. (Implementation note: the + call to reseat_1 is necessary, because it signals + to the bidi iterator that it needs to reinit its + internal information when the next element for + display is requested. */ + struct text_pos tpos; + + SET_TEXT_POS (tpos, newpos, bpos); + reseat_1 (it, tpos, 0); + } + else /* Must use the slow method. */ + { + /* With bidi iteration, the region of invisible text + could start and/or end in the middle of a + non-base embedding level. Therefore, we need to + skip invisible text using the bidi iterator, + starting at IT's current position, until we find + ourselves outside the invisible text. Skipping + invisible text _after_ bidi iteration avoids + affecting the visual order of the displayed text + when invisible properties are added or + removed. */ + if (it->bidi_it.first_elt && it->bidi_it.charpos < ZV) + { + /* If we were `reseat'ed to a new paragraph, + determine the paragraph base direction. We + need to do it now because + next_element_from_buffer may not have a + chance to do it, if we are going to skip any + text at the beginning, which resets the + FIRST_ELT flag. */ + bidi_paragraph_init (it->paragraph_embedding, + &it->bidi_it, 1); + } + do + { + bidi_move_to_visually_next (&it->bidi_it); + } + while (it->stop_charpos <= it->bidi_it.charpos + && it->bidi_it.charpos < newpos); + IT_CHARPOS (*it) = it->bidi_it.charpos; + IT_BYTEPOS (*it) = it->bidi_it.bytepos; + /* If we overstepped NEWPOS, record its position in + the iterator, so that we skip invisible text if + later the bidi iteration lands us in the + invisible region again. */ + if (IT_CHARPOS (*it) >= newpos) + it->prev_stop = newpos; + } } else { @@ -7880,7 +7907,9 @@ ((op & MOVE_TO_POS) != 0 \ && BUFFERP (it->object) \ && (IT_CHARPOS (*it) == to_charpos \ - || (!it->bidi_p && IT_CHARPOS (*it) > to_charpos) \ + || ((!it->bidi_p \ + || BIDI_AT_BASE_LEVEL (it->bidi_it)) \ + && IT_CHARPOS (*it) > to_charpos) \ || (it->what == IT_COMPOSITION \ && ((IT_CHARPOS (*it) > to_charpos \ && to_charpos >= it->cmp_it.charpos) \ @@ -7912,7 +7941,13 @@ if ((op & MOVE_TO_POS) != 0 && BUFFERP (it->object) && it->method == GET_FROM_BUFFER - && ((!it->bidi_p && IT_CHARPOS (*it) > to_charpos) + && (((!it->bidi_p + /* When the iterator is at base embedding level, we + are guaranteed that characters are delivered for + display in strictly increasing order of their + buffer positions. */ + || BIDI_AT_BASE_LEVEL (it->bidi_it)) + && IT_CHARPOS (*it) > to_charpos) || (it->bidi_p && (prev_method == GET_FROM_IMAGE || prev_method == GET_FROM_STRETCH ------------------------------------------------------------ revno: 105940 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2011-09-27 19:46:17 +0300 message: Force left-to-right paragraphs in Org buffers. lisp/org/org.el (org-mode): Force left-to-right paragraphs in Org buffers. For a related discussions, see https://lists.gnu.org/archive/html/emacs-devel/2011-09/msg00349.html. diff: === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2011-09-17 12:19:04 +0000 +++ lisp/org/ChangeLog 2011-09-27 16:46:17 +0000 @@ -1,3 +1,9 @@ +2011-09-27 Eli Zaretskii + + * org.el (org-mode): Force left-to-right paragraphs in Org + buffers. For a related discussions, see + https://lists.gnu.org/archive/html/emacs-devel/2011-09/msg00349.html. + 2011-09-17 Juanma Barranquero * org.el (org-toggle-pretty-entities): Fix typo in message. === modified file 'lisp/org/org.el' --- lisp/org/org.el 2011-09-19 16:48:36 +0000 +++ lisp/org/org.el 2011-09-27 16:46:17 +0000 @@ -4748,6 +4748,7 @@ (org-set-local 'line-move-ignore-invisible t)) (org-set-local 'outline-regexp org-outline-regexp) (org-set-local 'outline-level 'org-outline-level) + (setq bidi-paragraph-direction 'left-to-right) (when (and org-ellipsis (fboundp 'set-display-table-slot) (boundp 'buffer-display-table) (fboundp 'make-glyph-code)) ------------------------------------------------------------ revno: 105939 committer: Chong Yidong branch nick: trunk timestamp: Tue 2011-09-27 11:58:13 -0400 message: * lisp/emacs-lisp/package.el (list-packages): Fix echo area message. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-27 09:28:03 +0000 +++ lisp/ChangeLog 2011-09-27 15:58:13 +0000 @@ -1,3 +1,7 @@ +2011-09-27 Chong Yidong + + * emacs-lisp/package.el (list-packages): Fix echo area message. + 2011-09-27 Leo Liu * ido.el (ido-read-internal): Accept cons cell HIST arg. === modified file 'lisp/emacs-lisp/package.el' --- lisp/emacs-lisp/package.el 2011-09-18 20:43:20 +0000 +++ lisp/emacs-lisp/package.el 2011-09-27 15:58:13 +0000 @@ -1658,10 +1658,11 @@ (switch-to-buffer buf)) (let ((upgrades (package-menu--find-upgrades))) (if upgrades - (message "%d package%s can be upgraded; type `%s' to mark them for upgrading." + (message "%d package%s can be upgraded; type `%s' to mark %s for upgrading." (length upgrades) (if (= (length upgrades) 1) "" "s") - (substitute-command-keys "\\[package-menu-mark-upgrades]"))))) + (substitute-command-keys "\\[package-menu-mark-upgrades]") + (if (= (length upgrades) 1) "it" "them"))))) ;;;###autoload (defalias 'package-list-packages 'list-packages) ------------------------------------------------------------ revno: 105938 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-09-27 06:19:42 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/Makefile.in' --- autogen/Makefile.in 2011-09-06 18:18:53 +0000 +++ autogen/Makefile.in 2011-09-27 10:19:42 +0000 @@ -17,14 +17,26 @@ # Copyright (C) 2002-2011 Free Software Foundation, Inc. # -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this file. If not, see . +# +# As a special exception to the GNU General Public License, +# this file may be distributed as part of a program that +# contains a configuration script generated by Autoconf, under # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops lstat mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=msvc-inval --avoid=msvc-nothrow --avoid=pathmax --avoid=raise --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops lstat mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -167,9 +179,11 @@ GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@ +GNULIB_CHDIR = @GNULIB_CHDIR@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ +GNULIB_DUP = @GNULIB_DUP@ GNULIB_DUP2 = @GNULIB_DUP2@ GNULIB_DUP3 = @GNULIB_DUP3@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ @@ -179,6 +193,8 @@ GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@ GNULIB_FCLOSE = @GNULIB_FCLOSE@ +GNULIB_FDATASYNC = @GNULIB_FDATASYNC@ +GNULIB_FDOPEN = @GNULIB_FDOPEN@ GNULIB_FFLUSH = @GNULIB_FFLUSH@ GNULIB_FGETC = @GNULIB_FGETC@ GNULIB_FGETS = @GNULIB_FGETS@ @@ -193,6 +209,7 @@ GNULIB_FSCANF = @GNULIB_FSCANF@ GNULIB_FSEEK = @GNULIB_FSEEK@ GNULIB_FSEEKO = @GNULIB_FSEEKO@ +GNULIB_FSTAT = @GNULIB_FSTAT@ GNULIB_FSTATAT = @GNULIB_FSTATAT@ GNULIB_FSYNC = @GNULIB_FSYNC@ GNULIB_FTELL = @GNULIB_FTELL@ @@ -242,6 +259,7 @@ GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@ GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ +GNULIB_PCLOSE = @GNULIB_PCLOSE@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ @@ -256,6 +274,7 @@ GNULIB_PUTENV = @GNULIB_PUTENV@ GNULIB_PUTS = @GNULIB_PUTS@ GNULIB_PWRITE = @GNULIB_PWRITE@ +GNULIB_RAISE = @GNULIB_RAISE@ GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ GNULIB_READ = @GNULIB_READ@ GNULIB_READLINK = @GNULIB_READLINK@ @@ -327,6 +346,7 @@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ +HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ @@ -356,6 +376,7 @@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ +HAVE_FDATASYNC = @HAVE_FDATASYNC@ HAVE_FSEEKO = @HAVE_FSEEKO@ HAVE_FSTATAT = @HAVE_FSTATAT@ HAVE_FSYNC = @HAVE_FSYNC@ @@ -391,13 +412,16 @@ HAVE_MKSTEMPS = @HAVE_MKSTEMPS@ HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_PCLOSE = @HAVE_PCLOSE@ HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ +HAVE_POPEN = @HAVE_POPEN@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_PREAD = @HAVE_PREAD@ HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@ HAVE_PTSNAME = @HAVE_PTSNAME@ HAVE_PWRITE = @HAVE_PWRITE@ +HAVE_RAISE = @HAVE_RAISE@ HAVE_RANDOM_H = @HAVE_RANDOM_H@ HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_READLINK = @HAVE_READLINK@ @@ -566,6 +590,7 @@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ +REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FOPEN = @REPLACE_FOPEN@ REPLACE_FPRINTF = @REPLACE_FPRINTF@ @@ -608,6 +633,7 @@ REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_PWRITE = @REPLACE_PWRITE@ +REPLACE_RAISE = @REPLACE_RAISE@ REPLACE_READ = @REPLACE_READ@ REPLACE_READLINK = @REPLACE_READLINK@ REPLACE_REALLOC = @REPLACE_REALLOC@ @@ -1169,11 +1195,13 @@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \ -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \ + -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \ -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \ -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \ -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \ -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \ -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \ + -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \ -e 's|@''HAVE_SIGSET_T''@|$(HAVE_SIGSET_T)|g' \ -e 's|@''HAVE_SIGINFO_T''@|$(HAVE_SIGINFO_T)|g' \ -e 's|@''HAVE_SIGACTION''@|$(HAVE_SIGACTION)|g' \ @@ -1181,6 +1209,7 @@ -e 's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|$(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T)|g' \ -e 's|@''HAVE_SIGHANDLER_T''@|$(HAVE_SIGHANDLER_T)|g' \ -e 's|@''REPLACE_PTHREAD_SIGMASK''@|$(REPLACE_PTHREAD_SIGMASK)|g' \ + -e 's|@''REPLACE_RAISE''@|$(REPLACE_RAISE)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ @@ -1309,6 +1338,7 @@ -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \ -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \ -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \ + -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \ -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \ -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \ -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \ @@ -1333,6 +1363,7 @@ -e 's/@''GNULIB_GETS''@/$(GNULIB_GETS)/g' \ -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \ -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \ + -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \ -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \ -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \ -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \ @@ -1371,11 +1402,14 @@ -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \ -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \ -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \ + -e 's|@''HAVE_PCLOSE''@|$(HAVE_PCLOSE)|g' \ + -e 's|@''HAVE_POPEN''@|$(HAVE_POPEN)|g' \ -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \ -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \ -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \ -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \ -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \ + -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \ -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \ -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \ -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \ @@ -1507,6 +1541,7 @@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ + -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \ -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \ @@ -1589,8 +1624,10 @@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ + -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \ -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \ -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ + -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \ -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \ -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \ -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \ @@ -1598,6 +1635,7 @@ -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \ -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \ -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \ + -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \ -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \ -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \ -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \ @@ -1641,6 +1679,7 @@ -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \ -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ + -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \ -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ @@ -1665,6 +1704,7 @@ -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \ + -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \ -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \ === modified file 'autogen/config.in' --- autogen/config.in 2011-09-15 10:18:44 +0000 +++ autogen/config.in 2011-09-27 10:19:42 +0000 @@ -1273,6 +1273,9 @@ /* Define to a type if does not define. */ #undef mbstate_t +/* Define to `int' if does not define. */ +#undef mode_t + /* Define to the name of the strftime replacement function. */ #undef my_strftime === modified file 'autogen/configure' --- autogen/configure 2011-09-26 10:18:24 +0000 +++ autogen/configure 2011-09-27 10:19:42 +0000 @@ -669,11 +669,14 @@ REPLACE_FPRINTF REPLACE_FOPEN REPLACE_FFLUSH +REPLACE_FDOPEN REPLACE_FCLOSE REPLACE_DPRINTF HAVE_VDPRINTF HAVE_VASPRINTF HAVE_RENAMEAT +HAVE_POPEN +HAVE_PCLOSE HAVE_FTELLO HAVE_FSEEKO HAVE_DPRINTF @@ -711,6 +714,7 @@ GNULIB_PRINTF GNULIB_POPEN GNULIB_PERROR +GNULIB_PCLOSE GNULIB_OBSTACK_PRINTF_POSIX GNULIB_OBSTACK_PRINTF GNULIB_GETS @@ -735,6 +739,7 @@ GNULIB_FGETS GNULIB_FGETC GNULIB_FFLUSH +GNULIB_FDOPEN GNULIB_FCLOSE GNULIB_DPRINTF NEXT_AS_FIRST_DIRECTIVE_STDDEF_H @@ -755,6 +760,7 @@ NEXT_STDARG_H NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H NEXT_SIGNAL_H +REPLACE_RAISE REPLACE_PTHREAD_SIGMASK HAVE_SIGHANDLER_T HAVE_TYPE_VOLATILE_SIG_ATOMIC_T @@ -762,11 +768,13 @@ HAVE_SIGACTION HAVE_SIGINFO_T HAVE_SIGSET_T +HAVE_RAISE HAVE_PTHREAD_SIGMASK HAVE_POSIX_SIGNALBLOCKING GNULIB_SIGACTION GNULIB_SIGPROCMASK GNULIB_SIGNAL_H_SIGPIPE +GNULIB_RAISE GNULIB_PTHREAD_SIGMASK LIB_PTHREAD_SIGMASK REPLACE_TIMEGM @@ -813,6 +821,7 @@ GNULIB_LCHMOD GNULIB_FUTIMENS GNULIB_FSTATAT +GNULIB_FSTAT GNULIB_FCHMODAT NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H NEXT_INTTYPES_H @@ -966,6 +975,7 @@ HAVE_DECL_GETPAGESIZE HAVE_DECL_GETLOGIN_R HAVE_DECL_GETDOMAINNAME +HAVE_DECL_FDATASYNC HAVE_DECL_FCHDIR HAVE_DECL_ENVIRON HAVE_USLEEP @@ -990,6 +1000,7 @@ HAVE_GETDTABLESIZE HAVE_FTRUNCATE HAVE_FSYNC +HAVE_FDATASYNC HAVE_FCHOWNAT HAVE_FCHDIR HAVE_FACCESSAT @@ -1032,6 +1043,7 @@ GNULIB_GETCWD GNULIB_FTRUNCATE GNULIB_FSYNC +GNULIB_FDATASYNC GNULIB_FCHOWNAT GNULIB_FCHDIR GNULIB_FACCESSAT @@ -1039,8 +1051,10 @@ GNULIB_ENVIRON GNULIB_DUP3 GNULIB_DUP2 +GNULIB_DUP GNULIB_CLOSE GNULIB_CHOWN +GNULIB_CHDIR GL_GENERATE_ALLOCA_H_FALSE GL_GENERATE_ALLOCA_H_TRUE ALLOCA_H @@ -6944,7 +6958,7 @@ # Code from module nocrash: # Code from module pthread_sigmask: # Code from module readlink: - # Code from module signal: + # Code from module signal-h: # Code from module sigprocmask: # Code from module snippet/_Noreturn: # Code from module snippet/arg-nonnull: @@ -13674,6 +13688,7 @@ ### Use libxml (-lxml2) if available +HAVE_LIBXML2=no if test "${with_xml2}" != "no"; then ### I'm not sure what the version number should be, so I just guessed. @@ -16607,8 +16622,10 @@ fi + GNULIB_CHDIR=0; GNULIB_CHOWN=0; GNULIB_CLOSE=0; + GNULIB_DUP=0; GNULIB_DUP2=0; GNULIB_DUP3=0; GNULIB_ENVIRON=0; @@ -16616,6 +16633,7 @@ GNULIB_FACCESSAT=0; GNULIB_FCHDIR=0; GNULIB_FCHOWNAT=0; + GNULIB_FDATASYNC=0; GNULIB_FSYNC=0; GNULIB_FTRUNCATE=0; GNULIB_GETCWD=0; @@ -16658,6 +16676,7 @@ HAVE_FACCESSAT=1; HAVE_FCHDIR=1; HAVE_FCHOWNAT=1; + HAVE_FDATASYNC=1; HAVE_FSYNC=1; HAVE_FTRUNCATE=1; HAVE_GETDTABLESIZE=1; @@ -16682,6 +16701,7 @@ HAVE_USLEEP=1; HAVE_DECL_ENVIRON=1; HAVE_DECL_FCHDIR=1; + HAVE_DECL_FDATASYNC=1; HAVE_DECL_GETDOMAINNAME=1; HAVE_DECL_GETLOGIN_R=1; HAVE_DECL_GETPAGESIZE=1; @@ -16992,9 +17012,9 @@ ;; esac - gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'getopt.h#{ - s#.*"\(.*'"${gl_dirsep_regex}"'getopt.h\)".*#\1# - s#^/[^/]#//&# + gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'getopt.h|{ + s|.*"\(.*'"${gl_dirsep_regex}"'getopt.h\)".*|\1| + s|^/[^/]|//&| p q }' @@ -17749,9 +17769,9 @@ ;; esac - gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'stdint.h#{ - s#.*"\(.*'"${gl_dirsep_regex}"'stdint.h\)".*#\1# - s#^/[^/]#//&# + gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'stdint.h|{ + s|.*"\(.*'"${gl_dirsep_regex}"'stdint.h\)".*|\1| + s|^/[^/]|//&| p q }' @@ -18381,6 +18401,10 @@ + if test $BITSIZEOF_WINT_T -lt 32; then + BITSIZEOF_WINT_T=32 + fi + STDINT_H=stdint.h fi @@ -18456,9 +18480,9 @@ ;; esac - gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'inttypes.h#{ - s#.*"\(.*'"${gl_dirsep_regex}"'inttypes.h\)".*#\1# - s#^/[^/]#//&# + gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'inttypes.h|{ + s|.*"\(.*'"${gl_dirsep_regex}"'inttypes.h\)".*|\1| + s|^/[^/]|//&| p q }' @@ -18499,6 +18523,7 @@ GNULIB_FCHMODAT=0; + GNULIB_FSTAT=0; GNULIB_FSTATAT=0; GNULIB_FUTIMENS=0; GNULIB_LCHMOD=0; @@ -18612,11 +18637,13 @@ GNULIB_PTHREAD_SIGMASK=0; + GNULIB_RAISE=0; GNULIB_SIGNAL_H_SIGPIPE=0; GNULIB_SIGPROCMASK=0; GNULIB_SIGACTION=0; HAVE_POSIX_SIGNALBLOCKING=1; HAVE_PTHREAD_SIGMASK=1; + HAVE_RAISE=1; HAVE_SIGSET_T=1; HAVE_SIGINFO_T=1; HAVE_SIGACTION=1; @@ -18626,6 +18653,7 @@ HAVE_SIGHANDLER_T=1; REPLACE_PTHREAD_SIGMASK=0; + REPLACE_RAISE=0; @@ -18797,6 +18825,7 @@ GNULIB_DPRINTF=0; GNULIB_FCLOSE=0; + GNULIB_FDOPEN=0; GNULIB_FFLUSH=0; GNULIB_FGETC=0; GNULIB_FGETS=0; @@ -18821,6 +18850,7 @@ GNULIB_GETS=0; GNULIB_OBSTACK_PRINTF=0; GNULIB_OBSTACK_PRINTF_POSIX=0; + GNULIB_PCLOSE=0; GNULIB_PERROR=0; GNULIB_POPEN=0; GNULIB_PRINTF=0; @@ -18858,11 +18888,14 @@ HAVE_DPRINTF=1; HAVE_FSEEKO=1; HAVE_FTELLO=1; + HAVE_PCLOSE=1; + HAVE_POPEN=1; HAVE_RENAMEAT=1; HAVE_VASPRINTF=1; HAVE_VDPRINTF=1; REPLACE_DPRINTF=0; REPLACE_FCLOSE=0; + REPLACE_FDOPEN=0; REPLACE_FFLUSH=0; REPLACE_FOPEN=0; REPLACE_FPRINTF=0; @@ -18977,6 +19010,17 @@ +ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" +if test "x$ac_cv_type_mode_t" = x""yes; then : + +else + +cat >>confdefs.h <<_ACEOF +#define mode_t int +_ACEOF + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5 $as_echo_n "checking for C/C++ restrict keyword... " >&6; } if test "${ac_cv_c_restrict+set}" = set; then : @@ -19163,9 +19207,9 @@ ;; esac - gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'time.h#{ - s#.*"\(.*'"${gl_dirsep_regex}"'time.h\)".*#\1# - s#^/[^/]#//&# + gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'time.h|{ + s|.*"\(.*'"${gl_dirsep_regex}"'time.h\)".*|\1| + s|^/[^/]|//&| p q }' @@ -19193,8 +19237,6 @@ - - ac_fn_c_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "$ac_includes_default" if test "x$ac_cv_have_decl_localtime_r" = x""yes; then : ac_have_decl=1 @@ -19399,6 +19441,7 @@ gl_LIBOBJS="$gl_LIBOBJS dup2.$ac_objext" + fi @@ -19799,9 +19842,9 @@ HAVE_SYS_LOADAVG_H=0 fi ac_fn_c_check_decl "$LINENO" "getloadavg" "ac_cv_have_decl_getloadavg" "#if HAVE_SYS_LOADAVG_H - # include - #endif - #include + # include + #endif + #include " if test "x$ac_cv_have_decl_getloadavg" = x""yes; then : @@ -20710,9 +20753,9 @@ ;; esac - gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'signal.h#{ - s#.*"\(.*'"${gl_dirsep_regex}"'signal.h\)".*#\1# - s#^/[^/]#//&# + gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'signal.h|{ + s|.*"\(.*'"${gl_dirsep_regex}"'signal.h\)".*|\1| + s|^/[^/]|//&| p q }' @@ -20954,9 +20997,9 @@ ;; esac - gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'stdarg.h#{ - s#.*"\(.*'"${gl_dirsep_regex}"'stdarg.h\)".*#\1# - s#^/[^/]#//&# + gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'stdarg.h|{ + s|.*"\(.*'"${gl_dirsep_regex}"'stdarg.h\)".*|\1| + s|^/[^/]|//&| p q }' @@ -21154,9 +21197,9 @@ ;; esac - gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'stddef.h#{ - s#.*"\(.*'"${gl_dirsep_regex}"'stddef.h\)".*#\1# - s#^/[^/]#//&# + gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'stddef.h|{ + s|.*"\(.*'"${gl_dirsep_regex}"'stddef.h\)".*|\1| + s|^/[^/]|//&| p q }' @@ -21224,9 +21267,9 @@ ;; esac - gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'stdio.h#{ - s#.*"\(.*'"${gl_dirsep_regex}"'stdio.h\)".*#\1# - s#^/[^/]#//&# + gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'stdio.h|{ + s|.*"\(.*'"${gl_dirsep_regex}"'stdio.h\)".*|\1| + s|^/[^/]|//&| p q }' @@ -21316,9 +21359,9 @@ ;; esac - gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'stdlib.h#{ - s#.*"\(.*'"${gl_dirsep_regex}"'stdlib.h\)".*#\1# - s#^/[^/]#//&# + gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'stdlib.h|{ + s|.*"\(.*'"${gl_dirsep_regex}"'stdlib.h\)".*|\1| + s|^/[^/]|//&| p q }' @@ -21573,9 +21616,9 @@ ;; esac - gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'sys/stat.h#{ - s#.*"\(.*'"${gl_dirsep_regex}"'sys/stat.h\)".*#\1# - s#^/[^/]#//&# + gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'sys/stat.h|{ + s|.*"\(.*'"${gl_dirsep_regex}"'sys/stat.h\)".*|\1| + s|^/[^/]|//&| p q }' @@ -21605,6 +21648,8 @@ + + ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include #include " @@ -21751,9 +21796,9 @@ ;; esac - gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'unistd.h#{ - s#.*"\(.*'"${gl_dirsep_regex}"'unistd.h\)".*#\1# - s#^/[^/]#//&# + gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'unistd.h|{ + s|.*"\(.*'"${gl_dirsep_regex}"'unistd.h\)".*|\1| + s|^/[^/]|//&| p q }' @@ -21842,7 +21887,9 @@ gl_LIBOBJS="$gl_LIBOBJS sigprocmask.$ac_objext" - : + + + fi @@ -21856,6 +21903,12 @@ gl_gnulib_enabled_sigprocmask=true + if $condition; then + func_gl_gnulib_m4code_raise + fi + if $condition; then + func_gl_gnulib_m4code_f691f076f650964c9f5598c3ee487616 + fi fi } func_gl_gnulib_m4code_stat () @@ -21991,6 +22044,9 @@ func_gl_gnulib_m4code_dosname fi if $condition; then + func_gl_gnulib_m4code_pathmax + fi + if $condition; then func_gl_gnulib_m4code_verify fi fi @@ -22105,6 +22161,12 @@ gl_gnulib_enabled_verify=true fi } + if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then + func_gl_gnulib_m4code_f691f076f650964c9f5598c3ee487616 + fi + if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then + func_gl_gnulib_m4code_676220fa4366efa9bdbfccf11a857c07 + fi if test $REPLACE_GETOPT = 1; then func_gl_gnulib_m4code_be453cec5eecf5731a274f2de7f2db36 fi ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.