Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 102748. ------------------------------------------------------------ revno: 102748 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-01-03 20:47:39 -0800 message: Small rst.el stuff. * lisp/textmodes/rst.el (rst-compile-toolsets): Make it a defcustom. Add `pdf' and `s5' entries. Use `prog.py' if found, otherwise default to `prog' without a .py extension. (rst-compile-pdf-preview, rst-compile-slides-preview): Use program names from rst-compile-toolsets, rather than hard-coding. (rst-portable-mark-active-p): Fix presumed typo. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-01-03 20:50:05 +0000 +++ lisp/ChangeLog 2011-01-04 04:47:39 +0000 @@ -1,3 +1,12 @@ +2011-01-04 Glenn Morris + + * textmodes/rst.el (rst-compile-toolsets): Make it a defcustom. + Add `pdf' and `s5' entries. Use `prog.py' if found, otherwise + default to `prog' without a .py extension. + (rst-compile-pdf-preview, rst-compile-slides-preview): + Use program names from rst-compile-toolsets, rather than hard-coding. + (rst-portable-mark-active-p): Fix presumed typo. + 2011-01-02 Eli Zaretskii * term/w32-win.el (dynamic-library-alist): Set up correctly for === modified file 'lisp/textmodes/rst.el' --- lisp/textmodes/rst.el 2011-01-02 20:28:40 +0000 +++ lisp/textmodes/rst.el 2011-01-04 04:47:39 +0000 @@ -1,6 +1,6 @@ ;;; rst.el --- Mode for viewing and editing reStructuredText-documents. -;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; Free Software Foundation, Inc. ;; Authors: Martin Blais , @@ -3234,16 +3234,37 @@ :group 'rst :version "21.1") -(defvar rst-compile-toolsets - '((html . ("rst2html.py" ".html" nil)) - (latex . ("rst2latex.py" ".tex" nil)) - (newlatex . ("rst2newlatex.py" ".tex" nil)) - (pseudoxml . ("rst2pseudoxml.py" ".xml" nil)) - (xml . ("rst2xml.py" ".xml" nil))) +(defcustom rst-compile-toolsets + `((html ,(if (executable-find "rst2html.py") "rst2html.py" "rst2html") + ".html" nil) + (latex ,(if (executable-find "rst2latex.py") "rst2latex.py" "rst2latex") + ".tex" nil) + (newlatex ,(if (executable-find "rst2newlatex.py") "rst2newlatex.py" + "rst2newlatex") + ".tex" nil) + (pseudoxml ,(if (executable-find "rst2pseudoxml.py") "rst2pseudoxml.py" + "rst2pseudoxml") + ".xml" nil) + (xml ,(if (executable-find "rst2xml.py") "rst2xml.py" "rst2xml") + ".xml" nil) + (pdf ,(if (executable-find "rst2pdf.py") "rst2pdf.py" "rst2pdf") + ".pdf" nil) + (s5 ,(if (executable-find "rst2s5.py") "rst2s5.py" "rst2s5") + ".html" nil)) "Table describing the command to use for each toolset. An association list of the toolset to a list of the (command to use, extension of produced filename, options to the tool (nil or a -string)) to be used for converting the document.") +string)) to be used for converting the document." + :type '(alist :options (html latex newlatex pseudoxml xml) + :key-type symbol + :value-type (list :tag "Specification" + (file :tag "Command") + (string :tag "File extension") + (choice :tag "Command options" + (const :tag "No options" nil) + (string :tag "Options")))) + :group 'rst + :version "24.1") ;; Note for Python programmers not familiar with association lists: you can set ;; values in an alists like this, e.g. : @@ -3331,7 +3352,7 @@ (shell-command-on-region (if mark-active (region-beginning) (point-min)) (if mark-active (region-end) (point-max)) - "rst2pseudoxml.py" + (cadr (assq 'pseudoxml rst-compile-toolsets)) standard-output))) (defvar rst-pdf-program "xpdf" @@ -3341,6 +3362,8 @@ "Convert the document to a PDF file and launch a preview program." (interactive) (let* ((tmp-filename (make-temp-file "rst-out" nil ".pdf")) + (command (format "%s %s %s && %s %s" + (cadr (assq 'pdf rst-compile-toolsets)) (command (format "rst2pdf.py %s %s && %s %s" buffer-file-name tmp-filename rst-pdf-program tmp-filename))) @@ -3356,7 +3379,10 @@ "Convert the document to an S5 slide presentation and launch a preview program." (interactive) (let* ((tmp-filename (make-temp-file "rst-slides" nil ".html")) + (command (format "%s %s %s && %s %s" + (cadr (assq 's5 rst-compile-toolsets)) (command (format "rst2s5.py %s %s && %s %s" + buffer-file-name tmp-filename rst-slides-program tmp-filename))) (start-process-shell-command "rst-slides-preview" nil command) @@ -3454,11 +3480,10 @@ "A portable function that returns non-nil if the mark is active." (cond ((fboundp 'region-active-p) (region-active-p)) - ((boundp 'transient-mark-mode) transient-mark-mode mark-active))) - + ((boundp 'transient-mark-mode) (and transient-mark-mode mark-active)) + (t mark-active))) (provide 'rst) -;; arch-tag: 255ac0a3-a689-44cb-8643-04ca55ae490d ;;; rst.el ends here ------------------------------------------------------------ revno: 102747 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-01-03 20:42:43 -0800 message: * src/emacs.c (emacs_copyright): Update short copyright year to 2011. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-01-03 19:35:59 +0000 +++ src/ChangeLog 2011-01-04 04:42:43 +0000 @@ -1,3 +1,7 @@ +2011-01-04 Glenn Morris + + * emacs.c (emacs_copyright): Update short copyright year to 2011. + 2011-01-03 Eli Zaretskii * image.c (png_jmpbuf): Remove definition. === modified file 'src/emacs.c' --- src/emacs.c 2010-11-23 18:47:23 +0000 +++ src/emacs.c 2011-01-04 04:42:43 +0000 @@ -1,7 +1,7 @@ /* Fully extensible Emacs, running on Unix, intended for GNU. Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, - 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -94,8 +94,8 @@ /* If you change the following line, remember to update msdos/mainmake.v2 which gleans the Emacs version from it! */ -static const char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc."; static const char emacs_version[] = "24.0.50"; +static const char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc."; /* Make these values available in GDB, which doesn't see macros. */ ------------------------------------------------------------ revno: 102746 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2011-01-04 02:24:15 +0000 message: flow-fill.el (fill-flowed-encode): Do encoding citation-aware. gnus-art.el (gnus-treat-fill-long-lines): Add missing version tag. gnus-msg.el (gnus-message-replyencrypt): Fix typo in version string. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-01-03 08:13:45 +0000 +++ lisp/gnus/ChangeLog 2011-01-04 02:24:15 +0000 @@ -1,3 +1,7 @@ +2011-01-03 Lars Magne Ingebrigtsen + + * flow-fill.el (fill-flowed-encode): Do encoding citation-aware. + 2011-01-03 Glenn Morris * sieve-manage.el (sieve-manage-open): Correctly set sieve-manage-port. === modified file 'lisp/gnus/flow-fill.el' --- lisp/gnus/flow-fill.el 2010-09-18 10:02:19 +0000 +++ lisp/gnus/flow-fill.el 2011-01-04 02:24:15 +0000 @@ -1,7 +1,7 @@ ;;; flow-fill.el --- interpret RFC2646 "flowed" text -;; Copyright (C) 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010, 2011 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Keywords: mail @@ -82,19 +82,38 @@ ;; Go through each paragraph, filling it and adding SPC ;; as the last character on each line. (while (setq end (text-property-any start (point-max) 'hard 't)) - (let ((fill-column (eval fill-flowed-encode-column))) - (fill-region start end t 'nosqueeze 'to-eop)) - (goto-char start) - ;; `fill-region' probably distorted end. - (setq end (text-property-any start (point-max) 'hard 't)) - (while (and (< (point) end) - (re-search-forward "$" (1- end) t)) - (insert " ") - (setq end (1+ end)) - (forward-char)) - (goto-char (setq start (1+ end))))) + (save-restriction + (narrow-to-region start end) + (let ((fill-column (eval fill-flowed-encode-column))) + (fill-flowed-fill-buffer)) + (goto-char (point-min)) + (while (re-search-forward "\n" nil t) + (replace-match " \n" t t)) + (goto-char (setq start (1+ (point-max))))))) t))) +(defun fill-flowed-fill-buffer () + (let ((prefix nil) + (prev-prefix nil) + (start (point-min))) + (goto-char (point-min)) + (while (not (eobp)) + (setq prefix (and (looking-at "[> ]+") + (match-string 0))) + (if (equal prefix prev-prefix) + (forward-line 1) + (save-restriction + (narrow-to-region start (point)) + (let ((fill-prefix prev-prefix)) + (fill-region (point-min) (point-max) t 'nosqueeze 'to-eop)) + (goto-char (point-max))) + (setq prev-prefix prefix + start (point)))) + (save-restriction + (narrow-to-region start (point)) + (let ((fill-prefix prev-prefix)) + (fill-region (point-min) (point-max) t 'nosqueeze 'to-eop))))) + ;;;###autoload (defun fill-flowed (&optional buffer delete-space) (with-current-buffer (or (current-buffer) buffer) === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2010-12-21 02:30:36 +0000 +++ lisp/gnus/gnus-art.el 2011-01-04 02:24:15 +0000 @@ -1,7 +1,7 @@ ;;; gnus-art.el --- article mode commands for Gnus ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -1594,6 +1594,7 @@ "Fill long lines. Valid values are nil, t, `head', `first', `last', an integer or a predicate. See Info node `(gnus)Customizing Articles'." + :version "24.1" :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-custom) === modified file 'lisp/gnus/gnus-msg.el' --- lisp/gnus/gnus-msg.el 2011-01-03 08:13:45 +0000 +++ lisp/gnus/gnus-msg.el 2011-01-04 02:24:15 +0000 @@ -247,7 +247,7 @@ (defcustom gnus-message-replyencrypt t "Automatically encrypt replies to encrypted messages. See also the `mml-default-encrypt-method' variable." - :version "22.1" + :version "24.1" :group 'gnus-message :type 'boolean) ------------------------------------------------------------ revno: 102745 committer: Ken Manheimer branch nick: trunk timestamp: Mon 2011-01-03 15:50:05 -0500 message: add neglected allout.el ChangeLog entries to ChangeLog. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-01-02 20:28:40 +0000 +++ lisp/ChangeLog 2011-01-03 20:50:05 +0000 @@ -114,6 +114,13 @@ * mail/mail-utils.el (mail-mbox-from): Handle From: headers with multiple addresses. (Bug#7760) +2011-01-01 Ken Manheimer + + allout.el (allout-auto-fill): Do not infinitely recurse - use + do-auto-fill if everything points back to allout-auto-fill. + (allout-mode-deactivate-hook): Declare obsolete, in favor of + standard-formed minor-mode deactivate hook, allout-mode-off-hook. + 2010-12-31 Michael Albinus * net/tramp-sh.el (tramp-methods): Add recursive options to "scpc" @@ -183,6 +190,21 @@ pretty-printed, so that it is mergeable by line-based text merging, as suggested by Iain Dalton . +2010-12-28 Ken Manheimer + + allout.el (allout-v18/19-file-var-hack): Obsolete, remove. + (allout-mode): Argument "toggle" => "force". + Refine the docstring. + Remove special provisions for reactivation, besides the 'force' + argument. + Consolidate layout provisions coce directly into the activation + condition branch, now that we've removed those provisions. + (allout-unload-function): Explicitly activate the mode before + deactivating, if it's initially deactivated. + (allout-set-buffer-multibyte): Properly prevent byte-compiler + warnings for version of function used only where + set-buffer-multibyte is unavailable. + 2010-12-28 Chong Yidong * tool-bar.el (tool-bar-setup): Remove :enable conditions, which ------------------------------------------------------------ revno: 102744 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2011-01-03 21:35:59 +0200 message: Don't use png_jmpbuf, it doesn't work with dynamic loading. image.c (png_jmpbuf): Remove definition. (my_png_error, png_load): Don't use png_jmpbuf. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-01-02 20:28:40 +0000 +++ src/ChangeLog 2011-01-03 19:35:59 +0000 @@ -1,3 +1,8 @@ +2011-01-03 Eli Zaretskii + + * image.c (png_jmpbuf): Remove definition. + (my_png_error, png_load): Don't use png_jmpbuf. + 2011-01-02 Eli Zaretskii * keyboard.c (Vselect_active_regions): Doc fix. (Bug#7702) === modified file 'src/image.c' --- src/image.c 2011-01-02 20:28:40 +0000 +++ src/image.c 2011-01-03 19:35:59 +0000 @@ -5528,12 +5528,6 @@ #endif /* HAVE_NTGUI */ -/* libpng before 1.4.0 didn't have png_jmpbuf; v1.4.0 and later - deprecate direct access to png_ptr fields. */ -#ifndef png_jmpbuf -# define png_jmpbuf(PTR) ((PTR)->jmpbuf) -#endif - /* Error and warning handlers installed when the PNG library is initialized. */ @@ -5544,7 +5538,7 @@ /* Avoid compiler warning about deprecated direct access to png_ptr's fields in libpng versions 1.4.x. */ image_error ("PNG error: %s", build_string (msg), Qnil); - longjmp (png_jmpbuf (png_ptr), 1); + longjmp (png_ptr->jmpbuf, 1); } @@ -5706,7 +5700,7 @@ /* Set error jump-back. We come back here when the PNG library detects an error. */ - if (setjmp (png_jmpbuf (png_ptr))) + if (setjmp (png_ptr->jmpbuf)) { error: if (png_ptr) ------------------------------------------------------------ revno: 102743 author: Karl Fogel committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2011-01-03 08:13:45 +0000 message: gnus-msg.el (gnus-message-replyencrypt): Default to `t'. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-01-03 01:44:30 +0000 +++ lisp/gnus/ChangeLog 2011-01-03 08:13:45 +0000 @@ -5,6 +5,10 @@ * sieve.el (sieve-open-server): Give a more explicit error if sieve-manage-open returns nil. (Bug#7720) +2011-01-02 Karl Fogel + + * gnus-msg.el (gnus-message-replyencrypt): Default to `t'. + 2011-01-02 Lars Magne Ingebrigtsen * nnimap.el (nnimap-login): Prefer AUTH=CRAM-MD5, if it's available. === modified file 'lisp/gnus/gnus-msg.el' --- lisp/gnus/gnus-msg.el 2010-12-02 22:21:31 +0000 +++ lisp/gnus/gnus-msg.el 2011-01-03 08:13:45 +0000 @@ -1,7 +1,8 @@ ;;; gnus-msg.el --- mail and post interface for Gnus ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +;; Foundation, Inc. ;; Author: Masanobu UMEDA ;; Lars Magne Ingebrigtsen @@ -243,10 +244,10 @@ :group 'gnus-message :type 'boolean) -(defcustom gnus-message-replyencrypt - nil +(defcustom gnus-message-replyencrypt t "Automatically encrypt replies to encrypted messages. See also the `mml-default-encrypt-method' variable." + :version "22.1" :group 'gnus-message :type 'boolean) ------------------------------------------------------------ revno: 102742 committer: Glenn Morris branch nick: trunk timestamp: Sun 2011-01-02 17:44:30 -0800 message: * lisp/gnus/sieve-manage.el (sieve-manage-open): Correctly set sieve-manage-port. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-01-03 01:41:54 +0000 +++ lisp/gnus/ChangeLog 2011-01-03 01:44:30 +0000 @@ -1,5 +1,7 @@ 2011-01-03 Glenn Morris + * sieve-manage.el (sieve-manage-open): Correctly set sieve-manage-port. + * sieve.el (sieve-open-server): Give a more explicit error if sieve-manage-open returns nil. (Bug#7720) === modified file 'lisp/gnus/sieve-manage.el' --- lisp/gnus/sieve-manage.el 2010-11-01 01:38:04 +0000 +++ lisp/gnus/sieve-manage.el 2011-01-03 01:44:30 +0000 @@ -390,13 +390,14 @@ If nil, chooses the best stream the server is capable of. Optional argument BUFFER is buffer (buffer, or string naming buffer) to work in." - (setq buffer (or buffer (format " *sieve* %s:%s" server (or port sieve-manage-default-port)))) + (or port (setq port sieve-manage-default-port)) + (setq buffer (or buffer (format " *sieve* %s:%s" server port))) (with-current-buffer (get-buffer-create buffer) (mapc 'make-local-variable sieve-manage-local-variables) (sieve-manage-disable-multibyte) (buffer-disable-undo) (setq sieve-manage-server (or server sieve-manage-server)) - (setq sieve-manage-port (or port sieve-manage-port)) + (setq sieve-manage-port port) (setq sieve-manage-stream (or stream sieve-manage-stream)) (message "sieve: Connecting to %s..." sieve-manage-server) (if (let ((sieve-manage-stream