Now on revision 106473. ------------------------------------------------------------ revno: 106473 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-11-21 21:55:06 -0500 message: Move rmailmm test functions to test/ directory. * lisp/mail/rmailmm.el (test-rmail-mime-handler) (test-rmail-mime-bulk-handler) (test-rmail-mime-multipart-handler): Move tests to test/ directory. * test/rmailmm.el: New file, split from lisp/mail/rmailmm.el. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-21 23:59:09 +0000 +++ lisp/ChangeLog 2011-11-22 02:55:06 +0000 @@ -1,3 +1,9 @@ +2011-11-22 Glenn Morris + + * mail/rmailmm.el (test-rmail-mime-handler) + (test-rmail-mime-bulk-handler) + (test-rmail-mime-multipart-handler): Move tests to test/ directory. + 2011-11-21 Juri Linkov * calc/calc.el (calc-read-key-sequence): Let-bind `input-method-function' === modified file 'lisp/mail/rmailmm.el' --- lisp/mail/rmailmm.el 2011-11-19 11:49:54 +0000 +++ lisp/mail/rmailmm.el 2011-11-22 02:55:06 +0000 @@ -612,23 +612,6 @@ (rmail-mime-insert-decoded-text entity))) (put-text-property beg (point) 'rmail-mime-entity entity))) -;; FIXME move to the test/ directory? -(defun test-rmail-mime-handler () - "Test of a mail using no MIME parts at all." - (let ((mail "To: alex@gnu.org -Content-Type: text/plain; charset=koi8-r -Content-Transfer-Encoding: 8bit -MIME-Version: 1.0 - -\372\304\322\301\327\323\324\327\325\312\324\305\41")) - (switch-to-buffer (get-buffer-create "*test*")) - (erase-buffer) - (set-buffer-multibyte nil) - (insert mail) - (rmail-mime-show t) - (set-buffer-multibyte t))) - - (defun rmail-mime-insert-image (entity) "Decode and insert the image body of MIME-entity ENTITY." (let* ((content-type (car (rmail-mime-entity-type entity))) @@ -813,27 +796,6 @@ (rmail-mime-insert-decoded-text entity))))) (put-text-property beg (point) 'rmail-mime-entity entity))) -(defun test-rmail-mime-bulk-handler () - "Test of a mail used as an example in RFC 2183." - (let ((mail "Content-Type: image/jpeg -Content-Disposition: attachment; filename=genome.jpeg; - modification-date=\"Wed, 12 Feb 1997 16:29:51 -0500\"; -Content-Description: a complete map of the human genome -Content-Transfer-Encoding: base64 - -iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAABGdBTUEAALGPC/xhBQAAAAZQ -TFRF////AAAAVcLTfgAAAPZJREFUeNq9ldsOwzAIQ+3//+l1WlvA5ZLsoUiTto4TB+ISoAjy -+ITfRBfcAmgRFFeAm+J6uhdKdFhFWUgDkFsK0oUp/9G2//Kj7Jx+5tSKOdBscgUYiKHRS/me -WATQdRUvAK0Bnmshmtn79PpaLBbbOZkjKvRnjRZoRswOkG1wFchKew2g9wXVJVZL/m4+B+vv -9AxQQR2Q33SgAYJzzVACdAWjAfRYzYFO9n6SLnydtQHSMxYDMAKqZ/8FS/lTK+zuq3CtK64L -UDwbgUEAUmk2Zyg101d6PhCDySgAvTvDgKiuOrc4dLxUb7UMnhGIexyI+d6U+ABuNAP4Simx -lgAAAABJRU5ErkJggg== -")) - (switch-to-buffer (get-buffer-create "*test*")) - (erase-buffer) - (insert mail) - (rmail-mime-show))) - (defun rmail-mime-multipart-handler (content-type content-disposition content-transfer-encoding) @@ -971,37 +933,6 @@ (rmail-mime-hidden-mode child))))) entities))) -(defun test-rmail-mime-multipart-handler () - "Test of a mail used as an example in RFC 2046." - (let ((mail "From: Nathaniel Borenstein -To: Ned Freed -Date: Sun, 21 Mar 1993 23:56:48 -0800 (PST) -Subject: Sample message -MIME-Version: 1.0 -Content-type: multipart/mixed; boundary=\"simple boundary\" - -This is the preamble. It is to be ignored, though it -is a handy place for composition agents to include an -explanatory note to non-MIME conformant readers. - ---simple boundary - -This is implicitly typed plain US-ASCII text. -It does NOT end with a linebreak. ---simple boundary -Content-type: text/plain; charset=us-ascii - -This is explicitly typed plain US-ASCII text. -It DOES end with a linebreak. - ---simple boundary-- - -This is the epilogue. It is also to be ignored.")) - (switch-to-buffer (get-buffer-create "*test*")) - (erase-buffer) - (insert mail) - (rmail-mime-show t))) - (defun rmail-mime-insert-multipart (entity) "Presentation handler for a multipart MIME entity." (let ((current (aref (rmail-mime-entity-display entity) 0)) === modified file 'test/ChangeLog' --- test/ChangeLog 2011-11-20 03:48:53 +0000 +++ test/ChangeLog 2011-11-22 02:55:06 +0000 @@ -1,3 +1,7 @@ +2011-11-22 Glenn Morris + + * rmailmm.el: New file, split from lisp/mail/rmailmm.el. + 2011-11-20 Juanma Barranquero * cedet/semantic-utest-c.el (semantic-utest-c-comparisons): Fix typo. === added file 'test/rmailmm.el' --- test/rmailmm.el 1970-01-01 00:00:00 +0000 +++ test/rmailmm.el 2011-11-22 02:55:06 +0000 @@ -0,0 +1,93 @@ +;;; rmailmm.el --- tests for mail/rmailmm.el + +;; Copyright (C) 2006-2011 Free Software Foundation, Inc. + +;; This file is part of GNU Emacs. + +;; GNU Emacs 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. + +;; GNU Emacs 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 GNU Emacs. If not, see . + +;;; Commentary: + +;;; Code: + +(require 'rmailmm) + +(defun rmailmm-test-handler () + "Test of a mail using no MIME parts at all." + (let ((mail "To: alex@gnu.org +Content-Type: text/plain; charset=koi8-r +Content-Transfer-Encoding: 8bit +MIME-Version: 1.0 + +\372\304\322\301\327\323\324\327\325\312\324\305\41")) + (switch-to-buffer (get-buffer-create "*test*")) + (erase-buffer) + (set-buffer-multibyte nil) + (insert mail) + (rmail-mime-show t) + (set-buffer-multibyte t))) + +(defun rmailmm-test-bulk-handler () + "Test of a mail used as an example in RFC 2183." + (let ((mail "Content-Type: image/jpeg +Content-Disposition: attachment; filename=genome.jpeg; + modification-date=\"Wed, 12 Feb 1997 16:29:51 -0500\"; +Content-Description: a complete map of the human genome +Content-Transfer-Encoding: base64 + +iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAABGdBTUEAALGPC/xhBQAAAAZQ +TFRF////AAAAVcLTfgAAAPZJREFUeNq9ldsOwzAIQ+3//+l1WlvA5ZLsoUiTto4TB+ISoAjy ++ITfRBfcAmgRFFeAm+J6uhdKdFhFWUgDkFsK0oUp/9G2//Kj7Jx+5tSKOdBscgUYiKHRS/me +WATQdRUvAK0Bnmshmtn79PpaLBbbOZkjKvRnjRZoRswOkG1wFchKew2g9wXVJVZL/m4+B+vv +9AxQQR2Q33SgAYJzzVACdAWjAfRYzYFO9n6SLnydtQHSMxYDMAKqZ/8FS/lTK+zuq3CtK64L +UDwbgUEAUmk2Zyg101d6PhCDySgAvTvDgKiuOrc4dLxUb7UMnhGIexyI+d6U+ABuNAP4Simx +lgAAAABJRU5ErkJggg== +")) + (switch-to-buffer (get-buffer-create "*test*")) + (erase-buffer) + (insert mail) + (rmail-mime-show))) + +(defun rmailmm-test-multipart-handler () + "Test of a mail used as an example in RFC 2046." + (let ((mail "From: Nathaniel Borenstein +To: Ned Freed +Date: Sun, 21 Mar 1993 23:56:48 -0800 (PST) +Subject: Sample message +MIME-Version: 1.0 +Content-type: multipart/mixed; boundary=\"simple boundary\" + +This is the preamble. It is to be ignored, though it +is a handy place for composition agents to include an +explanatory note to non-MIME conformant readers. + +--simple boundary + +This is implicitly typed plain US-ASCII text. +It does NOT end with a linebreak. +--simple boundary +Content-type: text/plain; charset=us-ascii + +This is explicitly typed plain US-ASCII text. +It DOES end with a linebreak. + +--simple boundary-- + +This is the epilogue. It is also to be ignored.")) + (switch-to-buffer (get-buffer-create "*test*")) + (erase-buffer) + (insert mail) + (rmail-mime-show t))) + +;;; rmailmm.el ends here ------------------------------------------------------------ revno: 106472 committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2011-11-22 02:17:20 +0000 message: gnus-art.el (gnus-article-setup-buffer): Decode group name used for article buffers' name. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-11-22 00:59:33 +0000 +++ lisp/gnus/ChangeLog 2011-11-22 02:17:20 +0000 @@ -1,3 +1,8 @@ +2011-11-22 Katsumi Yamaoka + + * gnus-art.el (gnus-article-setup-buffer): Decode group name used for + article buffers' name. + 2011-11-22 Lars Magne Ingebrigtsen * shr.el (shr-table-horizontal-line): Revert infinite loops introduced === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2011-11-17 17:40:48 +0000 +++ lisp/gnus/gnus-art.el 2011-11-22 02:17:20 +0000 @@ -4497,7 +4497,9 @@ (defun gnus-article-setup-buffer () "Initialize the article buffer." (let* ((name (if gnus-single-article-buffer "*Article*" - (concat "*Article " gnus-newsgroup-name "*"))) + (concat "*Article " + (gnus-group-decoded-name gnus-newsgroup-name) + "*"))) (original (progn (string-match "\\*Article" name) (concat " *Original Article" ------------------------------------------------------------ revno: 106471 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-11-21 20:56:49 -0500 message: * Makefile.in (install-arch-dep): Tweak previous change. diff: === modified file 'ChangeLog' --- ChangeLog 2011-11-22 01:37:45 +0000 +++ ChangeLog 2011-11-22 01:56:49 +0000 @@ -1,3 +1,7 @@ +2011-11-22 Glenn Morris + + * Makefile.in (install-arch-dep): Tweak previous change. + 2011-11-22 Yavor Doganov Do not install arch-dependent files in the app bundle if === modified file 'Makefile.in' --- Makefile.in 2011-11-22 01:37:45 +0000 +++ Makefile.in 2011-11-22 01:56:49 +0000 @@ -475,9 +475,9 @@ if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \ rm -fr share ) ; \ ( cd ${ns_appbindir} ; \ - if test -d libexec; then cd libexec ; dir=emacs/*/*/* ; \ - $(MV_DIRS); rm -fr emacs; \ - cd ../bin; rm -f emacs emacs-24*; ln -sf ../libexec/* . ; fi ) ; \ + if cd libexec ; then dir=emacs/*/*/* ; $(MV_DIRS); \ + rm -fr emacs; if cd ../bin; then rm -f emacs emacs-24*; \ + ln -sf ../libexec/* . ; fi ; fi ) ; \ else true ; fi ## FIXME is the emacs-24* bit above really necessary and correct? ------------------------------------------------------------ revno: 106470 fixes bug(s): http://debbugs.gnu.org/1335 author: Yavor Doganov committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-11-21 20:37:45 -0500 message: Small fix for --disable-ns-self-contained builds Do not install arch-dependent files in the app bundle if --disable-ns-self-contained is requested. * configure.in (exec_prefix, libexecdir): Define relative to ns_appbindir' only if configured for a self-contained app. * Makefile.in (install-arch-dep): Test for the existence of libexec in the Emacs.app bundle before executing commands. diff: === modified file 'ChangeLog' --- ChangeLog 2011-11-20 09:24:06 +0000 +++ ChangeLog 2011-11-22 01:37:45 +0000 @@ -1,3 +1,12 @@ +2011-11-22 Yavor Doganov + + Do not install arch-dependent files in the app bundle if + --disable-ns-self-contained is requested. (Bug#1335) + * configure.in (exec_prefix, libexecdir): Define relative to + `ns_appbindir' only if configured for a self-contained app. + * Makefile.in (install-arch-dep): Test for the existence of + libexec in the Emacs.app bundle before executing commands. + 2011-11-20 Andreas Schwab * configure.in: Remove reference to src/m/ibms390.h. === modified file 'Makefile.in' --- Makefile.in 2011-11-19 09:18:31 +0000 +++ Makefile.in 2011-11-22 01:37:45 +0000 @@ -474,10 +474,10 @@ if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\ if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \ rm -fr share ) ; \ - ( cd ${ns_appbindir}libexec ; dir=emacs/*/*/* ; $(MV_DIRS); \ - rm -fr emacs ) ; \ - ( cd ${ns_appbindir}bin ; rm -f emacs emacs-24* ; \ - ln -sf ../libexec/* .) ; \ + ( cd ${ns_appbindir} ; \ + if test -d libexec; then cd libexec ; dir=emacs/*/*/* ; \ + $(MV_DIRS); rm -fr emacs; \ + cd ../bin; rm -f emacs emacs-24*; ln -sf ../libexec/* . ; fi ) ; \ else true ; fi ## FIXME is the emacs-24* bit above really necessary and correct? === modified file 'configure.in' --- configure.in 2011-11-20 09:24:06 +0000 +++ configure.in 2011-11-22 01:37:45 +0000 @@ -1568,10 +1568,10 @@ window_system=nextstep with_xft=no # set up packaging dirs - exec_prefix=${ns_appbindir} - libexecdir=${ns_appbindir}/libexec if test "${EN_NS_SELF_CONTAINED}" = yes; then prefix=${ns_appresdir} + exec_prefix=${ns_appbindir} + libexecdir=${ns_appbindir}/libexec fi ns_frag=$srcdir/src/ns.mk NS_OBJ="fontset.o fringe.o image.o" ------------------------------------------------------------ revno: 106469 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2011-11-22 00:59:33 +0000 message: shr.el (shr-table-horizontal-line): Revert infinite loops introduced by Paul Eggert's spellfixes two days ago. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-11-21 22:08:36 +0000 +++ lisp/gnus/ChangeLog 2011-11-22 00:59:33 +0000 @@ -1,3 +1,8 @@ +2011-11-22 Lars Magne Ingebrigtsen + + * shr.el (shr-table-horizontal-line): Revert infinite loops introduced + by Paul Eggert's spellfixes two days ago. + 2011-11-21 Lars Magne Ingebrigtsen * mm-view.el (mm-display-inline-fontify): Make the font-lock variables === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2011-11-19 09:18:31 +0000 +++ lisp/gnus/shr.el 2011-11-22 00:59:33 +0000 @@ -53,17 +53,17 @@ :group 'shr :type 'regexp) -(defcustom shr-table-horizontal-line ? +(defcustom shr-table-horizontal-line ? ; space "Character used to draw horizontal table lines." :group 'shr :type 'character) -(defcustom shr-table-vertical-line ? +(defcustom shr-table-vertical-line ? ; space "Character used to draw vertical table lines." :group 'shr :type 'character) -(defcustom shr-table-corner ? +(defcustom shr-table-corner ? ; space "Character used to draw table corners." :group 'shr :type 'character) ------------------------------------------------------------ revno: 106468 fixes bug(s): http://debbugs.gnu.org/10018 committer: Juri Linkov branch nick: trunk timestamp: Tue 2011-11-22 01:59:09 +0200 message: * lisp/calc/calc.el (calc-read-key-sequence): Let-bind `input-method-function' to nil. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-21 21:58:38 +0000 +++ lisp/ChangeLog 2011-11-21 23:59:09 +0000 @@ -1,3 +1,8 @@ +2011-11-21 Juri Linkov + + * calc/calc.el (calc-read-key-sequence): Let-bind `input-method-function' + to nil. (Bug#10018) + 2011-11-21 Lars Magne Ingebrigtsen * emacs-lisp/cl-indent.el (common-lisp-loop-part-indentation): === modified file 'lisp/calc/calc.el' --- lisp/calc/calc.el 2011-11-15 17:37:37 +0000 +++ lisp/calc/calc.el 2011-11-21 23:59:09 +0000 @@ -1235,7 +1235,8 @@ (glob (current-global-map)) (loc (current-local-map))) (or (input-pending-p) (message "%s" prompt)) - (let ((key (calc-read-key t))) + (let ((key (calc-read-key t)) + (input-method-function nil)) (calc-unread-command (cdr key)) (unwind-protect (progn ------------------------------------------------------------ revno: 106467 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2011-11-21 22:08:36 +0000 message: mm-view.el (mm-display-inline-fontify): Make the font-lock variables buffer-local instead of binding them to avoid warnings. Also demote errors (bug#10063). diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-11-20 03:48:53 +0000 +++ lisp/gnus/ChangeLog 2011-11-21 22:08:36 +0000 @@ -1,3 +1,10 @@ +2011-11-21 Lars Magne Ingebrigtsen + + * mm-view.el (mm-display-inline-fontify): Make the font-lock variables + buffer-local instead of binding them to avoid warnings. Also demote + errors (bug#10063). + (font-lock-mode-hook): Shut up byte compiler. + 2011-11-20 Juanma Barranquero * mm-util.el (mm-charset-after): Fix typo. === modified file 'lisp/gnus/mm-view.el' --- lisp/gnus/mm-view.el 2011-09-21 02:13:03 +0000 +++ lisp/gnus/mm-view.el 2011-11-21 22:08:36 +0000 @@ -566,6 +566,8 @@ (face-property 'default prop) (current-buffer)))) (delete-region ,(point-min-marker) ,(point-max-marker))))))))) +;; Shut up byte-compiler. +(defvar font-lock-mode-hook) (defun mm-display-inline-fontify (handle &optional mode) "Insert HANDLE inline fontifying with MODE. If MODE is not set, try to find mode automatically." @@ -597,25 +599,25 @@ (t text))) (require 'font-lock) - (let ((font-lock-maximum-size nil) - ;; Disable support modes, e.g., jit-lock, lazy-lock, etc. - (font-lock-mode-hook nil) - (font-lock-support-mode nil) - ;; I find font-lock a bit too verbose. - (font-lock-verbose nil)) + ;; I find font-lock a bit too verbose. + (let ((font-lock-verbose nil)) + ;; Disable support modes, e.g., jit-lock, lazy-lock, etc. + (set (make-local-variable 'font-lock-mode-hook) nil) + (set (make-local-variable 'font-lock-support-mode) nil) (setq buffer-file-name (mm-handle-filename handle)) (set (make-local-variable 'enable-local-variables) nil) - (if mode - (funcall mode) - (let ((auto-mode-alist - (delq (rassq 'doc-view-mode-maybe auto-mode-alist) - (copy-sequence auto-mode-alist)))) - (set-auto-mode))) - ;; The mode function might have already turned on font-lock. - ;; Do not fontify if the guess mode is fundamental. - (unless (or (symbol-value 'font-lock-mode) - (eq major-mode 'fundamental-mode)) - (font-lock-fontify-buffer))) + (with-demoted-errors + (if mode + (funcall mode) + (let ((auto-mode-alist + (delq (rassq 'doc-view-mode-maybe auto-mode-alist) + (copy-sequence auto-mode-alist)))) + (set-auto-mode))) + ;; The mode function might have already turned on font-lock. + ;; Do not fontify if the guess mode is fundamental. + (unless (or (symbol-value 'font-lock-mode) + (eq major-mode 'fundamental-mode)) + (font-lock-fontify-buffer)))) ;; By default, XEmacs font-lock uses non-duplicable text ;; properties. This code forces all the text properties ;; to be copied along with the text. ------------------------------------------------------------ revno: 106466 fixes bug(s): http://debbugs.gnu.org/10094 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Mon 2011-11-21 22:58:38 +0100 message: Tell the caller that the next line needs recomputation, even though it doesn't start a sexp. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-21 14:22:02 +0000 +++ lisp/ChangeLog 2011-11-21 21:58:38 +0000 @@ -1,3 +1,9 @@ +2011-11-21 Lars Magne Ingebrigtsen + + * emacs-lisp/cl-indent.el (common-lisp-loop-part-indentation): + Tell the caller that the next line needs recomputation, even + though it doesn't start a sexp (bug#10094). + 2011-11-21 Stefan Monnier * emacs-lisp/autoload.el (autoload-generate-file-autoloads): Simplify. === modified file 'lisp/emacs-lisp/cl-indent.el' --- lisp/emacs-lisp/cl-indent.el 2011-09-13 06:55:10 +0000 +++ lisp/emacs-lisp/cl-indent.el 2011-11-21 21:58:38 +0000 @@ -159,12 +159,16 @@ (current-column)))) (goto-char indent-point) (beginning-of-line) - (cond ((not (extended-loop-p (elt state 1))) - (+ loop-indentation lisp-simple-loop-indentation)) - ((looking-at "^\\s-*\\(:?\\sw+\\|;\\)") - (+ loop-indentation lisp-loop-keyword-indentation)) - (t - (+ loop-indentation lisp-loop-forms-indentation))))) + (list + (cond ((not (extended-loop-p (elt state 1))) + (+ loop-indentation lisp-simple-loop-indentation)) + ((looking-at "^\\s-*\\(:?\\sw+\\|;\\)") + (+ loop-indentation lisp-loop-keyword-indentation)) + (t + (+ loop-indentation lisp-loop-forms-indentation))) + ;; Tell the caller that the next line needs recomputation, even + ;; though it doesn't start a sexp. + loop-indentation))) ;; Cf (info "(elisp)Specification List") ------------------------------------------------------------ revno: 106465 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Mon 2011-11-21 21:39:44 +0100 message: (wait_reading_process_output): Add comment and URL. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-21 18:21:42 +0000 +++ src/ChangeLog 2011-11-21 20:39:44 +0000 @@ -2,6 +2,7 @@ * process.c (wait_reading_process_output): Fix asynchrounous GnuTLS socket handling on some versions of the GnuTLS library. + (wait_reading_process_output): Add comment and URL. 2011-11-21 Jan Djärv === modified file 'src/process.c' --- src/process.c 2011-11-21 18:21:42 +0000 +++ src/process.c 2011-11-21 20:39:44 +0000 @@ -4625,7 +4625,11 @@ if (! wait_proc) { /* We're not waiting on a specific process, so loop - through all the channels and check for data. */ + through all the channels and check for data. + This is a workaround needed for some versions of + the gnutls library -- 2.12.14 has been confirmed + to need it. See + http://comments.gmane.org/gmane.emacs.devel/145074 */ struct Lisp_Process *proc; for (channel = 0; channel < MAXDESC; ++channel) { ------------------------------------------------------------ revno: 106464 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Mon 2011-11-21 19:21:42 +0100 message: Fix asynchrounous GnuTLS socket handling on some versions of the GnuTLS library. Some versions of the GnuTLS library doesn't respons to poll reliably. Work around this by checking all GnuTLS sockets explicitly from the idle loop. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-21 18:01:04 +0000 +++ src/ChangeLog 2011-11-21 18:21:42 +0000 @@ -1,3 +1,8 @@ +2011-11-21 Lars Magne Ingebrigtsen + + * process.c (wait_reading_process_output): Fix asynchrounous + GnuTLS socket handling on some versions of the GnuTLS library. + 2011-11-21 Jan Djärv * xterm.c (x_clear_frame): Reinstate the XClearWindow call. === modified file 'src/process.c' --- src/process.c 2011-11-20 02:29:42 +0000 +++ src/process.c 2011-11-21 18:21:42 +0000 @@ -4620,15 +4620,39 @@ some data in the TCP buffers so that select works, but with custom pull/push functions we need to check if some data is available in the buffers manually. */ - if (nfds == 0 && - wait_proc && wait_proc->gnutls_p /* Check for valid process. */ - /* Do we have pending data? */ - && emacs_gnutls_record_check_pending (wait_proc->gnutls_state) > 0) - { - nfds = 1; - /* Set to Available. */ - FD_SET (wait_proc->infd, &Available); - } + if (nfds == 0) + { + if (! wait_proc) + { + /* We're not waiting on a specific process, so loop + through all the channels and check for data. */ + struct Lisp_Process *proc; + for (channel = 0; channel < MAXDESC; ++channel) + { + if (! NILP (chan_process[channel]) && + (proc = XPROCESS (chan_process[channel])) != NULL && + proc->gnutls_p && + proc->infd && + emacs_gnutls_record_check_pending (proc->gnutls_state) > 0) + { + nfds++; + FD_SET (proc->infd, &Available); + } + } + } + else + { + /* Check this specific channel. */ + if (wait_proc->gnutls_p && /* Check for valid process. */ + /* Do we have pending data? */ + emacs_gnutls_record_check_pending (wait_proc->gnutls_state) > 0) + { + nfds = 1; + /* Set to Available. */ + FD_SET (wait_proc->infd, &Available); + } + } + } #endif } ------------------------------------------------------------ revno: 106463 committer: Jan D. branch nick: trunk timestamp: Mon 2011-11-21 19:01:04 +0100 message: * xterm.c (x_clear_frame): Reinstate the XClearWindow call. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-21 06:05:16 +0000 +++ src/ChangeLog 2011-11-21 18:01:04 +0000 @@ -1,3 +1,7 @@ +2011-11-21 Jan Djärv + + * xterm.c (x_clear_frame): Reinstate the XClearWindow call. + 2011-11-21 Chong Yidong * window.c (Fnext_window, Fprevious_window): Doc fix. === modified file 'src/xterm.c' --- src/xterm.c 2011-11-20 03:48:53 +0000 +++ src/xterm.c 2011-11-21 18:01:04 +0000 @@ -2963,9 +2963,7 @@ follow an explicit cursor_to. */ BLOCK_INPUT; - /* The following call is commented out because it does not seem to accomplish - anything, apart from causing flickering during window resize. */ - /* XClearWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f)); */ + XClearWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f)); /* We have to clear the scroll bars. If we have changed colors or something like that, then they should be notified. */ ------------------------------------------------------------ revno: 106462 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2011-11-21 09:22:02 -0500 message: * lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads): Simplify. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-20 20:17:46 +0000 +++ lisp/ChangeLog 2011-11-21 14:22:02 +0000 @@ -1,6 +1,11 @@ +2011-11-21 Stefan Monnier + + * emacs-lisp/autoload.el (autoload-generate-file-autoloads): Simplify. + 2011-11-20 Stefan Monnier - * vc/pcvs-util.el (cvs-pop-to-buffer-same-frame): Use force-same-window. + * vc/pcvs-util.el (cvs-pop-to-buffer-same-frame): + Use force-same-window. 2011-11-20 Juanma Barranquero === modified file 'lisp/emacs-lisp/autoload.el' --- lisp/emacs-lisp/autoload.el 2011-11-17 21:34:16 +0000 +++ lisp/emacs-lisp/autoload.el 2011-11-21 14:22:02 +0000 @@ -512,15 +512,7 @@ (when output-start (let ((secondary-autoloads-file-buf - (if (local-variable-p 'generated-autoload-file) - (current-buffer)))) - ;; Ignore a buffer-local setting if it points to the - ;; global value. Otherwise we end up writing a mix of md5s - ;; and time-stamps to the global file. (Bug#10049) - (and secondary-autoloads-file-buf - outfile - (not otherbuf) - (setq secondary-autoloads-file-buf nil)) + (if otherbuf (current-buffer)))) (with-current-buffer (marker-buffer output-start) (save-excursion ;; Insert the section-header line which lists the file name ------------------------------------------------------------ revno: 106461 committer: martin rudalics branch nick: trunk timestamp: Mon 2011-11-21 08:28:06 +0100 message: Fix windows.texi typos. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-11-21 06:05:16 +0000 +++ doc/lispref/ChangeLog 2011-11-21 07:28:06 +0000 @@ -1,3 +1,8 @@ +2011-11-21 Martin Rudalics + + * windows.texi (Windows and Frames, Splitting Windows): Fix + typos. + 2011-11-21 Chong Yidong * windows.texi (Splitting Windows): Fix error in documentation of === modified file 'doc/lispref/windows.texi' --- doc/lispref/windows.texi 2011-11-21 06:05:16 +0000 +++ doc/lispref/windows.texi 2011-11-21 07:28:06 +0000 @@ -149,10 +149,10 @@ active. If @var{minibuffer} is neither @code{nil} nor @code{t}, the minibuffer window is never included. -The optional argument @var{window}, if non-@code{nil}, should be a -live window on the specified frame; then @var{window} will be the -first element in the returned list. If @var{window} is omitted or -@code{nil}, the window selected within the frame is first element. +The optional argument @var{window}, if non-@code{nil}, should be a live +window on the specified frame; then @var{window} will be the first +element in the returned list. If @var{window} is omitted or @code{nil}, +the window selected within the frame is the first element. @end defun @cindex window tree @@ -792,7 +792,7 @@ This example demonstrates splitting a live window as well as splitting an internal window. We begin with a frame containing a single window (a live root window), which we denote by @var{W4}. Calling -@code{(split-window W3)} yields this window configuration: +@code{(split-window W4)} yields this window configuration: @smallexample @group