Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 102207. ------------------------------------------------------------ revno: 102207 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 23:44:54 -0700 message: * lisp/emacs-lisp/smie.el (smie): New custom group. (smie-blink-matching-inners, smie-indent-basic): Add :group. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-01 06:13:43 +0000 +++ lisp/ChangeLog 2010-11-01 06:44:54 +0000 @@ -1,5 +1,8 @@ 2010-11-01 Glenn Morris + * emacs-lisp/smie.el (smie): New custom group. + (smie-blink-matching-inners, smie-indent-basic): Add :group. + * faces.el (xw-defined-colors, x-setup-function-keys): * mouse-sel.el (x-select-text): * term/w32console.el (x-setup-function-keys): Update declarations. === modified file 'lisp/emacs-lisp/smie.el' --- lisp/emacs-lisp/smie.el 2010-10-29 19:20:28 +0000 +++ lisp/emacs-lisp/smie.el 2010-11-01 06:44:54 +0000 @@ -70,6 +70,10 @@ (eval-when-compile (require 'cl)) +(defgroup smie nil + "Simple Minded Indentation Engine." + :group 'languages) + (defvar comment-continue) (declare-function comment-string-strip "newcomment" (str beforep afterp)) @@ -790,7 +794,8 @@ (defcustom smie-blink-matching-inners t "Whether SMIE should blink to matching opener for inner keywords. If non-nil, it will blink not only for \"begin..end\" but also for \"if...else\"." - :type 'boolean) + :type 'boolean + :group 'smie) (defun smie-blink-matching-check (start end) (save-excursion @@ -866,7 +871,8 @@ (defcustom smie-indent-basic 4 "Basic amount of indentation." - :type 'integer) + :type 'integer + :group 'smie) (defvar smie-rules-function 'ignore "Function providing the indentation rules. ------------------------------------------------------------ revno: 102206 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 23:39:01 -0700 message: Silence compilation of mm-util.el. * lisp/gnus/mm-util.el (gnus-completing-read): Autoload. (mm-read-coding-system): Simplify Emacs definition. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-01 06:21:44 +0000 +++ lisp/gnus/ChangeLog 2010-11-01 06:39:01 +0000 @@ -5,6 +5,9 @@ 2010-11-01 Glenn Morris + * mm-util.el (gnus-completing-read): Autoload. + (mm-read-coding-system): Simplify Emacs definition. + * nnmail.el (gnus-activate-group): * nnimap.el (gnutls-negotiate): * nntp.el (netrc-parse): Fix declarations. === modified file 'lisp/gnus/mm-util.el' --- lisp/gnus/mm-util.el 2010-11-01 02:21:42 +0000 +++ lisp/gnus/mm-util.el 2010-11-01 06:39:01 +0000 @@ -39,6 +39,10 @@ (require 'timer))) (defvar mm-mime-mule-charset-alist ) +;; Note this is not presently used on Emacs >= 23, which is good, +;; since it means standalone message-mode (which requires mml and +;; hence mml-util) does not load gnus-util. +(autoload 'gnus-completing-read "gnus-util") ;; Emulate functions that are not available in every (X)Emacs version. ;; The name of a function is prefixed with mm-, like `mm-char-int' for @@ -263,18 +267,19 @@ ;; Actually, there should be an `mm-coding-system-mime-charset'. (eval-and-compile (defalias 'mm-read-coding-system - (cond - ((fboundp 'read-coding-system) - (if (and (featurep 'xemacs) - (<= (string-to-number emacs-version) 21.1)) - (lambda (prompt &optional default-coding-system) - (read-coding-system prompt)) - 'read-coding-system)) - (t (lambda (prompt &optional default-coding-system) - "Prompt the user for a coding system." - (gnus-completing-read - prompt (mapcar (lambda (s) (symbol-name (car s))) - mm-mime-mule-charset-alist))))))) + (if (featurep 'emacs) 'read-coding-system + (cond + ((fboundp 'read-coding-system) + (if (and (featurep 'xemacs) + (<= (string-to-number emacs-version) 21.1)) + (lambda (prompt &optional default-coding-system) + (read-coding-system prompt)) + 'read-coding-system)) + (t (lambda (prompt &optional default-coding-system) + "Prompt the user for a coding system." + (gnus-completing-read + prompt (mapcar (lambda (s) (symbol-name (car s))) + mm-mime-mule-charset-alist)))))))) (defvar mm-coding-system-list nil) (defun mm-get-coding-system-list () ------------------------------------------------------------ revno: 102205 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 23:21:44 -0700 message: * lisp/gnus/nnmail.el (gnus-activate-group): Update declaration. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-01 06:16:46 +0000 +++ lisp/gnus/ChangeLog 2010-11-01 06:21:44 +0000 @@ -5,6 +5,7 @@ 2010-11-01 Glenn Morris + * nnmail.el (gnus-activate-group): * nnimap.el (gnutls-negotiate): * nntp.el (netrc-parse): Fix declarations. === modified file 'lisp/gnus/nnmail.el' --- lisp/gnus/nnmail.el 2010-10-14 14:32:27 +0000 +++ lisp/gnus/nnmail.el 2010-11-01 06:21:44 +0000 @@ -1,7 +1,8 @@ ;;; nnmail.el --- mail support functions for the Gnus mail backends ;; 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 +;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news, mail @@ -1347,7 +1348,7 @@ ;;; Utility functions (declare-function gnus-activate-group "gnus-start" - (group &optional scan dont-check method)) + (group &optional scan dont-check method dont-sub-check)) (defun nnmail-do-request-post (accept-func &optional server) "Utility function to directly post a message to an nnmail-derived group. ------------------------------------------------------------ revno: 102204 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 23:19:31 -0700 message: Fix some declarations in cedet. * lisp/cedet/semantic/symref/cscope.el (ede-toplevel): * lisp/cedet/semantic/symref.el (ede-toplevel): * lisp/cedet/semantic/tag-file.el (ede-toplevel): * lisp/cedet/ede.el (ede-toplevel): Fix declarations. diff: === modified file 'lisp/cedet/ChangeLog' --- lisp/cedet/ChangeLog 2010-10-31 22:55:44 +0000 +++ lisp/cedet/ChangeLog 2010-11-01 06:19:31 +0000 @@ -1,3 +1,10 @@ +2010-11-01 Glenn Morris + + * semantic/symref/cscope.el (ede-toplevel): + * semantic/symref.el (ede-toplevel): + * semantic/tag-file.el (ede-toplevel): + * ede.el (ede-toplevel): Fix declarations. + 2010-10-31 Glenn Morris * ede/proj-elisp.el (project-compile-target): Fix previous change. === modified file 'lisp/cedet/ede.el' --- lisp/cedet/ede.el 2010-09-23 19:00:31 +0000 +++ lisp/cedet/ede.el 2010-11-01 06:19:31 +0000 @@ -1,7 +1,7 @@ ;;; ede.el --- Emacs Development Environment gloss -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, +;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam ;; Keywords: project, make @@ -56,7 +56,7 @@ (declare-function ede-directory-project-p "ede/files") (declare-function ede-find-subproject-for-directory "ede/files") (declare-function ede-project-directory-remove-hash "ede/files") -(declare-function ede-toplevel "ede/files") +(declare-function ede-toplevel "ede/base") (declare-function ede-toplevel-project "ede/files") (declare-function ede-up-directory "ede/files") (declare-function semantic-lex-make-spp-table "semantic/lex-spp") @@ -1278,5 +1278,4 @@ (ede-speedbar-file-setup) (add-hook 'speedbar-load-hook 'ede-speedbar-file-setup)) -;; arch-tag: 0e1e0eba-484f-4119-abdb-30951f725705 ;;; ede.el ends here === modified file 'lisp/cedet/semantic/symref.el' --- lisp/cedet/semantic/symref.el 2010-09-19 02:49:54 +0000 +++ lisp/cedet/semantic/symref.el 2010-11-01 06:19:31 +0000 @@ -69,7 +69,7 @@ (defvar ede-minor-mode) (declare-function data-debug-new-buffer "data-debug") (declare-function data-debug-insert-object-slots "eieio-datadebug") -(declare-function ede-toplevel "ede/files") +(declare-function ede-toplevel "ede/base") (declare-function ede-project-root-directory "ede/files") (declare-function ede-up-directory "ede/files") @@ -508,5 +508,4 @@ ;; generated-autoload-load-name: "semantic/symref" ;; End: -;; arch-tag: 928394b7-19ef-4f76-8cb3-37e9a9891984 ;;; semantic/symref.el ends here === modified file 'lisp/cedet/semantic/symref/cscope.el' --- lisp/cedet/semantic/symref/cscope.el 2010-01-13 08:35:10 +0000 +++ lisp/cedet/semantic/symref/cscope.el 2010-11-01 06:19:31 +0000 @@ -27,7 +27,7 @@ (require 'semantic/symref) (defvar ede-minor-mode) -(declare-function ede-toplevel "ede/files") +(declare-function ede-toplevel "ede/base") (declare-function ede-project-root-directory "ede/files") ;;; Code: @@ -91,5 +91,4 @@ ;; generated-autoload-load-name: "semantic/symref/cscope" ;; End: -;; arch-tag: 7c0a4e02-ade4-407a-9df7-4f948bd61a19 ;;; semantic/symref/cscope.el ends here === modified file 'lisp/cedet/semantic/tag-file.el' --- lisp/cedet/semantic/tag-file.el 2010-01-13 08:35:10 +0000 +++ lisp/cedet/semantic/tag-file.el 2010-11-01 06:19:31 +0000 @@ -32,7 +32,7 @@ (declare-function semanticdb-table-child-p "semantic/db" t t) (declare-function semanticdb-get-buffer "semantic/db") (declare-function semantic-dependency-find-file-on-path "semantic/dep") -(declare-function ede-toplevel "ede/files") +(declare-function ede-toplevel "ede/base") ;;; Code: @@ -214,5 +214,4 @@ ;; generated-autoload-load-name: "semantic/tag-file" ;; End: -;; arch-tag: 71d4cf18-c1ec-414c-bb0a-c2ed914c1361 ;;; semantic/tag-file.el ends here ------------------------------------------------------------ revno: 102203 committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2010-11-01 06:16:46 +0000 message: shr.el: No need to declare `declare-function' since shr.el is for only Emacsen that provide `libxml-parse-html-region'. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-01 06:13:43 +0000 +++ lisp/gnus/ChangeLog 2010-11-01 06:16:46 +0000 @@ -1,3 +1,8 @@ +2010-11-01 Katsumi Yamaoka + + * shr.el: No need to declare `declare-function' since shr.el is for + only Emacsen that provide `libxml-parse-html-region'. + 2010-11-01 Glenn Morris * nnimap.el (gnutls-negotiate): === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2010-11-01 02:19:17 +0000 +++ lisp/gnus/shr.el 2010-11-01 06:16:46 +0000 @@ -30,10 +30,6 @@ ;;; Code: -;; For Emacs <22.2 and XEmacs. -(eval-and-compile - (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))) - (eval-when-compile (require 'cl)) (require 'browse-url) (unless (aref (char-category-set (make-char 'japanese-jisx0208 33 35)) ?>) ------------------------------------------------------------ revno: 102202 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 23:13:43 -0700 message: Fix some declarations. * lisp/gnus/nnimap.el (gnutls-negotiate): * lisp/gnus/nntp.el (netrc-parse): Fix declarations. * lisp/faces.el (xw-defined-colors, x-setup-function-keys): * lisp/mouse-sel.el (x-select-text): * lisp/term/w32console.el (x-setup-function-keys): Update declarations. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-01 06:00:04 +0000 +++ lisp/ChangeLog 2010-11-01 06:13:43 +0000 @@ -1,5 +1,9 @@ 2010-11-01 Glenn Morris + * faces.el (xw-defined-colors, x-setup-function-keys): + * mouse-sel.el (x-select-text): + * term/w32console.el (x-setup-function-keys): Update declarations. + * progmodes/ruby-mode.el (ruby-syntax-propertize-heredoc): Declare. * textmodes/ispell.el (comment-add): Declare. === modified file 'lisp/faces.el' --- lisp/faces.el 2010-10-24 18:43:31 +0000 +++ lisp/faces.el 2010-11-01 06:13:43 +0000 @@ -30,7 +30,7 @@ (eval-when-compile (require 'cl)) -(declare-function xw-defined-colors "term/x-win" (&optional frame)) +(declare-function xw-defined-colors "term/common-win" (&optional frame)) (defvar help-xref-stack-item) @@ -1957,7 +1957,7 @@ (list (cons 'cursor-color fg))))))) (declare-function x-create-frame "xfns.c" (parms)) -(declare-function x-setup-function-keys "term/x-win" (frame)) +(declare-function x-setup-function-keys "term/common-win" (frame)) (defun x-create-frame-with-faces (&optional parameters) "Create and return a frame with frame parameters PARAMETERS. @@ -2570,5 +2570,4 @@ (provide 'faces) -;; arch-tag: 19a4759f-2963-445f-b004-425b9aadd7d6 ;;; faces.el ends here === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-01 03:58:53 +0000 +++ lisp/gnus/ChangeLog 2010-11-01 06:13:43 +0000 @@ -1,3 +1,8 @@ +2010-11-01 Glenn Morris + + * nnimap.el (gnutls-negotiate): + * nntp.el (netrc-parse): Fix declarations. + 2010-11-01 Katsumi Yamaoka * gnus-util.el (gnus-string-match-p): New function, that is an alias to === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2010-11-01 02:07:01 +0000 +++ lisp/gnus/nnimap.el 2010-11-01 06:13:43 +0000 @@ -299,7 +299,8 @@ (* 5 60))) (nnimap-send-command "NOOP"))))))) -(declare-function gnutls-negotiate "subr" (fn file &optional arglist fileonly)) +(declare-function gnutls-negotiate "gnutls" + (proc type &optional priority-string trustfiles keyfiles)) (defun nnimap-open-connection (buffer) (unless nnimap-keepalive-timer === modified file 'lisp/gnus/nntp.el' --- lisp/gnus/nntp.el 2010-10-11 23:29:33 +0000 +++ lisp/gnus/nntp.el 2010-11-01 06:13:43 +0000 @@ -1,8 +1,8 @@ ;;; nntp.el --- nntp access for Gnus -;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993, -;; 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, -;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993, 1994, 1995, 1996, +;; 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -1172,7 +1172,7 @@ reading." (nntp-send-command "^.*\n" "MODE READER")) -(declare-function netrc-parse "netrc" (file)) +(declare-function netrc-parse "netrc" (&optional file)) (declare-function netrc-machine "netrc" (list machine &optional port defaultport)) (declare-function netrc-get "netrc" (alist type)) === modified file 'lisp/mouse-sel.el' --- lisp/mouse-sel.el 2010-09-02 10:17:02 +0000 +++ lisp/mouse-sel.el 2010-11-01 06:13:43 +0000 @@ -1,7 +1,7 @@ ;;; mouse-sel.el --- multi-click selection support for Emacs 19 -;; Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Mike Williams ;; Keywords: mouse @@ -299,7 +299,7 @@ SELECTION-THING-SYMBOL = name of variable where the current selection type for this selection should be stored.") -(declare-function x-select-text "term/x-win" (text)) +(declare-function x-select-text "term/common-win" (text)) (defvar mouse-sel-set-selection-function (if (eq mouse-sel-default-bindings 'interprogram-cut-paste) @@ -314,7 +314,7 @@ SELECTION, the name of the selection concerned, and VALUE, the text to store. -This sets the selection, unless `mouse-sel-default-bindings' +This sets the selection, unless `mouse-sel-default-bindings' is `interprogram-cut-paste'.") (declare-function x-selection-value "term/x-win" ()) @@ -749,5 +749,4 @@ (provide 'mouse-sel) -;; arch-tag: 86e6c73f-deaa-48d3-a24e-c565fda1f7d7 ;;; mouse-sel.el ends here === modified file 'lisp/term/w32console.el' --- lisp/term/w32console.el 2010-01-13 08:35:10 +0000 +++ lisp/term/w32console.el 2010-11-01 06:13:43 +0000 @@ -45,7 +45,7 @@ ("white" 15 65535 65535 65535)) "A list of VGA console colors, their indices and 16-bit RGB values.") -(declare-function x-setup-function-keys "w32-fns" (frame)) +(declare-function x-setup-function-keys "term/common-win" (frame)) (defun terminal-init-w32console () "Terminal initialization function for w32 console." @@ -62,4 +62,4 @@ (tty-set-up-initial-frame-faces) (run-hooks 'terminal-init-w32-hook)) -;; arch-tag: 3195fd5e-ab86-4a46-b1dc-4f7a8c8deff3 +;;; w32console.el ends here ------------------------------------------------------------ revno: 102201 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 23:00:04 -0700 message: * lisp/progmodes/ruby-mode.el (ruby-syntax-propertize-heredoc): Declare. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-01 05:55:40 +0000 +++ lisp/ChangeLog 2010-11-01 06:00:04 +0000 @@ -1,5 +1,7 @@ 2010-11-01 Glenn Morris + * progmodes/ruby-mode.el (ruby-syntax-propertize-heredoc): Declare. + * textmodes/ispell.el (comment-add): Declare. * net/gnutls.el (gnutls-boot, gnutls-errorp, gnutls-error-string): === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2010-10-27 14:26:01 +0000 +++ lisp/progmodes/ruby-mode.el 2010-11-01 06:00:04 +0000 @@ -1,7 +1,7 @@ ;;; ruby-mode.el --- Major mode for editing Ruby files -;; Copyright (C) 1994, 1995, 1996 1997, 1998, 1999, 2000, 2001, -;; 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Copyright (C) 1994, 1995, 1996 1997, 1998, 1999, 2000, 2001, 2002, +;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 ;; Free Software Foundation, Inc. ;; Authors: Yukihiro Matsumoto @@ -1108,6 +1108,8 @@ (if mlist (concat mlist mname) mname) mlist))))) +(declare-function ruby-syntax-propertize-heredoc "ruby-mode" (limit)) + (if (eval-when-compile (fboundp #'syntax-propertize-rules)) ;; New code that works independently from font-lock. (progn @@ -1162,7 +1164,7 @@ ;; inf-loop. (if (< (point) start) (goto-char start)))))) ) - + ;; For Emacsen where syntax-propertize-rules is not (yet) available, ;; fallback on the old font-lock-syntactic-keywords stuff. @@ -1478,5 +1480,4 @@ (provide 'ruby-mode) -;; arch-tag: e6ecc893-8005-420c-b7f9-34ab99a1fff9 ;;; ruby-mode.el ends here ------------------------------------------------------------ revno: 102200 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 22:55:40 -0700 message: * lisp/textmodes/ispell.el (comment-add): Declare. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-01 05:53:15 +0000 +++ lisp/ChangeLog 2010-11-01 05:55:40 +0000 @@ -1,5 +1,7 @@ 2010-11-01 Glenn Morris + * textmodes/ispell.el (comment-add): Declare. + * net/gnutls.el (gnutls-boot, gnutls-errorp, gnutls-error-string): Declare. === modified file 'lisp/textmodes/ispell.el' --- lisp/textmodes/ispell.el 2010-10-18 16:01:43 +0000 +++ lisp/textmodes/ispell.el 2010-11-01 05:55:40 +0000 @@ -1,7 +1,8 @@ ;;; ispell.el --- interface to International Ispell Versions 3.1 and 3.2 ;; Copyright (C) 1994, 1995, 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 +;; Free Software Foundation, Inc. ;; Author: Ken Stevens ;; Maintainer: Ken Stevens @@ -3896,6 +3897,9 @@ ;;; returns optionally adjusted region-end-point. +;; If comment-padright is defined, newcomment must be loaded. +(declare-function comment-add "newcomment" (arg)) + (defun ispell-add-per-file-word-list (word) "Add WORD to the per-file word list." (or ispell-buffer-local-name @@ -3970,5 +3974,4 @@ ; LocalWords: uuencoded unidiff sc nn VM SGML eval IspellPersDict unsplitable ; LocalWords: lns XEmacs HTML casechars Multibyte -;; arch-tag: 4941b9f9-3b7c-4a76-a4ed-5fa8b6010ef5 ;;; ispell.el ends here ------------------------------------------------------------ revno: 102199 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 22:53:15 -0700 message: * net/gnutls.el (gnutls-boot, gnutls-errorp, gnutls-error-string): Declare. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-01 05:48:20 +0000 +++ lisp/ChangeLog 2010-11-01 05:53:15 +0000 @@ -1,5 +1,8 @@ 2010-11-01 Glenn Morris + * net/gnutls.el (gnutls-boot, gnutls-errorp, gnutls-error-string): + Declare. + * info.el (finder-keywords-hash, package-alist): Declare. 2010-11-01 Chong Yidong === modified file 'lisp/net/gnutls.el' --- lisp/net/gnutls.el 2010-10-04 01:16:00 +0000 +++ lisp/net/gnutls.el 2010-11-01 05:53:15 +0000 @@ -1,4 +1,5 @@ ;;; gnutls.el --- Support SSL/TLS connections through GnuTLS + ;; Copyright (C) 2010 Free Software Foundation, Inc. ;; Author: Ted Zlatanov @@ -65,6 +66,8 @@ (let ((proc (open-network-stream name buffer host service))) (gnutls-negotiate proc 'gnutls-x509pki))) +(declare-function gnutls-boot "gnutls.c" (proc type proplist)) + (defun gnutls-negotiate (proc type &optional priority-string trustfiles keyfiles) "Negotiate a SSL/TLS connection. @@ -95,6 +98,9 @@ proc)) +(declare-function gnutls-errorp "gnutls.c" (error)) +(declare-function gnutls-error-string "gnutls.c" (error)) + (defun gnutls-message-maybe (doit format &rest params) "When DOIT, message with the caller name followed by FORMAT on PARAMS." ;; (apply 'debug format (or params '(nil))) ------------------------------------------------------------ revno: 102198 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 22:48:20 -0700 message: * lisp/info.el (finder-keywords-hash, package-alist): Declare. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-01 03:19:01 +0000 +++ lisp/ChangeLog 2010-11-01 05:48:20 +0000 @@ -1,3 +1,7 @@ +2010-11-01 Glenn Morris + + * info.el (finder-keywords-hash, package-alist): Declare. + 2010-11-01 Chong Yidong * finder.el (finder-compile-keywords): Don't use intern-soft, === modified file 'lisp/info.el' --- lisp/info.el 2010-09-25 21:42:48 +0000 +++ lisp/info.el 2010-11-01 05:48:20 +0000 @@ -1,8 +1,8 @@ ;; info.el --- info package for Emacs -;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 1998, +;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +;; 2010 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: help @@ -3379,6 +3379,8 @@ (declare-function find-library-name "find-func" (library)) (declare-function finder-unknown-keywords "finder" ()) (declare-function lm-commentary "lisp-mnt" (&optional file)) +(defvar finder-keywords-hash) +(defvar package-alist) ; finder requires package (defun Info-finder-find-node (filename nodename &optional no-going-back) "Finder-specific implementation of Info-find-node-2." @@ -4930,5 +4932,4 @@ (provide 'info) -;; arch-tag: f2480fe2-2139-40c1-a49b-6314991164ac ;;; info.el ends here ------------------------------------------------------------ revno: 102197 committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2010-11-01 03:58:53 +0000 message: gnus-util.el (gnus-string-match-p): New function, that is an alias to string-match-p in Emacs >=23. gnus-msg.el (gnus-configure-posting-styles) nnir.el (nnir-run-gmane): Use gnus-string-match-p. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-01 02:38:33 +0000 +++ lisp/gnus/ChangeLog 2010-11-01 03:58:53 +0000 @@ -1,3 +1,11 @@ +2010-11-01 Katsumi Yamaoka + + * gnus-util.el (gnus-string-match-p): New function, that is an alias to + string-match-p in Emacs >=23. + + * gnus-msg.el (gnus-configure-posting-styles) + * nnir.el (nnir-run-gmane): Use gnus-string-match-p. + 2010-11-01 Glenn Morris * nnir.el (declare-function): Add compat stub. === modified file 'lisp/gnus/gnus-msg.el' --- lisp/gnus/gnus-msg.el 2010-10-31 22:31:24 +0000 +++ lisp/gnus/gnus-msg.el 2010-11-01 03:58:53 +0000 @@ -1892,7 +1892,7 @@ (cond ((stringp value) (if (and (stringp match) - (string-match-p "\\\\[&[:digit:]]" value) + (gnus-string-match-p "\\\\[&[:digit:]]" value) (match-beginning 1)) (gnus-match-substitute-replacement value nil nil group) value)) === modified file 'lisp/gnus/gnus-util.el' --- lisp/gnus/gnus-util.el 2010-11-01 01:34:55 +0000 +++ lisp/gnus/gnus-util.el 2010-11-01 03:58:53 +0000 @@ -2010,6 +2010,14 @@ (match-data t))) (replace-match replacement fixedcase literal match subexp))))))) +(if (fboundp 'string-match-p) + (defalias 'gnus-string-match-p 'string-match-p) + (defsubst gnus-string-match-p (regexp string &optional start) + "\ +Same as `string-match' except this function does not change the match data." + (save-match-data + (string-match regexp string start)))) + (provide 'gnus-util) ;;; gnus-util.el ends here === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2010-11-01 02:38:33 +0000 +++ lisp/gnus/nnir.el 2010-11-01 03:58:53 +0000 @@ -1392,7 +1392,7 @@ ;; gmane interface (defun nnir-run-gmane (query srv &optional groups) "Run a search against a gmane back-end server." - (if (string-match-p "gmane" srv) + (if (gnus-string-match-p "gmane" srv) (let* ((case-fold-search t) (qstring (cdr (assq 'query query))) (server (cadr (gnus-server-to-method srv))) ------------------------------------------------------------ revno: 102196 committer: Chong Yidong branch nick: trunk timestamp: Sun 2010-10-31 23:20:57 -0400 message: etc/NEWS: Remove VC changes, since they are backported to 23.3. Edit selection changes. diff: === modified file 'etc/NEWS' --- etc/NEWS 2010-10-31 00:24:34 +0000 +++ etc/NEWS 2010-11-01 03:20:57 +0000 @@ -187,7 +187,7 @@ ** An Emacs Lisp package manager is now included. This is a convenient way to download and install additional packages, -from elpa.gnu.org. +from a package repository at elpa.gnu.org. *** `M-x list-packages' shows a list of packages, which can be selected for installation. @@ -227,8 +227,8 @@ kill instead. *** New command `delete-forward-char', bound to C-d and [delete]. -This is meant for interactive use, and obeys `delete-active-region'; -delete-char, meant for Lisp, does not obey `delete-active-region'. +This is meant for interactive use, and obeys `delete-active-region'. +The command `delete-char' does not obey `delete-active-region'. *** `delete-backward-char' is now a Lisp function. Apart from obeying `delete-active-region', its behavior is unchanged. @@ -240,65 +240,53 @@ ** Selection changes. The default handling of clipboard and primary selections has been -changed to conform with other X applications. - -The new behavior is that by default Emacs does not put selected text -into the clipboard, and does not add it to kill-ring, merely because -the text was selected. Only commands that kill text or copy it to the -kill-ring (C-w, M-w, C-k, etc.) put the killed text into the -clipboard. Selected text is put into the primary selection (on -systems, such as X, that support the primary selection separately from -the clipboard). - -Similarly, Emacs by default does not retrieve text from the clipboard -when the mouse (e.g., mouse-2) is used for pasting text selected in -another application. Mouse commands that paste text retrieve text -from the primary selection, on systems that support it separately from -the clipboard. Text from the clipboard is retrieved only by C-y, M-y -and other commands that yank text from the kill-ring. - -In other words, the default behavior is that mouse gestures that -select and paste text work with the primary selection (on X), while -keyboard commands that kill/copy and paste text work with the -clipboard. - -This change also means that the "Copy", "Cut", and "Paste" items of -the menu-bar "Edit" menu are now exactly equivalent to, respectively -M-w, C-w, and C-y. - -To get back the previous behavior, whereby mouse gestures set the -clipboard and retrieve text from there, customize the variables -`mouse-drag-copy-region' and (on X only) `x-select-enable-primary' to -non-nil values. If you don't want Emacs to put the text into the -clipboard, only to the primary selection, additionally customize -`x-select-enable-clipboard' to nil. - -These changes in the default behavior are reflected in the default -values of several variables: - -*** `select-active-regions' now defaults to t, so active regions set -the primary selection. It was nil in previous versions. - +changed to conform with other X applications. The exact changes are +described below; in short, mouse commands to select and paste text now +use the primary selection, while all other commands for killing and +yanking text now use the clipboard. + +*** Merely selecting text (e.g. with drag-mouse-1) does not add it to +the kill-ring. On systems with a primary selection separate from the +clipboard (such as X), the selected text is put in the primary +selection. + +*** mouse-2 is now bound to `mouse-yank-primary', which pastes from +the primary selection regardless of the contents of the kill-ring. + +*** Commands that kill text or copy it to the kill-ring (M-w, C-w, +C-k, etc.) also put the killed text into the clipboard. This change +also means that the "Copy", "Cut", and "Paste" items in the "Edit" +menu are now exactly equivalent to, respectively M-w, C-w, and C-y. + +*** Yank commands, such as C-y and M-y, retrieve text from the +clipboard if it is available. + +*** The above changes are reflected in the following new defaults: + +**** `select-active-regions' now defaults to t. It also accepts a new value, `only', which means to only set the primary selection for temporarily active regions (usually made by mouse-dragging or shift-selection). -*** `mouse-2' is now bound to `mouse-yank-primary'. +**** `mouse-2' is now bound to `mouse-yank-primary'. Previously, it was bound to `mouse-yank-at-click' (which is now unbound by default). -*** `x-select-enable-clipboard' now defaults to t on all platforms. -Thus, killing and yanking now use the clipboard (in addition to the -kill ring). Note that this variable was already non-nil by default on -MS-Windows, which does not support the primary selection between -applications. +**** `x-select-enable-clipboard' now defaults to t on all platforms. +Note that this variable was already non-nil by default on MS-Windows, +which does not support the primary selection between applications. -*** `x-select-enable-primary' now defaults to nil. +**** `x-select-enable-primary' now defaults to nil. This variable exists only on X; its default value was t in previous versions. -*** `mouse-drag-copy-region' now defaults to nil. -Its previous default value was t. +**** `mouse-drag-copy-region' now defaults to nil. + +*** To return to the previous behavior, where mouse commands use the +clipboard, change `mouse-drag-copy-region' and (on X only) +`x-select-enable-primary' to t. If you don't want Emacs to put the +text into the clipboard, only to the primary selection, additionally +set `x-select-enable-clipboard' to nil. *** Support for X cut buffers has been removed. @@ -350,7 +338,7 @@ *** Customize buffers now contain a search field. The search is performed using `customize-apropos'. -To turn off the search field, set custom-search-field to nil . +To turn off the search field, set custom-search-field to nil. *** Custom options now start out hidden if at their default values. Use the arrow to the left of the option name to toggle visibility. @@ -365,41 +353,6 @@ *** dired-jump and dired-jump-other-window called with a prefix argument read a file name from the minibuffer instead of using buffer-file-name. -** VC and related modes - -*** New VC commands: vc-log-incoming, vc-log-outgoing, vc-find-conflicted-file. - -**** vc-log-incoming for Git runs "git fetch" so that the necessary -data is available locally. - -**** vc-log-incoming and vc-log-outgoing for Git require version 1.7 (or newer). - -*** New key bindings: C-x v I and C-x v O bound to vc-log-incoming and -vc-log-outgoing, respectively. - -*** The 'g' key in VC diff, log, log-incoming and log-outgoing buffers -reruns the corresponding VC command to compute an up to date version -of the buffer. - -*** vc-dir for Bzr supports viewing shelve contents and shelving snapshots. - -*** Special markup can be added to log-edit buffers. -The log-edit buffers are expected to have a format similar to email messages -with headers of the form: - Author: - Summary: - Fixes: -Some backends handle some of those headers specially, but any unknown header -is just left as is in the message, so it is not lost. - -**** vc-git handles Author: and Date: -**** vc-hg handles Author: and Date: -**** vc-bzr handles Author:, Date: and Fixes: -**** vc-mtn handles Author: and Date: - -*** Pressing g in a *vc-diff* buffer reruns vc-diff, so it will -produce an up to date diff. - ** Directory local variables can apply to file-less buffers. For example, adding "(diff-mode . ((mode . whitespace)))" to your .dir-locals.el file, will turn on `whitespace-mode' for *vc-diff* buffers. ------------------------------------------------------------ revno: 102195 committer: Chong Yidong branch nick: trunk timestamp: Sun 2010-10-31 23:19:01 -0400 message: Fix to package name computation in Finder. * lisp/finder.el (finder-compile-keywords): Don't use intern-soft, since package names may not yet exist in the obarray. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-01 03:16:48 +0000 +++ lisp/ChangeLog 2010-11-01 03:19:01 +0000 @@ -1,4 +1,9 @@ -2010-10-31 Chong Yidong +2010-11-01 Chong Yidong + + * finder.el (finder-compile-keywords): Don't use intern-soft, + since package names may not yet exist in the obarray. + +2010-11-01 Chong Yidong * vc/vc-arch.el (vc-arch-checkin): * vc/vc-cvs.el (vc-cvs-checkin): === modified file 'lisp/finder.el' --- lisp/finder.el 2010-09-25 12:04:35 +0000 +++ lisp/finder.el 2010-11-01 03:19:01 +0000 @@ -198,7 +198,8 @@ (setq summary (lm-synopsis) keywords (mapcar 'intern (lm-keywords-list)) package (or package-override - (intern-soft (lm-header "package")) + (let ((str (lm-header "package"))) + (if str (intern str))) base-name) version (lm-header "version"))) (when summary ------------------------------------------------------------ revno: 102194 committer: Chong Yidong branch nick: trunk timestamp: Sun 2010-10-31 23:16:48 -0400 message: Remove extra leftover args to vc-*-checkin. * vc/vc-arch.el (vc-arch-checkin): * vc/vc-cvs.el (vc-cvs-checkin): * vc/vc-mtn.el (vc-mtn-checkin): * vc/vc-rcs.el (vc-rcs-checkin): * vc/vc-sccs.el (vc-sccs-checkin): * vc/vc-svn.el (vc-svn-checkin): Remove optional extra arg, unused since 2010-04-21 commit by Stefan Monnier. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-01 02:55:12 +0000 +++ lisp/ChangeLog 2010-11-01 03:16:48 +0000 @@ -1,3 +1,13 @@ +2010-10-31 Chong Yidong + + * vc/vc-arch.el (vc-arch-checkin): + * vc/vc-cvs.el (vc-cvs-checkin): + * vc/vc-mtn.el (vc-mtn-checkin): + * vc/vc-rcs.el (vc-rcs-checkin): + * vc/vc-sccs.el (vc-sccs-checkin): + * vc/vc-svn.el (vc-svn-checkin): Remove optional extra arg, unused + since 2010-04-21 commit by Stefan Monnier. + 2010-11-01 Glenn Morris * emacs-lisp/bytecomp.el (byte-recompile-file): Fix previous change. === modified file 'lisp/vc/vc-arch.el' --- lisp/vc/vc-arch.el 2010-08-29 16:17:13 +0000 +++ lisp/vc/vc-arch.el 2010-11-01 03:16:48 +0000 @@ -428,7 +428,7 @@ (message "There are unresolved conflicts in %s" (file-name-nondirectory rej)))))) -(defun vc-arch-checkin (files rev comment &optional extra-args-ignored) +(defun vc-arch-checkin (files rev comment) (if rev (error "Committing to a specific revision is unsupported")) ;; FIXME: This implementation probably only works for singleton filesets (let ((summary (file-relative-name (car files) (vc-arch-root (car files))))) === modified file 'lisp/vc/vc-cvs.el' --- lisp/vc/vc-cvs.el 2010-10-03 21:05:47 +0000 +++ lisp/vc/vc-cvs.el 2010-11-01 03:16:48 +0000 @@ -314,7 +314,7 @@ (directory-file-name dir)))) (eq dir t))) -(defun vc-cvs-checkin (files rev comment &optional extra-args-ignored) +(defun vc-cvs-checkin (files rev comment) "CVS-specific version of `vc-backend-checkin'." (unless (or (not rev) (vc-cvs-valid-revision-number-p rev)) (if (not (vc-cvs-valid-symbolic-tag-name-p rev)) === modified file 'lisp/vc/vc-mtn.el' --- lisp/vc/vc-mtn.el 2010-08-29 16:17:13 +0000 +++ lisp/vc/vc-mtn.el 2010-11-01 03:16:48 +0000 @@ -175,7 +175,7 @@ (declare-function log-edit-extract-headers "log-edit" (headers string)) -(defun vc-mtn-checkin (files rev comment &optional extra-args-ignored) +(defun vc-mtn-checkin (files rev comment) (apply 'vc-mtn-command nil 0 files (nconc (list "commit" "-m") (log-edit-extract-headers '(("Author" . "--author") === modified file 'lisp/vc/vc-rcs.el' --- lisp/vc/vc-rcs.el 2010-10-03 21:05:47 +0000 +++ lisp/vc/vc-rcs.el 2010-11-01 03:16:48 +0000 @@ -349,7 +349,7 @@ (yes-or-no-p (format "Directory %s is empty; remove it? " dir)) (delete-directory dir)))) -(defun vc-rcs-checkin (files rev comment &optional extra-args-ignored) +(defun vc-rcs-checkin (files rev comment) "RCS-specific version of `vc-backend-checkin'." (let ((switches (vc-switches 'RCS 'checkin))) ;; Now operate on the files === modified file 'lisp/vc/vc-sccs.el' --- lisp/vc/vc-sccs.el 2010-10-03 21:05:47 +0000 +++ lisp/vc/vc-sccs.el 2010-11-01 03:16:48 +0000 @@ -237,7 +237,7 @@ (stringp (vc-sccs-search-project-dir (or (file-name-directory file) "") (file-name-nondirectory file))))) -(defun vc-sccs-checkin (files rev comment &optional extra-args-ignored) +(defun vc-sccs-checkin (files rev comment) "SCCS-specific version of `vc-backend-checkin'." (dolist (file (vc-expand-dirs files)) (apply 'vc-sccs-do-command nil 0 "delta" (vc-name file) ------------------------------------------------------------ revno: 102193 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 19:55:12 -0700 message: * lisp/emacs-lisp/bytecomp.el (byte-recompile-file): Fix previous change. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-01 02:51:59 +0000 +++ lisp/ChangeLog 2010-11-01 02:55:12 +0000 @@ -1,5 +1,7 @@ 2010-11-01 Glenn Morris + * emacs-lisp/bytecomp.el (byte-recompile-file): Fix previous change. + * startup.el (package-enable-at-startup, package-initialize): Silence compiler. === modified file 'lisp/emacs-lisp/bytecomp.el' --- lisp/emacs-lisp/bytecomp.el 2010-10-31 19:25:39 +0000 +++ lisp/emacs-lisp/bytecomp.el 2010-11-01 02:55:12 +0000 @@ -1631,7 +1631,7 @@ bytecomp-filename "? ")))) (progn (if (and noninteractive (not byte-compile-verbose)) - (message "Compiling %s..." bytecomp-source)) + (message "Compiling %s..." bytecomp-filename)) (byte-compile-file bytecomp-filename load)) (when load (load bytecomp-filename)) 'no-byte-compile))) @@ -4349,5 +4349,4 @@ (run-hooks 'bytecomp-load-hook) -;; arch-tag: 9c97b0f0-8745-4571-bfc3-8dceb677292a ;;; bytecomp.el ends here ------------------------------------------------------------ revno: 102192 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 19:51:59 -0700 message: Silence compilation of startup.el. * lisp/startup.el (package-enable-at-startup, package-initialize): Silence compiler. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-01 02:33:11 +0000 +++ lisp/ChangeLog 2010-11-01 02:51:59 +0000 @@ -1,5 +1,8 @@ 2010-11-01 Glenn Morris + * startup.el (package-enable-at-startup, package-initialize): + Silence compiler. + * progmodes/ada-mode.el (ada-font-lock-syntactic-keywords): Silence compiler. === modified file 'lisp/startup.el' --- lisp/startup.el 2010-10-31 00:06:18 +0000 +++ lisp/startup.el 2010-11-01 02:51:59 +0000 @@ -1,7 +1,7 @@ ;;; startup.el --- process Emacs shell arguments -;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1998, 1999, +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 ;; Free Software Foundation, Inc. ;; Maintainer: FSF @@ -691,6 +691,9 @@ (defvar server-name) (defvar server-process) +;; Autoload in package.el, but when we bootstrap, we don't have loaddefs yet. +(defvar package-enable-at-startup) +(declare-function package-initialize "package" ()) (defun command-line () (setq before-init-time (current-time) @@ -2381,5 +2384,4 @@ (setq file (replace-match "/" t t file))) file)) -;; arch-tag: 7e294698-244d-4758-984b-4047f887a5db ;;; startup.el ends here ------------------------------------------------------------ revno: 102191 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 19:38:33 -0700 message: Silence nnir.el compilation. * lisp/gnus/nnir.el (declare-function): Add compat stub. (mm-url-insert, mm-url-encode-www-form-urlencoded): Declare. (nnir-run-gmane): Require 'mm-url. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-01 02:21:42 +0000 +++ lisp/gnus/ChangeLog 2010-11-01 02:38:33 +0000 @@ -1,5 +1,9 @@ 2010-11-01 Glenn Morris + * nnir.el (declare-function): Add compat stub. + (mm-url-insert, mm-url-encode-www-form-urlencoded): Declare. + (nnir-run-gmane): Require 'mm-url. + * mm-util.el (mm-string-to-multibyte): Simplify. * shr.el (declare-function): Add compat stub. === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2010-10-31 22:31:24 +0000 +++ lisp/gnus/nnir.el 2010-11-01 02:38:33 +0000 @@ -164,6 +164,10 @@ ;;; Setup Code: +;; For Emacs <22.2 and XEmacs. +(eval-and-compile + (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))) + (require 'nnoo) (require 'gnus-group) (require 'gnus-sum) @@ -1382,6 +1386,9 @@ artlist))) grouplist)))) +(declare-function mm-url-insert "mm-url" (url &optional follow-refresh)) +(declare-function mm-url-encode-www-form-urlencoded "mm-url" (pairs)) + ;; gmane interface (defun nnir-run-gmane (query srv &optional groups) "Run a search against a gmane back-end server." @@ -1401,6 +1408,7 @@ (search (format "%s %s %s" qstring groupspec authorspec)) artlist) + (require 'mm-url) (with-current-buffer nntp-server-buffer (erase-buffer) (mm-url-insert ------------------------------------------------------------ revno: 102190 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 19:33:11 -0700 message: * progmodes/ada-mode.el (ada-font-lock-syntactic-keywords): Silence compiler. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-31 22:43:06 +0000 +++ lisp/ChangeLog 2010-11-01 02:33:11 +0000 @@ -1,3 +1,8 @@ +2010-11-01 Glenn Morris + + * progmodes/ada-mode.el (ada-font-lock-syntactic-keywords): + Silence compiler. + 2010-10-31 Julien Danjou * emacs-lisp/bytecomp.el (byte-recompile-file): New fun (bug#7297). === modified file 'lisp/progmodes/ada-mode.el' --- lisp/progmodes/ada-mode.el 2010-09-10 23:13:42 +0000 +++ lisp/progmodes/ada-mode.el 2010-11-01 02:33:11 +0000 @@ -1,7 +1,8 @@ ;;; ada-mode.el --- major-mode for editing Ada sources -;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Rolf Ebert ;; Markus Heritsch @@ -1117,9 +1118,9 @@ (funcall (symbol-function 'speedbar-add-supported-extension) spec) (funcall (symbol-function 'speedbar-add-supported-extension) - body))) - ) + body)))) +(defvar ada-font-lock-syntactic-keywords) ; defined below ;;;###autoload (defun ada-mode () @@ -5538,5 +5539,4 @@ ;;; provide ourselves (provide 'ada-mode) -;; arch-tag: 1b7d45ec-1698-43b5-8d4a-e479ea023270 ;;; ada-mode.el ends here ------------------------------------------------------------ revno: 102189 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 19:21:42 -0700 message: * lisp/gnus/mm-util.el (mm-string-to-multibyte): Simplify. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-01 02:19:17 +0000 +++ lisp/gnus/ChangeLog 2010-11-01 02:21:42 +0000 @@ -1,5 +1,7 @@ 2010-11-01 Glenn Morris + * mm-util.el (mm-string-to-multibyte): Simplify. + * shr.el (declare-function): Add compat stub. (url-cache-create-filename): Declare. (mm-disable-multibyte, widget-convert-button): Autoload. @@ -662,12 +664,12 @@ * nnimap.el (gnutls-negotiate): Silence the byte compiler. - * gnus-art.el, gnus-cache.el, gnus-fun.el, gnus-group.el, - gnus-picon.el, gnus-spec.el, gnus-sum.el, gnus-util.el, gnus.el, - mail-source.el, message.el, mm-bodies.el, mm-decode.el, mm-extern.el, - mm-util.el, mm-view.el, mml-smime.el, mml.el, mml1991.el, mml2015.el, - nnfolder.el, nnheader.el, nnmail.el, nnmaildir.el, nnrss.el, nntp.el, - rfc1843.el, sieve-manage.el, smime.el, spam.el: + * gnus-art.el, gnus-cache.el, gnus-fun.el, gnus-group.el: + * gnus-picon.el, gnus-spec.el, gnus-sum.el, gnus-util.el, gnus.el: + * mail-source.el, message.el, mm-bodies.el, mm-decode.el, mm-extern.el: + * mm-util.el, mm-view.el, mml-smime.el, mml.el, mml1991.el, mml2015.el: + * nnfolder.el, nnheader.el, nnmail.el, nnmaildir.el, nnrss.el, nntp.el: + * rfc1843.el, sieve-manage.el, smime.el, spam.el: Fix comment for declare-function. 2010-10-11 Lars Magne Ingebrigtsen === modified file 'lisp/gnus/mm-util.el' --- lisp/gnus/mm-util.el 2010-10-11 23:29:33 +0000 +++ lisp/gnus/mm-util.el 2010-11-01 02:21:42 +0000 @@ -202,19 +202,10 @@ (defalias 'mm-decode-coding-region 'decode-coding-region) (defalias 'mm-encode-coding-region 'encode-coding-region))) -;; `string-to-multibyte' is available only in Emacs 22.1 or greater. -(defalias 'mm-string-to-multibyte - (cond - ((featurep 'xemacs) - 'identity) - ((fboundp 'string-to-multibyte) - 'string-to-multibyte) - (t - (lambda (string) - "Return a multibyte string with the same individual chars as STRING." - (mapconcat - (lambda (ch) (mm-string-as-multibyte (char-to-string ch))) - string ""))))) +;; `string-to-multibyte' is available only in Emacs. +(defalias 'mm-string-to-multibyte (if (featurep 'xemacs) + 'identity + 'string-to-multibyte)) ;; `char-or-char-int-p' is an XEmacs function, not available in Emacs. (eval-and-compile ------------------------------------------------------------ revno: 102188 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 19:19:17 -0700 message: Silence shr.el compilation. * lisp/gnus/shr.el (declare-function): Add compat stub. (url-cache-create-filename): Declare. (mm-disable-multibyte, widget-convert-button): Autoload. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-01 02:11:34 +0000 +++ lisp/gnus/ChangeLog 2010-11-01 02:19:17 +0000 @@ -1,5 +1,9 @@ 2010-11-01 Glenn Morris + * shr.el (declare-function): Add compat stub. + (url-cache-create-filename): Declare. + (mm-disable-multibyte, widget-convert-button): Autoload. + * smime.el (ldap-search): Declare. (smime-cert-by-ldap-1): Require ldap on Emacs. === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2010-10-31 22:31:24 +0000 +++ lisp/gnus/shr.el 2010-11-01 02:19:17 +0000 @@ -30,6 +30,10 @@ ;;; Code: +;; For Emacs <22.2 and XEmacs. +(eval-and-compile + (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))) + (eval-when-compile (require 'cl)) (require 'browse-url) (unless (aref (char-category-set (make-char 'japanese-jisx0208 33 35)) ?>) @@ -411,6 +415,10 @@ image))) image))) +;; url-cache-extract autoloads url-cache. +(declare-function url-cache-create-filename "url-cache" (url)) +(autoload 'mm-disable-multibyte "mm-util") + (defun shr-get-image-data (url) "Get image data for URL. Return a string with image data." @@ -428,6 +436,8 @@ (apply #'shr-fontize-cont cont types) (shr-ensure-paragraph)) +(autoload 'widget-convert-button "wid-edit") + (defun shr-urlify (start url) (widget-convert-button 'url-link start (point) ------------------------------------------------------------ revno: 102187 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 19:11:34 -0700 message: Silence smime.el compilation. * lisp/gnus/smime.el (ldap-search): Declare. (smime-cert-by-ldap-1): Require ldap on Emacs. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-01 02:07:01 +0000 +++ lisp/gnus/ChangeLog 2010-11-01 02:11:34 +0000 @@ -1,5 +1,8 @@ 2010-11-01 Glenn Morris + * smime.el (ldap-search): Declare. + (smime-cert-by-ldap-1): Require ldap on Emacs. + * nnimap.el: Require nnmail, and gnus-sum when compiling. (nnimap-keepalive): Use gnus-float-time. === modified file 'lisp/gnus/smime.el' --- lisp/gnus/smime.el 2010-10-11 23:29:33 +0000 +++ lisp/gnus/smime.el 2010-11-01 02:11:34 +0000 @@ -587,6 +587,9 @@ (kill-buffer digbuf) retbuf)) +(declare-function ldap-search "ldap" + (filter &optional host attributes attrsonly withdn)) + (defun smime-cert-by-ldap-1 (mail host) "Get cetificate for MAIL from the ldap server at HOST." (let ((ldapresult @@ -595,7 +598,9 @@ (progn (require 'smime-ldap) 'smime-ldap-search) - 'ldap-search) + (progn + (require 'ldap) + 'ldap-search)) (concat "mail=" mail) host '("userCertificate") nil)) (retbuf (generate-new-buffer (format "*certificate for %s*" mail))) ------------------------------------------------------------ revno: 102186 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 19:07:01 -0700 message: Silence nnimap.el compilation. * lisp/gnus/nnimap.el: Require nnmail, and gnus-sum when compiling. (nnimap-keepalive): Use gnus-float-time. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-01 01:56:28 +0000 +++ lisp/gnus/ChangeLog 2010-11-01 02:07:01 +0000 @@ -1,5 +1,8 @@ 2010-11-01 Glenn Morris + * nnimap.el: Require nnmail, and gnus-sum when compiling. + (nnimap-keepalive): Use gnus-float-time. + * mail-source.el (nnheader-message, gnus-float-time): Autoload. (mail-source-delete-crash-box): Use gnus-float-time. === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2010-10-31 22:31:24 +0000 +++ lisp/gnus/nnimap.el 2010-11-01 02:07:01 +0000 @@ -44,6 +44,10 @@ (require 'utf7) (require 'tls) (require 'parse-time) +(require 'nnmail) + +(eval-when-compile + (require 'gnus-sum)) (autoload 'auth-source-forget-user-or-password "auth-source") (autoload 'auth-source-user-or-password "auth-source") @@ -287,7 +291,7 @@ (with-current-buffer buffer (when (and nnimap-object (nnimap-last-command-time nnimap-object) - (> (time-to-seconds + (> (gnus-float-time (time-subtract now (nnimap-last-command-time nnimap-object))) ------------------------------------------------------------ revno: 102185 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 18:56:28 -0700 message: Silence mail-source.el compilation. * lisp/gnus/mail-source.el (nnheader-message, gnus-float-time): Autoload. (mail-source-delete-crash-box): Use gnus-float-time. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-01 01:51:22 +0000 +++ lisp/gnus/ChangeLog 2010-11-01 01:56:28 +0000 @@ -1,7 +1,12 @@ 2010-11-01 Glenn Morris + * mail-source.el (nnheader-message, gnus-float-time): Autoload. + (mail-source-delete-crash-box): Use gnus-float-time. + * gnus-dired.el (gnus-completing-read): Autoload. + * mm-view.el (gnus-rescale-image): Autoload. + * mm-decode.el (gnus-completing-read, gnus-blocked-images): Autoload. * gnus.el (gnus-sloppily-equal-method-parameters): Move defn before use. === modified file 'lisp/gnus/mail-source.el' --- lisp/gnus/mail-source.el 2010-10-11 23:29:33 +0000 +++ lisp/gnus/mail-source.el 2010-11-01 01:56:28 +0000 @@ -501,6 +501,8 @@ (t value))) +(autoload 'nnheader-message "nnheader") + (defun mail-source-fetch (source callback &optional method) "Fetch mail from SOURCE and call CALLBACK zero or more times. CALLBACK will be called with the name of the file where (some of) @@ -594,6 +596,8 @@ 0) (funcall callback mail-source-crash-box info))) +(autoload 'gnus-float-time "gnus-util") + (defvar mail-source-incoming-last-checked-time nil) (defun mail-source-delete-crash-box () @@ -614,7 +618,7 @@ ;; Don't check for old incoming files more than once per day to ;; save a lot of file accesses. (when (or (null mail-source-incoming-last-checked-time) - (> (time-to-seconds + (> (gnus-float-time (time-since mail-source-incoming-last-checked-time)) (* 24 60 60))) (setq mail-source-incoming-last-checked-time (current-time)) ------------------------------------------------------------ revno: 102184 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 18:51:22 -0700 message: Silence gnus-dired.el compilation. * lisp/gnus/gnus-dired.el (gnus-completing-read): Autoload. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-01 01:49:16 +0000 +++ lisp/gnus/ChangeLog 2010-11-01 01:51:22 +0000 @@ -1,7 +1,7 @@ 2010-11-01 Glenn Morris + * gnus-dired.el (gnus-completing-read): Autoload. * mm-view.el (gnus-rescale-image): Autoload. - * mm-decode.el (gnus-completing-read, gnus-blocked-images): Autoload. * gnus.el (gnus-sloppily-equal-method-parameters): Move defn before use. === modified file 'lisp/gnus/gnus-dired.el' --- lisp/gnus/gnus-dired.el 2010-10-13 05:39:17 +0000 +++ lisp/gnus/gnus-dired.el 2010-11-01 01:51:22 +0000 @@ -1,7 +1,7 @@ ;;; gnus-dired.el --- utility functions where gnus and dired meet -;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, +;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Authors: Benjamin Rutt , ;; Shenghuo Zhu @@ -122,6 +122,8 @@ (push (buffer-name buffer) buffers)))) (nreverse buffers)))) +(autoload 'gnus-completing-read "gnus-util") + ;; Method to attach files to a mail composition. (defun gnus-dired-attach (files-to-attach) "Attach dired's marked files to a gnus message composition. ------------------------------------------------------------ revno: 102183 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 18:49:16 -0700 message: Silence mm-view.el compilation. * lisp/gnus/mm-view.el (gnus-rescale-image): Autoload. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-01 01:45:47 +0000 +++ lisp/gnus/ChangeLog 2010-11-01 01:49:16 +0000 @@ -1,5 +1,7 @@ 2010-11-01 Glenn Morris + * mm-view.el (gnus-rescale-image): Autoload. + * mm-decode.el (gnus-completing-read, gnus-blocked-images): Autoload. * gnus.el (gnus-sloppily-equal-method-parameters): Move defn before use. === modified file 'lisp/gnus/mm-view.el' --- lisp/gnus/mm-view.el 2010-10-20 22:29:38 +0000 +++ lisp/gnus/mm-view.el 2010-11-01 01:49:16 +0000 @@ -82,6 +82,8 @@ ;;; Functions for displaying various formats inline ;;; +(autoload 'gnus-rescale-image "gnus-util") + (defun mm-inline-image-emacs (handle) (let ((b (point-marker)) (inhibit-read-only t)) ------------------------------------------------------------ revno: 102182 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 18:45:47 -0700 message: Silence mm-decode.el compilation. * lisp/gnus/mm-decode.el (gnus-completing-read, gnus-blocked-images): Autoload. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-01 01:40:12 +0000 +++ lisp/gnus/ChangeLog 2010-11-01 01:45:47 +0000 @@ -1,5 +1,7 @@ 2010-11-01 Glenn Morris + * mm-decode.el (gnus-completing-read, gnus-blocked-images): Autoload. + * gnus.el (gnus-sloppily-equal-method-parameters): Move defn before use. * sieve-manage.el: Require 'cl when compiling. === modified file 'lisp/gnus/mm-decode.el' --- lisp/gnus/mm-decode.el 2010-10-28 06:37:35 +0000 +++ lisp/gnus/mm-decode.el 2010-11-01 01:45:47 +0000 @@ -1,7 +1,7 @@ ;;; mm-decode.el --- Functions for decoding MIME things -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko @@ -1324,6 +1324,8 @@ (let ((coding-system-for-write 'binary)) (shell-command-on-region (point-min) (point-max) command nil))))) +(autoload 'gnus-completing-read "gnus-util") + (defun mm-interactively-view-part (handle) "Display HANDLE using METHOD." (let* ((type (mm-handle-media-type handle)) @@ -1683,6 +1685,7 @@ (start end &optional base-url)) (declare-function shr-insert-document "shr" (dom)) (defvar shr-blocked-images) +(autoload 'gnus-blocked-images "gnus-art") (defun mm-shr (handle) ;; Require since we bind its variables. ------------------------------------------------------------ revno: 102181 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 18:40:12 -0700 message: Silence gnus.el compilation. * gnus.el (gnus-sloppily-equal-method-parameters): Move definition before use. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-01 01:38:04 +0000 +++ lisp/gnus/ChangeLog 2010-11-01 01:40:12 +0000 @@ -1,5 +1,7 @@ 2010-11-01 Glenn Morris + * gnus.el (gnus-sloppily-equal-method-parameters): Move defn before use. + * sieve-manage.el: Require 'cl when compiling. * gnus-util.el (iswitchb-read-buffer): Declare rather than autoload. === modified file 'lisp/gnus/gnus.el' --- lisp/gnus/gnus.el 2010-10-31 22:31:24 +0000 +++ lisp/gnus/gnus.el 2010-11-01 01:40:12 +0000 @@ -1,8 +1,8 @@ ;;; gnus.el --- a newsreader for GNU Emacs -;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, 1998, -;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, +;; 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +;; 2010 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA ;; Lars Magne Ingebrigtsen @@ -3546,16 +3546,6 @@ gnus-valid-select-methods))) (equal (nth 1 m1) (nth 1 m2))))))) -(defun gnus-methods-sloppily-equal (m1 m2) - ;; Same method. - (or - (eq m1 m2) - ;; Type and name are equal. - (and - (eq (car m1) (car m2)) - (equal (cadr m1) (cadr m2)) - (gnus-sloppily-equal-method-parameters m1 m2)))) - (defsubst gnus-sloppily-equal-method-parameters (m1 m2) ;; Check parameters for sloppy equalness. (let ((p1 (copy-sequence (cddr m1))) @@ -3584,6 +3574,16 @@ ;; If p2 now is empty, they were equal. (null p2)))) +(defun gnus-methods-sloppily-equal (m1 m2) + ;; Same method. + (or + (eq m1 m2) + ;; Type and name are equal. + (and + (eq (car m1) (car m2)) + (equal (cadr m1) (cadr m2)) + (gnus-sloppily-equal-method-parameters m1 m2)))) + (defun gnus-server-equal (m1 m2) "Say whether two methods are equal." (let ((m1 (cond ((null m1) gnus-select-method) ------------------------------------------------------------ revno: 102180 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 18:38:04 -0700 message: Silence sieve-manage.el compilation. * lisp/gnus/sieve-manage.el: Require 'cl when compiling, for caddr. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-01 01:34:55 +0000 +++ lisp/gnus/ChangeLog 2010-11-01 01:38:04 +0000 @@ -1,5 +1,7 @@ 2010-11-01 Glenn Morris + * sieve-manage.el: Require 'cl when compiling. + * gnus-util.el (iswitchb-read-buffer): Declare rather than autoload. (gnus-iswitchb-completing-read): Require iswitchb. (gnus-select-frame-set-input-focus): Silence compiler. === modified file 'lisp/gnus/sieve-manage.el' --- lisp/gnus/sieve-manage.el 2010-10-11 23:29:33 +0000 +++ lisp/gnus/sieve-manage.el 2010-11-01 01:38:04 +0000 @@ -1,7 +1,7 @@ ;;; sieve-manage.el --- Implementation of the managesive protocol in elisp -;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, -;; 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +;; 2010 Free Software Foundation, Inc. ;; Author: Simon Josefsson @@ -79,6 +79,7 @@ (require 'password)) (eval-when-compile + (require 'cl) ; caddr (require 'sasl) (require 'starttls)) (autoload 'sasl-find-mechanism "sasl") ------------------------------------------------------------ revno: 102179 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 18:34:55 -0700 message: Silence gnus-util.el compilation. * lisp/gnu/gnus-util.el (iswitchb-read-buffer): Declare rather than autoload. (gnus-iswitchb-completing-read): Require iswitchb. (gnus-select-frame-set-input-focus): Silence compiler. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-31 22:49:28 +0000 +++ lisp/gnus/ChangeLog 2010-11-01 01:34:55 +0000 @@ -1,3 +1,9 @@ +2010-11-01 Glenn Morris + + * gnus-util.el (iswitchb-read-buffer): Declare rather than autoload. + (gnus-iswitchb-completing-read): Require iswitchb. + (gnus-select-frame-set-input-focus): Silence compiler. + 2010-10-31 Lars Magne Ingebrigtsen * message.el (message-subject-trailing-was-query): Change default to t, === modified file 'lisp/gnus/gnus-util.el' --- lisp/gnus/gnus-util.el 2010-10-31 22:31:24 +0000 +++ lisp/gnus/gnus-util.el 2010-11-01 01:34:55 +0000 @@ -1651,10 +1651,14 @@ initial-input history def)) -(autoload 'iswitchb-read-buffer "iswitchb") +(declare-function iswitchb-read-buffer "iswitchb" + (prompt &optional default require-match start matches-set)) +(defvar iswitchb-temp-buflist) + (defun gnus-iswitchb-completing-read (prompt collection &optional require-match initial-input history def) "`iswitchb' based completing-read function." + (require 'iswitchb) (let ((iswitchb-make-buflist-hook (lambda () (setq iswitchb-temp-buflist @@ -1667,11 +1671,11 @@ (nreverse filtered-choices)))))) (unwind-protect (progn - (when (not iswitchb-mode) - (add-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup)) + (or iswitchb-mode + (add-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup)) (iswitchb-read-buffer prompt def require-match)) - (when (not iswitchb-mode) - (remove-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup))))) + (or iswitchb-mode + (remove-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup))))) (defun gnus-graphic-display-p () (if (featurep 'xemacs) @@ -1758,14 +1762,16 @@ (kill-buffer buf)) tchar)) -(if (fboundp 'select-frame-set-input-focus) +(if (featurep 'emacs) (defalias 'gnus-select-frame-set-input-focus 'select-frame-set-input-focus) - ;; XEmacs 21.4, SXEmacs - (defun gnus-select-frame-set-input-focus (frame) - "Select FRAME, raise it, and set input focus, if possible." - (raise-frame frame) - (select-frame frame) - (focus-frame frame))) + (if (fboundp 'select-frame-set-input-focus) + (defalias 'gnus-select-frame-set-input-focus 'select-frame-set-input-focus) + ;; XEmacs 21.4, SXEmacs + (defun gnus-select-frame-set-input-focus (frame) + "Select FRAME, raise it, and set input focus, if possible." + (raise-frame frame) + (select-frame frame) + (focus-frame frame)))) (defun gnus-frame-or-window-display-name (object) "Given a frame or window, return the associated display name. ------------------------------------------------------------ revno: 102178 committer: Ken Brown branch nick: trunk timestamp: Sun 2010-10-31 19:21:53 -0400 message: * configure.in (checking whether localtime caches TZ): Use unsetenv instead of modifying environment directly. diff: === modified file 'ChangeLog' --- ChangeLog 2010-10-25 17:23:45 +0000 +++ ChangeLog 2010-10-31 23:21:53 +0000 @@ -1,3 +1,8 @@ +2010-10-31 Ken Brown + + * configure.in (checking whether localtime caches TZ): Use + unsetenv instead of modifying environment directly. + 2010-10-25 Andreas Schwab * configure.in (checking for -znocombreloc): Use AC_LANG_PROGRAM === modified file 'configure' --- configure 2010-10-25 17:23:45 +0000 +++ configure 2010-10-31 23:21:53 +0000 @@ -13982,14 +13982,6 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include -extern char **environ; -unset_TZ () -{ - char **from, **to; - for (to = from = environ; (*to = *from); from++) - if (! (to[0][0] == 'T' && to[0][1] == 'Z' && to[0][2] == '=')) - to++; -} char TZ_GMT0[] = "TZ=GMT0"; char TZ_PST8[] = "TZ=PST8"; main() @@ -13999,13 +13991,13 @@ if (putenv (TZ_GMT0) != 0) exit (1); hour_GMT0 = localtime (&now)->tm_hour; - unset_TZ (); + unsetenv("TZ"); hour_unset = localtime (&now)->tm_hour; if (putenv (TZ_PST8) != 0) exit (1); if (localtime (&now)->tm_hour == hour_GMT0) exit (1); - unset_TZ (); + unsetenv("TZ"); if (localtime (&now)->tm_hour != hour_unset) exit (1); exit (0); === modified file 'configure.in' --- configure.in 2010-10-25 17:23:45 +0000 +++ configure.in 2010-10-31 23:21:53 +0000 @@ -2952,14 +2952,6 @@ AC_CACHE_VAL(emacs_cv_localtime_cache, [if test x$ac_cv_func_tzset = xyes; then AC_TRY_RUN([#include -extern char **environ; -unset_TZ () -{ - char **from, **to; - for (to = from = environ; (*to = *from); from++) - if (! (to[0][0] == 'T' && to[0][1] == 'Z' && to[0][2] == '=')) - to++; -} char TZ_GMT0[] = "TZ=GMT0"; char TZ_PST8[] = "TZ=PST8"; main() @@ -2969,13 +2961,13 @@ if (putenv (TZ_GMT0) != 0) exit (1); hour_GMT0 = localtime (&now)->tm_hour; - unset_TZ (); + unsetenv("TZ"); hour_unset = localtime (&now)->tm_hour; if (putenv (TZ_PST8) != 0) exit (1); if (localtime (&now)->tm_hour == hour_GMT0) exit (1); - unset_TZ (); + unsetenv("TZ"); if (localtime (&now)->tm_hour != hour_unset) exit (1); exit (0); ------------------------------------------------------------ revno: 102177 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 15:55:44 -0700 message: * lisp/cedet/ede/proj-elisp.el (project-compile-target): Fix previous change. diff: === modified file 'lisp/cedet/ChangeLog' --- lisp/cedet/ChangeLog 2010-10-31 22:43:06 +0000 +++ lisp/cedet/ChangeLog 2010-10-31 22:55:44 +0000 @@ -1,5 +1,6 @@ 2010-10-31 Glenn Morris + * ede/proj-elisp.el (project-compile-target): Fix previous change. * semantic/ede-grammar.el (project-compile-target): Fix previous change. 2010-10-31 Julien Danjou === modified file 'lisp/cedet/ede/proj-elisp.el' --- lisp/cedet/ede/proj-elisp.el 2010-10-31 19:25:39 +0000 +++ lisp/cedet/ede/proj-elisp.el 2010-10-31 22:55:44 +0000 @@ -129,15 +129,13 @@ (utd 0)) (mapc (lambda (src) (let* ((fsrc (expand-file-name src dir)) - (elc (concat (file-name-sans-extension fsrc) ".elc")) - ) - (if (eq (byte-recompile-file fsrc nil 0)) t) + (elc (concat (file-name-sans-extension fsrc) ".elc"))) + (if (eq (byte-recompile-file fsrc nil 0) t) (setq comp (1+ comp)) (setq utd (1+ utd))))) (oref obj source)) (message "All Emacs Lisp sources are up to date in %s" (object-name obj)) - (cons comp utd) - )) + (cons comp utd))) (defmethod ede-update-version-in-source ((this ede-proj-target-elisp) version) "In a Lisp file, updated a version string for THIS to VERSION. @@ -387,5 +385,4 @@ (provide 'ede/proj-elisp) -;; arch-tag: 3802c94b-d04d-4ecf-9bab-b29ed6e77588 ;;; ede/proj-elisp.el ends here ------------------------------------------------------------ revno: 102176 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Sun 2010-10-31 22:49:28 +0000 message: message.el (message-subject-trailing-was-query): Change default to t. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-31 22:31:24 +0000 +++ lisp/gnus/ChangeLog 2010-10-31 22:49:28 +0000 @@ -1,5 +1,8 @@ 2010-10-31 Lars Magne Ingebrigtsen + * message.el (message-subject-trailing-was-query): Change default to t, + since I think that's what most people want. + * nnimap.el (nnimap-request-accept-article): Erase buffer before appending for easier debugging. (nnimap-wait-for-connection): Take a regexp. === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2010-10-24 22:32:38 +0000 +++ lisp/gnus/message.el 2010-10-31 22:49:28 +0000 @@ -306,7 +306,7 @@ ;;; Start of variables adopted from `message-utils.el'. -(defcustom message-subject-trailing-was-query 'ask +(defcustom message-subject-trailing-was-query t "*What to do with trailing \"(was: )\" in subject lines. If nil, leave the subject unchanged. If it is the symbol `ask', query the user what do do. In this case, the subject is matched against @@ -314,7 +314,7 @@ `message-subject-trailing-was-query' is t, always strip the trailing old subject. In this case, `message-subject-trailing-was-regexp' is used." - :version "22.1" + :version "24.1" :type '(choice (const :tag "never" nil) (const :tag "always strip" t) (const ask)) ------------------------------------------------------------ revno: 102175 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 15:47:12 -0700 message: * lisp/cus-start.el: Explanatory comment. diff: === modified file 'lisp/cus-start.el' --- lisp/cus-start.el 2010-10-31 18:26:54 +0000 +++ lisp/cus-start.el 2010-10-31 22:47:12 +0000 @@ -34,6 +34,19 @@ ;;; Code: +;; Elements of this list have the form: +;; SYMBOL GROUP TYPE VERSION REST... +;; SYMBOL is the name of the variable. +;; GROUP is the custom group to which it belongs (may also be a list +;; of groups) +;; TYPE is the defcustom :type. +;; VERSION is the defcustom :version (or nil). +;; REST is a set of :KEYWORD VALUE pairs. Accepted :KEYWORDs are: +;; :standard - standard value for SYMBOL (else use current value) +;; :set - custom-set property +;; :risky - risky-local-variable property +;; :safe - safe-local-variable property +;; :tag - custom-tag property (let ((all '(;; alloc.c (gc-cons-threshold alloc integer) (garbage-collection-messages alloc boolean) ------------------------------------------------------------ revno: 102174 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 15:43:06 -0700 message: Fix previous cedet change and ChangeLog. * lisp/cedet/semantic/ede-grammar.el (project-compile-target): Fix previous change. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-31 19:25:39 +0000 +++ lisp/ChangeLog 2010-10-31 22:43:06 +0000 @@ -3,8 +3,6 @@ * emacs-lisp/bytecomp.el (byte-recompile-file): New fun (bug#7297). (byte-recompile-directory): * emacs-lisp/lisp-mode.el (emacs-lisp-byte-compile-and-load): - * cedet/ede/proj-elisp.el (project-compile-target): - * cedet/semantic/ede-grammar.el (project-compile-target): Use `byte-recompile-file'. 2010-10-31 Glenn Morris === modified file 'lisp/cedet/ChangeLog' --- lisp/cedet/ChangeLog 2010-10-31 18:38:16 +0000 +++ lisp/cedet/ChangeLog 2010-10-31 22:43:06 +0000 @@ -1,5 +1,15 @@ 2010-10-31 Glenn Morris + * semantic/ede-grammar.el (project-compile-target): Fix previous change. + +2010-10-31 Julien Danjou + + * ede/proj-elisp.el (project-compile-target): + * semantic/ede-grammar.el (project-compile-target): + Use `byte-recompile-file'. + +2010-10-31 Glenn Morris + * mode-local.el (mode-local-augment-function-help): * semantic/analyze/debug.el (semantic-analyzer-debug-add-buttons): * semantic/symref/list.el (semantic-symref-results-dump) === modified file 'lisp/cedet/semantic/ede-grammar.el' --- lisp/cedet/semantic/ede-grammar.el 2010-10-31 19:25:39 +0000 +++ lisp/cedet/semantic/ede-grammar.el 2010-10-31 22:43:06 +0000 @@ -1,6 +1,7 @@ ;;; semantic/ede-grammar.el --- EDE support for Semantic Grammar Files -;;; Copyright (C) 2003, 2004, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Eric M. Ludlam ;; Keywords: project, make @@ -133,8 +134,8 @@ (save-excursion (semantic-grammar-create-package)) (save-buffer) - (byte-recompile-file (concat (semantic-grammar-package) ".el") nil 0)) - (oref obj source))) + (byte-recompile-file (concat (semantic-grammar-package) ".el") nil 0))) + (oref obj source))) (message "All Semantic Grammar sources are up to date in %s" (object-name obj))) ;;; Makefile generation functions @@ -194,5 +195,4 @@ (provide 'semantic/ede-grammar) -;; arch-tag: 37a06a8d-957a-4fa2-a931-38482d28c24a ;;; semantic/ede-grammar.el ends here ------------------------------------------------------------ revno: 102173 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 15:35:44 -0700 message: * src/xterm.c (x_connection_closed) [USE_X_TOOLKIT]: Fix merge, maybe. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-31 18:26:54 +0000 +++ src/ChangeLog 2010-10-31 22:35:44 +0000 @@ -1,5 +1,7 @@ 2010-10-31 Glenn Morris + * xterm.c (x_connection_closed) [USE_X_TOOLKIT]: Fix merge, maybe. + * frame.c (syms_of_frame) : Default to nil if !HAVE_WINDOW_SYSTEM. (Bug#7299) === modified file 'src/xterm.c' --- src/xterm.c 2010-10-31 14:40:01 +0000 +++ src/xterm.c 2010-10-31 22:35:44 +0000 @@ -7689,7 +7689,6 @@ Closing the display is reported to lead to a bus error on OpenWindows in certain situations. I suspect that is a bug in OpenWindows. I don't know how to circumvent it here. */ - extern void (*fatal_error_signal_hook) P_ ((void)); fatal_error_signal_hook = x_fatal_error_signal; XtCloseDisplay (dpy); fatal_error_signal_hook = NULL; ------------------------------------------------------------ revno: 102172 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Sun 2010-10-31 22:31:24 +0000 message: Merge changes made in Gnus trunk. nnimap.el (nnimap-open-connection): Only send AUTHENTICATE PLAIN if LOGINDISABLED is set. gnus.el (gnus-group-startup-message): Move point to the start of the buffer. nndoc.el (nndoc-dissect-buffer): Reverse the order of the articles to reflect the order they're in in the digest. gnus-sum.el (gnus-summary-select-article): Make `C-d' work reliably by checking whether the original article buffer is alive. shr.el (shr-find-fill-point): Don't break lines between punctuation and non-punctuation (like after the apostrophe in "'We"). gnus-cite.el (gnus-article-fill-cited-article): Remove unused `force' parameter. gnus-art.el (gnus-treatment-function-alist): Have gnus-treat-fill-long-lines point to gnus-article-fill-cited-long-lines. gnus-art.el (gnus-treat-fill-long-lines): Change default to fill all text/plain sections. gnus.el: Autoload gnus-article-fill-cited-long-lines. gnus-art.el (gnus-mime-display-alternative): Actually pass the type on to `gnus-treat-article'. gnus-sum.el (gnus-summary-show-article): Add `C-u C-u g' for showing the raw article, and change `C-u g' to show the article without doing treatments. gnus.texi (Paging the Article): Document C-u g/C-u C-u g. gnus-cite.el (gnus-article-foldable-buffer): Refactor out. gnus-cite.el (gnus-article-foldable-buffer): Don't fold regions that have a ragged left edge. gnus-cite.el (gnus-article-foldable-buffer): Skip past the prefix when determining raggedness. gnus-srvr.el, nnir.el: Allow nnir searching for an entire server. gnus-msg.el (gnus-configure-posting-styles): Permit the use of regular expression match and replace in posting styles. gnus-art.el (gnus-treat-article): Only inhibit body washing, and leave the header washing to take place. nnimap.el (nnimap-request-accept-article): Erase buffer before appending for easier debugging. nnimap.el (nnimap-wait-for-connection): Take a regexp. nnimap.el (nnimap-request-accept-article): Wait for the continuation line before sending anything unless we're streaming. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-10-31 14:40:01 +0000 +++ doc/misc/ChangeLog 2010-10-31 22:31:24 +0000 @@ -1,3 +1,7 @@ +2010-10-31 Lars Magne Ingebrigtsen + + * gnus.texi (Paging the Article): Document C-u g/C-u C-u g. + 2010-10-31 Glenn Morris * mh-e.texi (Preface, From Bill Wohler): Change 23 to past tense. === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2010-10-30 15:01:14 +0000 +++ doc/misc/gnus.texi 2010-10-31 22:31:24 +0000 @@ -6153,8 +6153,9 @@ @vindex gnus-summary-show-article-charset-alist (Re)fetch the current article (@code{gnus-summary-show-article}). If given a prefix, fetch the current article, but don't run any of the -article treatment functions. This will give you a ``raw'' article, just -the way it came from the server. +article treatment functions. If given a prefix twice (i.e., @kbd{C-u +C-u g'}), show a completely ``raw'' article, just the way it came from +the server. @cindex charset, view article with different charset If given a numerical prefix, you can do semi-manual charset stuff. @@ -13428,14 +13429,20 @@ name will be removed. If the attribute name is @code{eval}, the form is evaluated, and the result is thrown away. -The attribute value can be a string (used verbatim), a function with -zero arguments (the return value will be used), a variable (its value -will be used) or a list (it will be @code{eval}ed and the return value -will be used). The functions and sexps are called/@code{eval}ed in the -message buffer that is being set up. The headers of the current article -are available through the @code{message-reply-headers} variable, which -is a vector of the following headers: number subject from date id -references chars lines xref extra. +The attribute value can be a string, a function with zero arguments +(the return value will be used), a variable (its value will be used) +or a list (it will be @code{eval}ed and the return value will be +used). The functions and sexps are called/@code{eval}ed in the +message buffer that is being set up. The headers of the current +article are available through the @code{message-reply-headers} +variable, which is a vector of the following headers: number subject +from date id references chars lines xref extra. + +In the case of a string value, if the @code{match} is a regular +expression, a @samp{gnus-match-substitute-replacement} is proceed on +the value to replace the positional parameters @samp{\@var{n}} by the +corresponding parenthetical matches (see @xref{Replacing the Text that +Matched, , Text Replacement, elisp, The Emacs Lisp Reference Manual}.) @vindex message-reply-headers === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-31 10:01:11 +0000 +++ lisp/gnus/ChangeLog 2010-10-31 22:31:24 +0000 @@ -1,3 +1,74 @@ +2010-10-31 Lars Magne Ingebrigtsen + + * nnimap.el (nnimap-request-accept-article): Erase buffer before + appending for easier debugging. + (nnimap-wait-for-connection): Take a regexp. + (nnimap-request-accept-article): Wait for the continuation line before + sending anything unless we're streaming. + + * gnus-art.el (gnus-treat-article): Only inhibit body washing, and + leave the header washing to take place. + +2010-10-31 Daniel Dehennin + + * gnus-msg.el (gnus-configure-posting-styles): Permit the use of + regular expression match and replace in posting styles. + +2010-10-31 Andrew Cohen + + * nnir.el (gnus-group-make-nnir-group,nnir-run-query): Allow searching + an entire server. + (nnir-get-active): New function. + (nnir-run-imap): Use it. + (nnir-run-gmane): Who knew, gmane search returns an article score! + + * gnus-srvr.el (gnus-server-mode-map): add binding "G" to search the + server on the current line with nnir. + +2010-10-31 Lars Magne Ingebrigtsen + + * gnus-cite.el (gnus-article-foldable-buffer): Refactor out. + (gnus-article-foldable-buffer): Don't fold regions that have a ragged + left edge. + (gnus-article-foldable-buffer): Skip past the prefix when determining + raggedness. + + * gnus-sum.el (gnus-summary-show-article): Add `C-u C-u g' for showing + the raw article, and change `C-u g' to show the article without doing + treatments. + + * gnus-art.el (gnus-mime-display-alternative): Actually pass the type + on to `gnus-treat-article'. + (gnus-inhibit-article-treatments): New variable. + + * gnus.el: Autoload gnus-article-fill-cited-long-lines. + + * gnus-art.el (gnus-treatment-function-alist): Have + gnus-treat-fill-long-lines point to gnus-article-fill-cited-long-lines. + (gnus-treat-fill-long-lines): Change default to fill all text/plain + sections. + + * gnus-cite.el (gnus-article-fill-cited-article): Remove unused `force' + parameter. + (gnus-article-fill-cited-long-lines): New function. + (gnus-article-fill-cited-article): Allow filling only long sections. + + * shr.el (shr-find-fill-point): Don't break lines between punctuation + and non-punctuation (like after the apostrophe in "'We"). + + * gnus-sum.el (gnus-summary-select-article): Make sure + gnus-original-article-buffer is alive. + + * nndoc.el (nndoc-dissect-buffer): Reverse the order of the articles to + reflect the order they're in in the digest. + + * gnus.el (gnus-group-startup-message): Move point to the start of the + buffer. + + * nnimap.el (nnimap-capability): New function. + (nnimap-open-connection): Only send AUTHENTICATE PLAIN if LOGINDISABLED + is set. + 2010-10-31 David Engster * nnmairix.el (nnmairix-get-valid-servers): Return list of strings to === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2010-10-29 07:22:52 +0000 +++ lisp/gnus/gnus-art.el 2010-10-31 22:31:24 +0000 @@ -1590,7 +1590,7 @@ :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-custom) -(defcustom gnus-treat-fill-long-lines nil +(defcustom gnus-treat-fill-long-lines '(typep "text/plain") "Fill long lines. Valid values are nil, t, `head', `first', `last', an integer or a predicate. See Info node `(gnus)Customizing Articles'." @@ -1664,7 +1664,7 @@ (gnus-treat-highlight-signature gnus-article-highlight-signature) (gnus-treat-buttonize gnus-article-add-buttons) (gnus-treat-fill-article gnus-article-fill-cited-article) - (gnus-treat-fill-long-lines gnus-article-fill-long-lines) + (gnus-treat-fill-long-lines gnus-article-fill-cited-long-lines) (gnus-treat-strip-cr gnus-article-remove-cr) (gnus-treat-unsplit-urls gnus-article-unsplit-urls) (gnus-treat-date-ut gnus-article-date-ut) @@ -5704,7 +5704,7 @@ (save-restriction (article-goto-body) (narrow-to-region (point) (point-max)) - (gnus-treat-article nil 1 1) + (gnus-treat-article nil 1 1 "text/plain") (widen))) (unless ihandles ;; Highlight the headers. @@ -5992,7 +5992,7 @@ (gnus-treat-article nil (length gnus-article-mime-handle-alist) (gnus-article-mime-total-parts) - (mm-handle-media-type handle)))))) + (mm-handle-media-type preferred)))))) (goto-char (point-max)) (setcdr begend (point-marker))))) (when ibegend @@ -8255,6 +8255,8 @@ ;;; Treatment top-level handling. ;;; +(defvar gnus-inhibit-article-treatments nil) + (defun gnus-treat-article (condition &optional part-number total-parts type) (let ((length (- (point-max) (point-min))) (alist gnus-treatment-function-alist) @@ -8277,6 +8279,8 @@ (symbol-value (car elem)))) (when (and (or (consp val) treated-type) + (or (not gnus-inhibit-article-treatments) + (eq condition 'head)) (gnus-treat-predicate val) (or (not (get (car elem) 'highlight)) highlightp)) === modified file 'lisp/gnus/gnus-cite.el' --- lisp/gnus/gnus-cite.el 2010-09-02 00:55:51 +0000 +++ lisp/gnus/gnus-cite.el 2010-10-31 22:31:24 +0000 @@ -516,10 +516,15 @@ (setq m (cdr m)))) marks)))) -(defun gnus-article-fill-cited-article (&optional force width) +(defun gnus-article-fill-cited-long-lines () + (gnus-article-fill-cited-article nil t)) + +(defun gnus-article-fill-cited-article (&optional width long-lines) "Do word wrapping in the current article. -If WIDTH (the numerical prefix), use that text width when filling." - (interactive (list t current-prefix-arg)) +If WIDTH (the numerical prefix), use that text width when +filling. If LONG-LINES, only fill sections that have lines +longer than the frame width." + (interactive "P") (with-current-buffer gnus-article-buffer (let ((buffer-read-only nil) (inhibit-point-motion-hooks t) @@ -535,8 +540,12 @@ (fill-prefix (if (string= (cdar marks) "") "" (concat (cdar marks) " "))) + (do-fill (not long-lines)) use-hard-newlines) - (fill-region (point-min) (point-max))) + (unless do-fill + (setq do-fill (gnus-article-foldable-buffer (cdar marks)))) + (when do-fill + (fill-region (point-min) (point-max)))) (set-marker (caar marks) nil) (setq marks (cdr marks))) (when marks @@ -548,6 +557,28 @@ gnus-cite-loose-attribution-alist nil gnus-cite-article nil))))) +(defun gnus-article-foldable-buffer (prefix) + (let ((do-fill nil) + columns) + (goto-char (point-min)) + (while (not (eobp)) + (forward-char (length prefix)) + (skip-chars-forward " \t") + (unless (eolp) + (let ((elem (assq (current-column) columns))) + (unless elem + (setq elem (cons (current-column) 0)) + (push elem columns)) + (setcdr elem (1+ (cdr elem))))) + (end-of-line) + (when (> (current-column) (frame-width)) + (setq do-fill t)) + (forward-line 1)) + (and do-fill + ;; We know know that there are long lines here, but does this look + ;; like code? Check for ragged edges on the left. + (< (length columns) 3)))) + (defun gnus-article-natural-long-line-p () "Return true if the current line is long, and it's natural text." (save-excursion === modified file 'lisp/gnus/gnus-msg.el' --- lisp/gnus/gnus-msg.el 2010-10-30 05:59:34 +0000 +++ lisp/gnus/gnus-msg.el 2010-10-31 22:31:24 +0000 @@ -1891,7 +1891,11 @@ (setq v (cond ((stringp value) - value) + (if (and (stringp match) + (string-match-p "\\\\[&[:digit:]]" value) + (match-beginning 1)) + (gnus-match-substitute-replacement value nil nil group) + value)) ((or (symbolp value) (functionp value)) (cond ((functionp value) === modified file 'lisp/gnus/gnus-srvr.el' --- lisp/gnus/gnus-srvr.el 2010-10-04 22:26:51 +0000 +++ lisp/gnus/gnus-srvr.el 2010-10-31 22:31:24 +0000 @@ -34,6 +34,8 @@ (require 'gnus-int) (require 'gnus-range) +(autoload 'gnus-group-make-nnir-group "nnir") + (defcustom gnus-server-mode-hook nil "Hook run in `gnus-server-mode' buffers." :group 'gnus-server @@ -165,6 +167,8 @@ "g" gnus-server-regenerate-server + "G" gnus-group-make-nnir-group + "z" gnus-server-compact-server "\C-c\C-i" gnus-info-find-node === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2010-10-30 15:01:14 +0000 +++ lisp/gnus/gnus-sum.el 2010-10-31 22:31:24 +0000 @@ -7596,6 +7596,7 @@ (not (get-buffer gnus-original-article-buffer)))) (and (not gnus-single-article-buffer) (or (null gnus-current-article) + (not (get-buffer gnus-original-article-buffer)) (not (eq gnus-current-article article)))) force) ;; The requested article is different from the current article. @@ -9392,9 +9393,10 @@ If ARG (the prefix) is a number, show the article with the charset defined in `gnus-summary-show-article-charset-alist', or the charset input. -If ARG (the prefix) is non-nil and not a number, show the raw article -without any article massaging functions being run. Normally, the key -strokes are `C-u g'." +If ARG (the prefix) is non-nil and not a number, show the article, +but without running any of the article treatment functions +article. Normally, the keystroke is `C-u g'. When using `C-u +C-u g', show the raw article." (interactive "P") (cond ((numberp arg) @@ -9436,7 +9438,8 @@ ((not arg) ;; Select the article the normal way. (gnus-summary-select-article nil 'force)) - (t + ((equal arg '(16)) + ;; C-u C-u g ;; We have to require this here to make sure that the following ;; dynamic binding isn't shadowed by autoloading. (require 'gnus-async) @@ -9454,6 +9457,9 @@ ;; Set it to nil for safety reason. (setq gnus-article-mime-handle-alist nil) (setq gnus-article-mime-handles nil))) + (gnus-summary-select-article nil 'force))) + (t + (let ((gnus-inhibit-article-treatments t)) (gnus-summary-select-article nil 'force)))) (gnus-summary-goto-subject gnus-current-article) (gnus-summary-position-point)) === modified file 'lisp/gnus/gnus-util.el' --- lisp/gnus/gnus-util.el 2010-10-30 05:59:34 +0000 +++ lisp/gnus/gnus-util.el 2010-10-31 22:31:24 +0000 @@ -1982,6 +1982,28 @@ (memq elem list)))) found)) +(eval-and-compile + (cond + ((fboundp 'match-substitute-replacement) + (defalias 'gnus-match-substitute-replacement 'match-substitute-replacement)) + (t + (defun gnus-match-substitute-replacement (replacement &optional fixedcase literal string subexp) + "Return REPLACEMENT as it will be inserted by `replace-match'. +In other words, all back-references in the form `\\&' and `\\N' +are substituted with actual strings matched by the last search. +Optional FIXEDCASE, LITERAL, STRING and SUBEXP have the same +meaning as for `replace-match'. + +This is the definition of match-substitute-replacement in subr.el from GNU Emacs." + (let ((match (match-string 0 string))) + (save-match-data + (set-match-data (mapcar (lambda (x) + (if (numberp x) + (- x (match-beginning 0)) + x)) + (match-data t))) + (replace-match replacement fixedcase literal match subexp))))))) + (provide 'gnus-util) ;;; gnus-util.el ends here === modified file 'lisp/gnus/gnus.el' --- lisp/gnus/gnus.el 2010-10-30 15:01:14 +0000 +++ lisp/gnus/gnus.el 2010-10-31 22:31:24 +0000 @@ -1032,10 +1032,11 @@ (unless (and (fboundp 'find-image) (display-graphic-p) - ;; Make sure the library defining `image-load-path' is loaded - ;; (`find-image' is autoloaded) (and discard the result). Else, we may - ;; get "defvar ignored because image-load-path is let-bound" when calling - ;; `find-image' below. + ;; Make sure the library defining `image-load-path' is + ;; loaded (`find-image' is autoloaded) (and discard the + ;; result). Else, we may get "defvar ignored because + ;; image-load-path is let-bound" when calling `find-image' + ;; below. (or (find-image '(nil (:type xpm :file "gnus.xpm"))) t) (let* ((data-directory (nnheader-find-etc-directory "images/gnus")) (image-load-path (cond (data-directory @@ -1065,9 +1066,10 @@ (insert-char ?\ (max 0 (round (- (window-width) (or x (car size))) 2))) (insert-image image)) + (goto-char (point-min)) t))) (insert - (format " + (format " _ ___ _ _ _ ___ __ ___ __ _ ___ __ _ ___ __ ___ @@ -2772,7 +2774,8 @@ ("gnus-cite" :interactive t gnus-article-highlight-citation gnus-article-hide-citation-maybe gnus-article-hide-citation gnus-article-fill-cited-article - gnus-article-hide-citation-in-followups) + gnus-article-hide-citation-in-followups + gnus-article-fill-cited-long-lines) ("gnus-kill" gnus-kill gnus-apply-kill-file-internal gnus-kill-file-edit-file gnus-kill-file-raise-followups-to-author gnus-execute gnus-expunge gnus-batch-kill gnus-batch-score) === modified file 'lisp/gnus/nndoc.el' --- lisp/gnus/nndoc.el 2010-10-19 23:06:50 +0000 +++ lisp/gnus/nndoc.el 2010-10-31 22:31:24 +0000 @@ -918,7 +918,8 @@ (setq body-end (point)) (push (list (incf i) head-begin head-end body-begin body-end (count-lines body-begin body-end)) - nndoc-dissection-alist))))))) + nndoc-dissection-alist))))) + (setq nndoc-dissection-alist (nreverse nndoc-dissection-alist)))) (defun nndoc-article-begin () (if nndoc-article-begin-function === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2010-10-30 12:54:28 +0000 +++ lisp/gnus/nnimap.el 2010-10-31 22:31:24 +0000 @@ -382,14 +382,13 @@ ;; connection and start a STARTTLS connection instead. (cond ((and (or (and (eq nnimap-stream 'network) - (member "STARTTLS" - (nnimap-capabilities nnimap-object))) + (nnimap-capability "STARTTLS")) (eq nnimap-stream 'starttls)) (fboundp 'open-gnutls-stream)) (nnimap-command "STARTTLS") (gnutls-negotiate (nnimap-process nnimap-object) nil)) ((and (eq nnimap-stream 'network) - (member "STARTTLS" (nnimap-capabilities nnimap-object))) + (nnimap-capability "STARTTLS")) (let ((nnimap-stream 'starttls)) (let ((tls-process (nnimap-open-connection buffer))) @@ -416,8 +415,8 @@ (nnimap-credentials nnimap-address ports))))) (setq nnimap-object nil) (setq login-result - (if (member "AUTH=PLAIN" - (nnimap-capabilities nnimap-object)) + (if (and (nnimap-capability "AUTH=PLAIN") + (nnimap-capability "LOGINDISABLED")) (nnimap-command "AUTHENTICATE PLAIN %s" (base64-encode-string @@ -439,7 +438,7 @@ (delete-process (nnimap-process nnimap-object)) (setq nnimap-object nil)))) (when nnimap-object - (when (member "QRESYNC" (nnimap-capabilities nnimap-object)) + (when (nnimap-capability "QRESYNC") (nnimap-command "ENABLE QRESYNC")) (nnimap-process nnimap-object)))))))) @@ -555,8 +554,11 @@ (delete-region (point) (point-max))) t))) +(defun nnimap-capability (capability) + (member capability (nnimap-capabilities nnimap-object))) + (defun nnimap-ver4-p () - (member "IMAP4REV1" (nnimap-capabilities nnimap-object))) + (nnimap-capability "IMAP4REV1")) (defun nnimap-get-partial-article (article parts structure) (let ((result @@ -872,7 +874,7 @@ (nnimap-command "UID STORE %s +FLAGS.SILENT (\\Deleted)" (nnimap-article-ranges articles)) (cond - ((member "UIDPLUS" (nnimap-capabilities nnimap-object)) + ((nnimap-capability "UIDPLUS") (nnimap-command "UID EXPUNGE %s" (nnimap-article-ranges articles)) t) @@ -928,9 +930,12 @@ (nnimap-add-cr) (setq message (buffer-substring-no-properties (point-min) (point-max))) (with-current-buffer (nnimap-buffer) + (erase-buffer) (setq sequence (nnimap-send-command "APPEND %S {%d}" (utf7-encode group t) (length message))) + (unless nnimap-streaming + (nnimap-wait-for-connection "^[+]")) (process-send-string (get-buffer-process (current-buffer)) message) (process-send-string (get-buffer-process (current-buffer)) (if (nnimap-newlinep nnimap-object) @@ -1031,7 +1036,7 @@ (with-current-buffer (nnimap-buffer) (erase-buffer) (setf (nnimap-group nnimap-object) nil) - (let ((qresyncp (member "QRESYNC" (nnimap-capabilities nnimap-object))) + (let ((qresyncp (nnimap-capability "QRESYNC")) params groups sequences active uidvalidity modseq group) ;; Go through the infos and gather the data needed to know ;; what and how to request the data. @@ -1477,12 +1482,14 @@ (nnimap-wait-for-response sequence) (nnimap-parse-response)) -(defun nnimap-wait-for-connection () +(defun nnimap-wait-for-connection (&optional regexp) + (unless regexp + (setq regexp "^[*.] .*\n")) (let ((process (get-buffer-process (current-buffer)))) (goto-char (point-min)) (while (and (memq (process-status process) '(open run)) - (not (re-search-forward "^[*.] .*\n" nil t))) + (not (re-search-forward regexp nil t))) (nnheader-accept-process-output process) (goto-char (point-min))) (forward-line -1) @@ -1669,7 +1676,7 @@ (cond ;; If the server supports it, we now delete the message we have ;; just copied over. - ((member "UIDPLUS" (nnimap-capabilities nnimap-object)) + ((nnimap-capability "UIDPLUS") (setq sequence (nnimap-send-command "UID EXPUNGE %s" range))) ;; If it doesn't support UID EXPUNGE, then we only expunge if the ;; user has configured it. === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2010-10-31 00:13:12 +0000 +++ lisp/gnus/nnir.el 2010-10-31 22:31:24 +0000 @@ -491,10 +491,12 @@ nnir-current-group-marked nil nnir-artlist nil) (let* ((query (read-string "Query: " nil 'nnir-search-history)) - (parms (list (cons 'query query)))) + (parms (list (cons 'query query))) + (srv (if (gnus-server-server-name) + "all" ""))) (add-to-list 'parms (cons 'unique-id (message-unique-id)) t) (gnus-group-read-ephemeral-group - (concat "nnir:" (prin1-to-string parms)) '(nnir "") t + (concat "nnir:" (prin1-to-string parms)) (list 'nnir srv) t (cons (current-buffer) gnus-current-window-configuration) nil))) @@ -566,7 +568,7 @@ (equal server nnir-current-server))) nnir-artlist ;; Cache miss. - (setq nnir-artlist (nnir-run-query group))) + (setq nnir-artlist (nnir-run-query group server))) (with-current-buffer nntp-server-buffer (setq nnir-current-query group) (when server (setq nnir-current-server server)) @@ -765,6 +767,7 @@ (cdr (assoc nnir-imap-default-search-key nnir-imap-search-arguments)))) (gnus-inhibit-demon t) + (groups (or groups (nnir-get-active srv))) artlist) (message "Opening server %s" server) (apply @@ -1414,15 +1417,22 @@ (while (not (eobp)) (unless (or (eolp) (looking-at "\x0d")) (let ((header (nnheader-parse-nov))) - (let ((xref (mail-header-xref header))) + (let ((xref (mail-header-xref header)) + (xscore (string-to-number (cdr (assoc 'X-Score + (mail-header-extra header)))))) (when (string-match " \\([^:]+\\)[:/]\\([0-9]+\\)" xref) (push (vector (gnus-group-prefixed-name (match-string 1 xref) srv) - (string-to-number (match-string 2 xref)) 1) + (string-to-number (match-string 2 xref)) xscore) artlist))))) (forward-line 1))) - (reverse artlist)) + ;; Sort by score + (apply 'vector + (sort artlist + (function (lambda (x y) + (> (nnir-artitem-rsv x) + (nnir-artitem-rsv y))))))) (message "Can't search non-gmane nntp groups"))) ;;; Util Code: @@ -1445,13 +1455,16 @@ (cons sym (format (cdr mapping) result))) (cons sym (read-string prompt))))) -(defun nnir-run-query (query) +(defun nnir-run-query (query nserver) "Invoke appropriate search engine function (see `nnir-engines'). If some groups were process-marked, run the query for each of the groups and concat the results." (let ((q (car (read-from-string query))) - (groups (nnir-sort-groups-by-server - (or gnus-group-marked (list (gnus-group-group-name)))))) + (groups (if (string= "all-ephemeral" nserver) + (with-current-buffer gnus-server-buffer + (list (list (gnus-server-server-name)))) + (nnir-sort-groups-by-server + (or gnus-group-marked (list (gnus-group-group-name))))))) (apply 'vconcat (mapcar (lambda (x) (let* ((server (car x)) @@ -1551,6 +1564,44 @@ value) nil)) +(defun nnir-get-active (srv) + (let ((method (gnus-server-to-method srv)) + groups) + (gnus-request-list method) + (with-current-buffer nntp-server-buffer + (let ((cur (current-buffer)) + name) + (goto-char (point-min)) + (unless (string= gnus-ignored-newsgroups "") + (delete-matching-lines gnus-ignored-newsgroups)) + ;; We treat NNTP as a special case to avoid problems with + ;; garbage group names like `"foo' that appear in some badly + ;; managed active files. -jh. + (if (eq (car method) 'nntp) + (while (not (eobp)) + (ignore-errors + (push (cons + (mm-string-as-unibyte + (buffer-substring + (point) + (progn + (skip-chars-forward "^ \t") + (point)))) + (let ((last (read cur))) + (cons (read cur) last))) + groups)) + (forward-line)) + (while (not (eobp)) + (ignore-errors + (push (mm-string-as-unibyte + (let ((p (point))) + (skip-chars-forward "^ \t\\\\") + (setq name (buffer-substring (+ p 1) (- (point) 1))) + (gnus-group-full-name name method))) + groups)) + (forward-line))))) + groups)) + ;; The end. (provide 'nnir) === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2010-10-31 00:13:12 +0000 +++ lisp/gnus/shr.el 2010-10-31 22:31:24 +0000 @@ -286,7 +286,9 @@ (aref (char-category-set (following-char)) ?>))) (backward-char 1)) (while (and (>= (setq count (1- count)) 0) - (aref (char-category-set (following-char)) ?>)) + (aref (char-category-set (following-char)) ?>) + (aref fill-find-break-point-function-table + (following-char))) (forward-char 1))) (when (eq (following-char) ? ) (forward-char 1)) ------------------------------------------------------------ revno: 102171 author: Julien Danjou committer: Stefan Monnier branch nick: trunk timestamp: Sun 2010-10-31 15:25:39 -0400 message: * lisp/emacs-lisp/bytecomp.el (byte-recompile-file): New fun. (byte-recompile-directory): * lisp/emacs-lisp/lisp-mode.el (emacs-lisp-byte-compile-and-load): * cedet/ede/proj-elisp.el (project-compile-target): * cedet/semantic/ede-grammar.el (project-compile-target): Use `byte-recompile-file'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-31 18:38:16 +0000 +++ lisp/ChangeLog 2010-10-31 19:25:39 +0000 @@ -1,3 +1,12 @@ +2010-10-31 Julien Danjou + + * emacs-lisp/bytecomp.el (byte-recompile-file): New fun (bug#7297). + (byte-recompile-directory): + * emacs-lisp/lisp-mode.el (emacs-lisp-byte-compile-and-load): + * cedet/ede/proj-elisp.el (project-compile-target): + * cedet/semantic/ede-grammar.el (project-compile-target): + Use `byte-recompile-file'. + 2010-10-31 Glenn Morris * cus-start.el: Handle standard values via a keyword. === modified file 'lisp/cedet/ede/proj-elisp.el' --- lisp/cedet/ede/proj-elisp.el 2010-09-21 02:42:53 +0000 +++ lisp/cedet/ede/proj-elisp.el 2010-10-31 19:25:39 +0000 @@ -131,11 +131,8 @@ (let* ((fsrc (expand-file-name src dir)) (elc (concat (file-name-sans-extension fsrc) ".elc")) ) - (if (or (not (file-exists-p elc)) - (file-newer-than-file-p fsrc elc)) - (progn - (setq comp (1+ comp)) - (byte-compile-file fsrc)) + (if (eq (byte-recompile-file fsrc nil 0)) t) + (setq comp (1+ comp)) (setq utd (1+ utd))))) (oref obj source)) (message "All Emacs Lisp sources are up to date in %s" (object-name obj)) === modified file 'lisp/cedet/semantic/ede-grammar.el' --- lisp/cedet/semantic/ede-grammar.el 2010-01-13 08:35:10 +0000 +++ lisp/cedet/semantic/ede-grammar.el 2010-10-31 19:25:39 +0000 @@ -133,10 +133,7 @@ (save-excursion (semantic-grammar-create-package)) (save-buffer) - (let ((cf (concat (semantic-grammar-package) ".el"))) - (if (or (not (file-exists-p cf)) - (file-newer-than-file-p src cf)) - (byte-compile-file cf))))) + (byte-recompile-file (concat (semantic-grammar-package) ".el") nil 0)) (oref obj source))) (message "All Semantic Grammar sources are up to date in %s" (object-name obj))) === modified file 'lisp/emacs-lisp/bytecomp.el' --- lisp/emacs-lisp/bytecomp.el 2010-10-03 04:31:59 +0000 +++ lisp/emacs-lisp/bytecomp.el 2010-10-31 19:25:39 +0000 @@ -37,6 +37,7 @@ ;; ======================================================================== ;; Entry points: ;; byte-recompile-directory, byte-compile-file, +;; byte-recompile-file, ;; batch-byte-compile, batch-byte-recompile-directory, ;; byte-compile, compile-defun, ;; display-call-tree @@ -1551,23 +1552,10 @@ (not (auto-save-file-name-p bytecomp-source)) (not (string-equal dir-locals-file (file-name-nondirectory - bytecomp-source))) - (setq bytecomp-dest - (byte-compile-dest-file bytecomp-source)) - (if (file-exists-p bytecomp-dest) - ;; File was already compiled. - (or bytecomp-force - (file-newer-than-file-p bytecomp-source - bytecomp-dest)) - ;; No compiled file exists yet. - (and bytecomp-arg - (or (eq 0 bytecomp-arg) - (y-or-n-p (concat "Compile " - bytecomp-source "? ")))))) - (progn (if (and noninteractive (not byte-compile-verbose)) - (message "Compiling %s..." bytecomp-source)) - (let ((bytecomp-res (byte-compile-file - bytecomp-source))) + bytecomp-source)))) + (progn (let ((bytecomp-res (byte-recompile-file + bytecomp-source + bytecomp-force bytecomp-arg))) (cond ((eq bytecomp-res 'no-byte-compile) (setq skip-count (1+ skip-count))) ((eq bytecomp-res t) @@ -1595,6 +1583,59 @@ ;; Local Variables:\n;; no-byte-compile: t\n;; End: ") ;;;###autoload(put 'no-byte-compile 'safe-local-variable 'booleanp) +(defun byte-recompile-file (bytecomp-filename &optional bytecomp-force bytecomp-arg load) + "Recompile BYTECOMP-FILENAME file if it needs recompilation. +This happens when its `.elc' file is older than itself. + +If the `.elc' file exists and is up-to-date, normally this +function *does not* compile BYTECOMP-FILENAME. However, if the +prefix argument BYTECOMP-FORCE is set, that means do compile +BYTECOMP-FILENAME even if the destination already exists and is +up-to-date. + +If the `.elc' file does not exist, normally this function *does +not* compile BYTECOMP-FILENAME. If BYTECOMP-ARG is 0, that means +compile the file even if it has never been compiled before. +A nonzero BYTECOMP-ARG means ask the user. + +If LOAD is set, `load' the file after compiling. + +The value returned is the value returned by `byte-compile-file', +or 'no-byte-compile if the file did not need recompilation." + (interactive + (let ((bytecomp-file buffer-file-name) + (bytecomp-file-name nil) + (bytecomp-file-dir nil)) + (and bytecomp-file + (eq (cdr (assq 'major-mode (buffer-local-variables))) + 'emacs-lisp-mode) + (setq bytecomp-file-name (file-name-nondirectory bytecomp-file) + bytecomp-file-dir (file-name-directory bytecomp-file))) + (list (read-file-name (if current-prefix-arg + "Byte compile file: " + "Byte recompile file: ") + bytecomp-file-dir bytecomp-file-name nil) + current-prefix-arg))) + (let ((bytecomp-dest + (byte-compile-dest-file bytecomp-filename)) + ;; Expand now so we get the current buffer's defaults + (bytecomp-filename (expand-file-name bytecomp-filename))) + (if (if (file-exists-p bytecomp-dest) + ;; File was already compiled + ;; Compile if forced to, or filename newer + (or bytecomp-force + (file-newer-than-file-p bytecomp-filename + bytecomp-dest)) + (or (eq 0 bytecomp-arg) + (y-or-n-p (concat "Compile " + bytecomp-filename "? ")))) + (progn + (if (and noninteractive (not byte-compile-verbose)) + (message "Compiling %s..." bytecomp-source)) + (byte-compile-file bytecomp-filename load)) + (when load (load bytecomp-filename)) + 'no-byte-compile))) + ;;;###autoload (defun byte-compile-file (bytecomp-filename &optional load) "Compile a file of Lisp code named BYTECOMP-FILENAME into a file of byte code. === modified file 'lisp/emacs-lisp/lisp-mode.el' --- lisp/emacs-lisp/lisp-mode.el 2010-08-30 13:03:05 +0000 +++ lisp/emacs-lisp/lisp-mode.el 2010-10-31 19:25:39 +0000 @@ -407,10 +407,7 @@ (if (and (buffer-modified-p) (y-or-n-p (format "Save buffer %s first? " (buffer-name)))) (save-buffer)) - (let ((compiled-file-name (byte-compile-dest-file buffer-file-name))) - (if (file-newer-than-file-p compiled-file-name buffer-file-name) - (load-file compiled-file-name) - (byte-compile-file buffer-file-name t)))) + (byte-recompile-file buffer-file-name nil 0 t)) (defcustom emacs-lisp-mode-hook nil "Hook run when entering Emacs Lisp mode." ------------------------------------------------------------ revno: 102170 committer: Juanma Barranquero branch nick: trunk timestamp: Sun 2010-10-31 19:38:16 +0100 message: More merge fixes. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-31 18:26:54 +0000 +++ lisp/ChangeLog 2010-10-31 18:38:16 +0000 @@ -30,7 +30,7 @@ 2010-10-31 Aaron S. Hawley - * add-log.el (find-change-log): Use derived-mode-p rather than + * vc/add-log.el (find-change-log): Use derived-mode-p rather than major-mode (bug#7284). 2010-10-31 Glenn Morris === modified file 'lisp/cedet/ChangeLog' --- lisp/cedet/ChangeLog 2010-10-31 14:40:01 +0000 +++ lisp/cedet/ChangeLog 2010-10-31 18:38:16 +0000 @@ -6,12 +6,6 @@ (semantic-symref-rb-toggle-expand-tag): Replace inappropriate uses of toggle-read-only. -2010-10-31 Juanma Barranquero - - * semantic/symref/list.el (semantic-symref-list-rename-open-hits): - Fix typo in message. - (semantic-symref-list-map-open-hits): Fix typo in docstring. - 2010-09-30 Chong Yidong * semantic/bovine/el.el: ------------------------------------------------------------ revno: 102169 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 11:26:54 -0700 message: Fix bug#7299; default value of tool-bar-mode in without-x builds. * src/frame.c (syms_of_frame) : Default to nil if !HAVE_WINDOW_SYSTEM. * lisp/cus-start.el: Handle standard values via a keyword. Only set version property if specified. (cursor-in-non-selected-windows, menu-bar-mode) (tool-bar-mode, show-trailing-whitespace): Do not specify standard values. (transient-mark-mode, temporary-file-directory): Use :standard. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-31 18:13:40 +0000 +++ lisp/ChangeLog 2010-10-31 18:26:54 +0000 @@ -1,3 +1,12 @@ +2010-10-31 Glenn Morris + + * cus-start.el: Handle standard values via a keyword. + Only set version property if specified. + (cursor-in-non-selected-windows, menu-bar-mode) + (tool-bar-mode, show-trailing-whitespace): + Do not specify standard values. + (transient-mark-mode, temporary-file-directory): Use :standard. + 2010-10-31 Jan Djärv * term/x-win.el (x-get-selection-value): New function that gets === modified file 'lisp/cus-start.el' --- lisp/cus-start.el 2010-10-30 02:27:44 +0000 +++ lisp/cus-start.el 2010-10-31 18:26:54 +0000 @@ -97,12 +97,13 @@ (line-spacing display (choice (const :tag "none" nil) integer) "22.1") (cursor-in-non-selected-windows - cursor boolean nil t :tag "Cursor In Non-selected Windows" + cursor boolean nil + :tag "Cursor In Non-selected Windows" :set #'(lambda (symbol value) (set-default symbol value) (force-mode-line-update t))) (transient-mark-mode editing-basics boolean nil - (not noninteractive) + :standard (not noninteractive) :initialize custom-initialize-delay :set custom-set-minor-mode) ;; callint.c @@ -179,6 +180,7 @@ (temporary-file-directory ;; Darwin section added 24.1, does not seem worth :version bump. files directory nil + :standard (file-name-as-directory ;; FIXME ? Should there be Ftemporary_file_directory to do this ;; more robustly (cf set_local_socket in emacsclient.c). @@ -218,11 +220,11 @@ (other :tag "hidden by keypress" 1)) "22.1") (make-pointer-invisible mouse boolean "23.2") - (menu-bar-mode frames boolean nil t + (menu-bar-mode frames boolean nil ;; FIXME? ; :initialize custom-initialize-default :set custom-set-minor-mode) - (tool-bar-mode (frames mouse) boolean nil t + (tool-bar-mode (frames mouse) boolean nil ; :initialize custom-initialize-default :set custom-set-minor-mode) ;; fringe.c @@ -372,7 +374,7 @@ (other :tag "Always" t)) "23.1") ;; xdisp.c - (show-trailing-whitespace whitespace-faces boolean nil nil + (show-trailing-whitespace whitespace-faces boolean nil :safe booleanp) (scroll-step windows integer) (scroll-conservatively windows integer) @@ -448,13 +450,13 @@ group (nth 1 this) type (nth 2 this) version (nth 3 this) + rest (nthcdr 4 this) ;; If we did not specify any standard value expression above, ;; use the current value as the standard value. - standard (if (nthcdr 4 this) - (nth 4 this) - (when (default-boundp symbol) - (funcall quoter (default-value symbol)))) - rest (nthcdr 5 this) + standard (if (setq prop (memq :standard rest)) + (cadr prop) + (if (default-boundp symbol) + (funcall quoter (default-value symbol)))) ;; Don't complain about missing variables which are ;; irrelevant to this platform. native-p (save-match-data @@ -508,12 +510,12 @@ (custom-add-to-group group symbol 'custom-variable)) ;; Set the type. (put symbol 'custom-type type) - (put symbol 'custom-version version) + (if version (put symbol 'custom-version version)) (while rest (setq prop (car rest) propval (cadr rest) rest (nthcdr 2 rest)) - (cond ((memq prop '(:risky :safe :set))) ; handled above + (cond ((memq prop '(:standard :risky :safe :set))) ; handled above ((eq prop :tag) (put symbol 'custom-tag propval)))))))) === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-31 14:40:01 +0000 +++ src/ChangeLog 2010-10-31 18:26:54 +0000 @@ -1,3 +1,8 @@ +2010-10-31 Glenn Morris + + * frame.c (syms_of_frame) : + Default to nil if !HAVE_WINDOW_SYSTEM. (Bug#7299) + 2010-10-31 Chong Yidong * xterm.c (x_connection_closed): Print informative error message === modified file 'src/frame.c' --- src/frame.c 2010-10-29 03:29:29 +0000 +++ src/frame.c 2010-10-31 18:26:54 +0000 @@ -4576,7 +4576,11 @@ Setting this variable directly does not take effect; either customize it (see the info node `Easy Customization') or call the function `tool-bar-mode'. */); +#ifdef HAVE_WINDOW_SYSTEM Vtool_bar_mode = Qt; +#else + Vtool_bar_mode = Qnil; +#endif DEFVAR_KBOARD ("default-minibuffer-frame", Vdefault_minibuffer_frame, doc: /* Minibufferless frames use this frame's minibuffer. ------------------------------------------------------------ revno: 102168 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-31 11:13:40 -0700 message: * lisp/ChangeLog: Merge fixes. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-31 16:03:11 +0000 +++ lisp/ChangeLog 2010-10-31 18:13:40 +0000 @@ -8,7 +8,7 @@ * net/tramp.el (tramp-handle-insert-file-contents): For root, preserve owner and group when editing files. (Bug#7289) -2010-10-31 Stefan Monnier +2010-10-31 Glenn Morris * speedbar.el (speedbar-mode): * play/fortune.el (fortune-in-buffer, fortune): @@ -17,8 +17,6 @@ * textmodes/bibtex.el (bibtex-validate, bibtex-validate-globally): Replace inappropriate uses of toggle-read-only. (Bug#7292) -2010-10-31 Glenn Morris - * select.el (x-selection): Mark it as an obsolete alias. 2010-10-31 Aaron S. Hawley @@ -31,11 +29,6 @@ * menu-bar.el (menu-bar-files-menu): Make it into an actual alias, rather than just an unused variable that inherits from the real one. -2010-10-31 Glenn Morris - - * comint.el (comint-password-prompt-regexp): - Match "enter the password". (Bug#7224) - 2010-10-31 Alan Mackenzie * progmodes/cc-cmds.el (c-mask-paragraph): Fix an off-by-1 error. ------------------------------------------------------------ revno: 102167 committer: Jan D. branch nick: trunk timestamp: Sun 2010-10-31 17:03:11 +0100 message: Don't use STRING as first choice when pasting PRIMARY (Bug#6802). * lisp/term/x-win.el (x-get-selection-value): New function that gets PRIMARY with type as specified in x-select-request-type. (Bug#6802). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-31 14:40:01 +0000 +++ lisp/ChangeLog 2010-10-31 16:03:11 +0000 @@ -1,3 +1,8 @@ +2010-10-31 Jan Djärv + + * term/x-win.el (x-get-selection-value): New function that gets + PRIMARY with type as specified in x-select-request-type. (Bug#6802). + 2010-10-31 Michael Albinus * net/tramp.el (tramp-handle-insert-file-contents): For root, === modified file 'lisp/term/x-win.el' --- lisp/term/x-win.el 2010-10-24 22:04:45 +0000 +++ lisp/term/x-win.el 2010-10-31 16:03:11 +0000 @@ -1279,6 +1279,13 @@ (setq interprogram-cut-function 'x-select-text) (setq interprogram-paste-function 'x-selection-value) +;; Make paste from other applications use the decoding in x-select-request-type +;; and not just STRING. +(defun x-get-selection-value () + "Get the current value of the PRIMARY selection. +Request data types in the order specified by `x-select-request-type'." + (x-selection-value-internal 'PRIMARY)) + (defun x-clipboard-yank () "Insert the clipboard contents, or the last stretch of killed text." (interactive "*") ------------------------------------------------------------ revno: 102166 [merge] committer: Chong Yidong branch nick: trunk timestamp: Sun 2010-10-31 10:41:32 -0400 message: Merge changes from emacs-23 branch diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2010-10-28 07:21:43 +0000 +++ doc/lispref/ChangeLog 2010-10-31 14:40:01 +0000 @@ -1,3 +1,7 @@ +2010-10-31 Glenn Morris + + * maps.texi (Standard Keymaps): Update File menu description. + 2010-10-28 Glenn Morris * Makefile.in (elisp.dvi, elisp.pdf): Also include $emacsdir. === modified file 'doc/lispref/maps.texi' --- doc/lispref/maps.texi 2010-05-03 22:01:23 +0000 +++ doc/lispref/maps.texi 2010-10-27 04:06:52 +0000 @@ -1,7 +1,8 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010 +@c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/maps @node Standard Keymaps, Standard Hooks, Standard Buffer-Local Variables, Top @@ -183,9 +184,9 @@ @vindex menu-bar-edit-menu The keymap which displays the Edit menu in the menu bar. -@item menu-bar-files-menu -@vindex menu-bar-files-menu -The keymap which displays the Files menu in the menu bar. +@item menu-bar-file-menu +@vindex menu-bar-file-menu +The keymap which displays the File menu in the menu bar. @item menu-bar-help-menu @vindex menu-bar-help-menu @@ -239,6 +240,3 @@ A full keymap used by View mode. @end table -@ignore - arch-tag: b741253c-7e23-4a02-b3fa-cffd9e4d72b9 -@end ignore === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-10-30 05:59:34 +0000 +++ doc/misc/ChangeLog 2010-10-31 14:40:01 +0000 @@ -1,3 +1,11 @@ +2010-10-31 Glenn Morris + + * mh-e.texi (Preface, From Bill Wohler): Change 23 to past tense. + +2010-10-31 Glenn Morris + + * cc-mode.texi: Remove reference to defunct viewcvs URL. + 2010-10-29 Lars Magne Ingebrigtsen * gnus.texi (Client-Side IMAP Splitting): Mention === modified file 'doc/misc/cc-mode.texi' --- doc/misc/cc-mode.texi 2010-08-01 18:07:10 +0000 +++ doc/misc/cc-mode.texi 2010-10-31 14:40:01 +0000 @@ -160,7 +160,8 @@ This manual is for CC Mode in Emacs. Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -201,9 +202,8 @@ @vskip 0pt plus 1filll @insertcopying -This manual was generated from cc-mode.texi, which can be downloaded -from -@url{http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/doc/misc/cc-mode.texi}. +This manual was generated from cc-mode.texi, which is distributed with Emacs, +or can be downloaded from @url{http://savannah.gnu.org/projects/emacs/}. @end titlepage @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -7015,6 +7015,3 @@ @bye -@ignore - arch-tag: c4cab162-5e57-4366-bdce-4a9db2fc97f0 -@end ignore === modified file 'doc/misc/mh-e.texi' --- doc/misc/mh-e.texi 2010-06-23 02:57:26 +0000 +++ doc/misc/mh-e.texi 2010-10-30 21:17:59 +0000 @@ -213,7 +213,7 @@ them. The MH-E package is distributed with GNU Emacs@footnote{Version -@value{VERSION} of MH-E will appear in GNU Emacs 23.1. It is supported +@value{VERSION} of MH-E appeared in GNU Emacs 23.1. It is supported in GNU Emacs 21 and 22, as well as XEmacs 21 (except for versions 21.5.9-21.5.16). It is compatible with MH versions 6.8.4 and higher, all versions of nmh, and GNU mailutils 1.0 and higher.}, so you @@ -8951,8 +8951,8 @@ reorganized to push back two decades of entropy. Version 8 appeared in Emacs 22.1 in 2006. -Development was then quiet for a couple of years. Emacs 23.1, which is -due out in 2009, will contain version 8.1. This version includes a few +Development was then quiet for a couple of years. Emacs 23.1, released +in June 2009, contains version 8.2. This version includes a few new features and several bug fixes. Bill Wohler, August 2008 @@ -9061,6 +9061,4 @@ @c sentence-end-double-space: nil @c End: -@ignore - arch-tag: b778477d-1a10-4a99-84de-f877a2ea6bef -@end ignore + === modified file 'etc/MH-E-NEWS' --- etc/MH-E-NEWS 2010-01-13 08:35:10 +0000 +++ etc/MH-E-NEWS 2010-10-30 21:17:59 +0000 @@ -1,13 +1,13 @@ * COPYRIGHT -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 - Free Software Foundation, Inc. +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, + 2010 Free Software Foundation, Inc. See the end of the file for license conditions. * Changes in MH-E 8.2 -Version 8.2 of MH-E will appear in GNU Emacs 23.1. This is a small +Version 8.2 of MH-E appeared in GNU Emacs 23.1. This is a small release that includes internal changes from the Emacs team. A new hook, `mh-pack-folder-hook', has been added. @@ -231,7 +231,7 @@ If you want to see the release notes for the alpha and beta releases leading up this release, please see: - http://cvs.savannah.gnu.org/viewcvs/emacs/etc/MH-E-NEWS?rev=1.25&root=emacs&view=markup + http://cvs.savannah.gnu.org/viewvc/emacs/emacs/etc/MH-E-NEWS?revision=1.25&view=markup === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-31 11:54:02 +0000 +++ lisp/ChangeLog 2010-10-31 14:40:01 +0000 @@ -1,3 +1,36 @@ +2010-10-31 Michael Albinus + + * net/tramp.el (tramp-handle-insert-file-contents): For root, + preserve owner and group when editing files. (Bug#7289) + +2010-10-31 Stefan Monnier + + * speedbar.el (speedbar-mode): + * play/fortune.el (fortune-in-buffer, fortune): + * play/gomoku.el (gomoku-mode): + * play/landmark.el (lm-mode): + * textmodes/bibtex.el (bibtex-validate, bibtex-validate-globally): + Replace inappropriate uses of toggle-read-only. (Bug#7292) + +2010-10-31 Glenn Morris + + * select.el (x-selection): Mark it as an obsolete alias. + +2010-10-31 Aaron S. Hawley + + * add-log.el (find-change-log): Use derived-mode-p rather than + major-mode (bug#7284). + +2010-10-31 Glenn Morris + + * menu-bar.el (menu-bar-files-menu): Make it into an actual alias, + rather than just an unused variable that inherits from the real one. + +2010-10-31 Glenn Morris + + * comint.el (comint-password-prompt-regexp): + Match "enter the password". (Bug#7224) + 2010-10-31 Alan Mackenzie * progmodes/cc-cmds.el (c-mask-paragraph): Fix an off-by-1 error. @@ -246,13 +279,13 @@ auto-built for efficiency of execution and updating. (verilog-extended-complete-re): Support 'pure' fucntion & task declarations (these have no bodies). - (verilog-beg-of-statement): general cleanup to enable support of - 'pure' fucntion & task declarations (these have no bodies). These - efforts together fix Verilog bug210 from veripool; which was also + (verilog-beg-of-statement): General cleanup to enable support of + 'pure' fucntion & task declarations (these have no bodies). + These efforts together fix Verilog bug210 from veripool; which was also noticed by Steve Pearlmutter. (verilog-directive-re, verilog-directive-begin, verilog-indent-re) - (verilog-directive-nest-re, verilog-set-auto-endcomments): Support - `elsif. Reported by Shankar Giri. + (verilog-directive-nest-re, verilog-set-auto-endcomments): + Support `elsif. Reported by Shankar Giri. (verilog-forward-ws&directives, verilog-in-attribute-p): Fixes for attribute handling for lining up declarations and assignments. (verilog-beg-of-statement-1): Fix issue where continued declaration @@ -260,8 +293,7 @@ (verilog-in-attribute-p, verilog-skip-backward-comments) (verilog-skip-forward-comment-p): Support proper treatment of attributes by indent code. Reported by Jeff Steele. - (verilog-in-directive-p): Fix comment to correctly describe - function. + (verilog-in-directive-p): Fix comment to correctly describe function. (verilog-backward-up-list, verilog-in-struct-region-p) (verilog-backward-token, verilog-in-struct-p) (verilog-in-coverage-p, verilog-do-indent) @@ -288,7 +320,7 @@ parameter in AUTOINSTPARAM. (verilog-read-always-signals-recurse, verilog-read-decls): Fix not treating `elsif similar to `endif inside AUTOSENSE. - (verilog-do-indent): Implement correct automatic or static task or + (verilog-do-indent): Implement correct automatic or static task or function end comment highlight. Reported by Steve Pearlmutter. (verilog-font-lock-keywords-2): Fix highlighting of single character pins, bug264. Reported by Michael Laajanen. @@ -296,15 +328,15 @@ (verilog-read-sub-decls-in-interfaced, verilog-read-sub-decls-sig) (verilog-subdecls-get-interfaced, verilog-subdecls-new): Support interfaces with AUTOINST, bug270. Reported by Luis Gutierrez. - (verilog-pretty-expr): Fix interactive arguments, bug272. Reported - by Mark Johnson. - (verilog-auto-tieoff, verilog-auto-tieoff-ignore-regexp): Add - 'verilog-auto-tieoff-ignore-regexp' for AUTOTIEOFF, + (verilog-pretty-expr): Fix interactive arguments, bug272. + Reported by Mark Johnson. + (verilog-auto-tieoff, verilog-auto-tieoff-ignore-regexp): + Add 'verilog-auto-tieoff-ignore-regexp' for AUTOTIEOFF, bug269. Suggested by Gary Delp. (verilog-mode-map, verilog-preprocess, verilog-preprocess-history) - (verilog-preprocessor, verilog-set-compile-command): Create - verilog-preprocess and verilog-preprocessor to show preprocessed - output. + (verilog-preprocessor, verilog-set-compile-command): + Create verilog-preprocess and verilog-preprocessor to show + preprocessed output. (verilog-get-beg-of-line, verilog-get-end-of-line) (verilog-modi-file-or-buffer, verilog-modi-name) (verilog-modi-point, verilog-within-string): Move defmacro's @@ -352,8 +384,8 @@ (verilog-modi-lookup-last-current, verilog-modi-lookup-last-mod) (verilog-modi-lookup-last-modi, verilog-modi-lookup-last-tick): Fix slow verilog-auto expansion on very large files. - (verilog-read-sub-decls-expr, verilog-read-sub-decls-line): Fix - AUTOOUTPUT treating "1*2" as a signal name in submodule connection + (verilog-read-sub-decls-expr, verilog-read-sub-decls-line): + Fix AUTOOUTPUT treating "1*2" as a signal name in submodule connection "{1*2{...". Broke in last revision. (verilog-read-sub-decls-expr): Fix AUTOOUTPUT not detecting submodule connections with replications "{#{a},#{b}}". === modified file 'lisp/cedet/ChangeLog' --- lisp/cedet/ChangeLog 2010-10-14 14:32:27 +0000 +++ lisp/cedet/ChangeLog 2010-10-31 14:40:01 +0000 @@ -1,3 +1,17 @@ +2010-10-31 Glenn Morris + + * mode-local.el (mode-local-augment-function-help): + * semantic/analyze/debug.el (semantic-analyzer-debug-add-buttons): + * semantic/symref/list.el (semantic-symref-results-dump) + (semantic-symref-rb-toggle-expand-tag): Replace inappropriate uses + of toggle-read-only. + +2010-10-31 Juanma Barranquero + + * semantic/symref/list.el (semantic-symref-list-rename-open-hits): + Fix typo in message. + (semantic-symref-list-map-open-hits): Fix typo in docstring. + 2010-09-30 Chong Yidong * semantic/bovine/el.el: === modified file 'lisp/cedet/mode-local.el' --- lisp/cedet/mode-local.el 2010-01-13 08:35:10 +0000 +++ lisp/cedet/mode-local.el 2010-10-29 07:48:10 +0000 @@ -1,6 +1,7 @@ ;;; mode-local.el --- Support for mode local facilities ;; -;; Copyright (C) 2004, 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; ;; Author: David Ponce ;; Maintainer: David Ponce @@ -610,19 +611,16 @@ SYMBOL is a function that can be overridden." (with-current-buffer "*Help*" (pop-to-buffer (current-buffer)) - (unwind-protect - (progn - (toggle-read-only -1) - (goto-char (point-min)) - (unless (re-search-forward "^$" nil t) - (goto-char (point-max)) - (beginning-of-line) - (forward-line -1)) - (insert (overload-docstring-extension symbol) "\n") - ;; NOTE TO SELF: - ;; LIST ALL LOADED OVERRIDES FOR SYMBOL HERE - ) - (toggle-read-only 1)))) + (goto-char (point-min)) + (unless (re-search-forward "^$" nil t) + (goto-char (point-max)) + (beginning-of-line) + (forward-line -1)) + (let ((inhibit-read-only t)) + (insert (overload-docstring-extension symbol) "\n") + ;; NOTE TO SELF: + ;; LIST ALL LOADED OVERRIDES FOR SYMBOL HERE + ))) ;; Help for mode-local bindings. (defun mode-local-print-binding (symbol) @@ -782,5 +780,4 @@ (provide 'mode-local) -;; arch-tag: 14b77823-f93c-4b3d-9116-495f69a6ec07 ;;; mode-local.el ends here === modified file 'lisp/cedet/semantic/analyze/debug.el' --- lisp/cedet/semantic/analyze/debug.el 2010-09-19 02:49:54 +0000 +++ lisp/cedet/semantic/analyze/debug.el 2010-10-29 07:48:10 +0000 @@ -586,34 +586,28 @@ (set-marker orig-buffer (point) (current-buffer)) ;; Get a buffer ready. (with-current-buffer "*Help*" - (toggle-read-only -1) - (goto-char (point-min)) - (set (make-local-variable 'semantic-analyzer-debug-orig) orig-buffer) - ;; First, add do-in buttons to recommendations. - (while (re-search-forward "^\\s-*M-x \\(\\(\\w\\|\\s_\\)+\\) " nil t) - (let ((fcn (match-string 1))) - (when (not (fboundp (intern-soft fcn))) - (error "Help Err: Can't find %s" fcn)) - (end-of-line) - (insert " ") - (insert-button "[ Do It ]" - 'mouse-face 'custom-button-pressed-face - 'do-fcn fcn - 'action `(lambda (arg) - (let ((M semantic-analyzer-debug-orig)) - (set-buffer (marker-buffer M)) - (goto-char M)) - (call-interactively (quote ,(intern-soft fcn)))) - ) - )) + (let ((inhibit-read-only t)) + (goto-char (point-min)) + (set (make-local-variable 'semantic-analyzer-debug-orig) orig-buffer) + ;; First, add do-in buttons to recommendations. + (while (re-search-forward "^\\s-*M-x \\(\\(\\w\\|\\s_\\)+\\) " nil t) + (let ((fcn (match-string 1))) + (when (not (fboundp (intern-soft fcn))) + (error "Help Err: Can't find %s" fcn)) + (end-of-line) + (insert " ") + (insert-button "[ Do It ]" + 'mouse-face 'custom-button-pressed-face + 'do-fcn fcn + 'action `(lambda (arg) + (let ((M semantic-analyzer-debug-orig)) + (set-buffer (marker-buffer M)) + (goto-char M)) + (call-interactively (quote ,(intern-soft fcn)))))))) ;; Do something else? - ;; Clean up the mess - (toggle-read-only 1) - (set-buffer-modified-p nil) - ))) + (set-buffer-modified-p nil)))) (provide 'semantic/analyze/debug) -;; arch-tag: 943db1e5-47e6-4bec-9989-78ebfadf0358 ;;; semantic/analyze/debug.el ends here === modified file 'lisp/cedet/semantic/symref/list.el' --- lisp/cedet/semantic/symref/list.el 2010-10-14 14:32:27 +0000 +++ lisp/cedet/semantic/symref/list.el 2010-10-31 14:40:01 +0000 @@ -221,49 +221,38 @@ (defun semantic-symref-results-dump (results) "Dump the RESULTS into the current buffer." ;; Get ready for the insert. - (toggle-read-only -1) - (erase-buffer) - - ;; Insert the contents. - (let ((lastfile nil) - ) - (dolist (T (oref results :hit-tags)) - - (when (not (equal lastfile (semantic-tag-file-name T))) - (setq lastfile (semantic-tag-file-name T)) - (insert-button lastfile + (let ((inhibit-read-only t)) + (erase-buffer) + ;; Insert the contents. + (let ((lastfile nil)) + (dolist (T (oref results :hit-tags)) + (unless (equal lastfile (semantic-tag-file-name T)) + (setq lastfile (semantic-tag-file-name T)) + (insert-button lastfile + 'mouse-face 'custom-button-pressed-face + 'action 'semantic-symref-rb-goto-file + 'tag T) + (insert "\n")) + (insert " ") + (insert-button "[+]" + 'mouse-face 'highlight + 'face nil + 'action 'semantic-symref-rb-toggle-expand-tag + 'tag T + 'state 'closed) + (insert " ") + (insert-button (funcall semantic-symref-results-summary-function + T nil t) 'mouse-face 'custom-button-pressed-face - 'action 'semantic-symref-rb-goto-file - 'tag T - ) - (insert "\n")) - - (insert " ") - (insert-button "[+]" - 'mouse-face 'highlight - 'face nil - 'action 'semantic-symref-rb-toggle-expand-tag - 'tag T - 'state 'closed) - (insert " ") - (insert-button (funcall semantic-symref-results-summary-function - T nil t) - 'mouse-face 'custom-button-pressed-face - 'face nil - 'action 'semantic-symref-rb-goto-tag - 'tag T) - (insert "\n") - - )) - - ;; Auto expand - (when semantic-symref-auto-expand-results - (semantic-symref-list-expand-all)) - - ;; Clean up the mess - (toggle-read-only 1) - (set-buffer-modified-p nil) - ) + 'face nil + 'action 'semantic-symref-rb-goto-tag + 'tag T) + (insert "\n"))) + ;; Auto expand + (when semantic-symref-auto-expand-results + (semantic-symref-list-expand-all))) + ;; Clean up the mess + (set-buffer-modified-p nil)) ;;; Commands for semantic-symref-results ;; @@ -283,11 +272,9 @@ (buff (semantic-tag-buffer tag)) (hits (semantic--tag-get-property tag :hit)) (state (button-get button 'state)) - (text nil) - ) + (text nil)) (cond ((eq state 'closed) - (toggle-read-only -1) (with-current-buffer buff (dolist (H hits) (goto-char (point-min)) @@ -295,48 +282,42 @@ (beginning-of-line) (back-to-indentation) (setq text (cons (buffer-substring (point) (point-at-eol)) text))) - (setq text (nreverse text)) - ) + (setq text (nreverse text))) (goto-char (button-start button)) (forward-char 1) - (delete-char 1) - (insert "-") - (button-put button 'state 'open) - (save-excursion - (end-of-line) - (while text - (insert "\n") - (insert " ") - (insert-button (car text) - 'mouse-face 'highlight - 'face nil - 'action 'semantic-symref-rb-goto-match - 'tag tag - 'line (car hits)) - (setq text (cdr text) - hits (cdr hits)))) - (toggle-read-only 1) - ) + (let ((inhibit-read-only t)) + (delete-char 1) + (insert "-") + (button-put button 'state 'open) + (save-excursion + (end-of-line) + (while text + (insert "\n") + (insert " ") + (insert-button (car text) + 'mouse-face 'highlight + 'face nil + 'action 'semantic-symref-rb-goto-match + 'tag tag + 'line (car hits)) + (setq text (cdr text) + hits (cdr hits)))))) ((eq state 'open) - (toggle-read-only -1) - (button-put button 'state 'closed) - ;; Delete the various bits. - (goto-char (button-start button)) - (forward-char 1) - (delete-char 1) - (insert "+") - (save-excursion - (end-of-line) + (let ((inhibit-read-only t)) + (button-put button 'state 'closed) + ;; Delete the various bits. + (goto-char (button-start button)) (forward-char 1) - (delete-region (point) - (save-excursion - (forward-char 1) - (forward-line (length hits)) - (point)))) - (toggle-read-only 1) - ) - )) - ) + (delete-char 1) + (insert "+") + (save-excursion + (end-of-line) + (forward-char 1) + (delete-region (point) + (save-excursion + (forward-char 1) + (forward-line (length hits)) + (point))))))))) (defun semantic-symref-rb-goto-file (&optional button) "Go to the file specified in the symref results buffer. @@ -554,5 +535,4 @@ ;; generated-autoload-load-name: "semantic/symref/list" ;; End: -;; arch-tag: e355d9c6-26e0-42d1-9bf1-f4801a54fffa ;;; semantic/symref/list.el ends here === modified file 'lisp/menu-bar.el' --- lisp/menu-bar.el 2010-10-29 03:29:29 +0000 +++ lisp/menu-bar.el 2010-10-31 14:40:01 +0000 @@ -83,8 +83,8 @@ (define-key global-map [menu-bar help-menu] (cons (purecopy "Info") menu-bar-help-menu))) -;; This alias is for compatibility with 19.28 and before. -(defvar menu-bar-files-menu menu-bar-file-menu) +;; Only declared obsolete (and only made a proper alias) in 23.3. +(define-obsolete-variable-alias 'menu-bar-files-menu 'menu-bar-file-menu "22.1") ;; This is referenced by some code below; it is defined in uniquify.el (defvar uniquify-buffer-name-style) === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2010-10-24 21:36:09 +0000 +++ lisp/net/tramp.el 2010-10-31 14:40:01 +0000 @@ -2861,7 +2861,11 @@ (setq buffer-file-name filename) (setq buffer-read-only (not (file-writable-p filename))) (set-visited-file-modtime) - (set-buffer-modified-p nil)) + (set-buffer-modified-p nil) + ;; For root, preserve owner and group when editing files. + (when (string-equal (file-remote-p filename 'user) "root") + (set (make-local-variable 'backup-by-copying-when-mismatch) t) + (put 'backup-by-copying-when-mismatch 'permanent-local t))) (when (and (stringp local-copy) (or remote-copy (null tramp-temp-buffer-file-name))) (delete-file local-copy)) === modified file 'lisp/play/fortune.el' --- lisp/play/fortune.el 2010-01-13 08:35:10 +0000 +++ lisp/play/fortune.el 2010-10-29 07:48:10 +0000 @@ -1,7 +1,7 @@ ;;; fortune.el --- use fortune to create signatures -;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -;; 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010 Free Software Foundation, Inc. ;; Author: Holger Schauer ;; Keywords: games utils mail @@ -285,48 +285,41 @@ ;;; Display fortune (defun fortune-in-buffer (interactive &optional file) "Put a fortune cookie in the *fortune* buffer. - -INTERACTIVE is ignored. Optional argument FILE, -when supplied, specifies the file to choose the fortune from." +INTERACTIVE is ignored. Optional argument FILE, when supplied, +specifies the file to choose the fortune from." (let ((fortune-buffer (or (get-buffer fortune-buffer-name) (generate-new-buffer fortune-buffer-name))) (fort-file (expand-file-name (substitute-in-file-name (or file fortune-file))))) (with-current-buffer fortune-buffer - (toggle-read-only 0) - (erase-buffer) - - (if fortune-always-compile - (fortune-compile fort-file)) - - (apply 'call-process - fortune-program ; program to call - nil fortune-buffer nil ; INFILE BUFFER DISPLAY - (append (if (stringp fortune-program-options) - (split-string fortune-program-options) - fortune-program-options) (list fort-file)))))) + (let ((inhibit-read-only t)) + (erase-buffer) + (if fortune-always-compile + (fortune-compile fort-file)) + (apply 'call-process + fortune-program ; program to call + nil fortune-buffer nil ; INFILE BUFFER DISPLAY + (append (if (stringp fortune-program-options) + (split-string fortune-program-options) + fortune-program-options) (list fort-file))))))) ;;;###autoload (defun fortune (&optional file) "Display a fortune cookie. - If called with a prefix asks for the FILE to choose the fortune from, otherwise uses the value of `fortune-file'. If you want to have fortune choose from a set of files in a directory, call interactively with prefix and choose the directory as the fortune-file." - (interactive - (list - (if current-prefix-arg - (fortune-ask-file) - fortune-file))) + (interactive (list (if current-prefix-arg + (fortune-ask-file) + fortune-file))) (fortune-in-buffer t file) (switch-to-buffer (get-buffer fortune-buffer-name)) - (toggle-read-only 1)) + (setq buffer-read-only t)) ;;; Provide ourselves. (provide 'fortune) -;; arch-tag: a1e4cb8a-3792-40e7-86a7-fc75ce094bcc ;;; fortune.el ends here === modified file 'lisp/play/gomoku.el' --- lisp/play/gomoku.el 2010-04-15 01:12:20 +0000 +++ lisp/play/gomoku.el 2010-10-31 14:40:01 +0000 @@ -1,7 +1,7 @@ ;;; gomoku.el --- Gomoku game between you and Emacs -;; Copyright (C) 1988, 1994, 1996, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1988, 1994, 1996, 2001, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Philippe Schnoebelen ;; Maintainer: FSF @@ -195,8 +195,8 @@ \\{gomoku-mode-map}" (gomoku-display-statistics) (make-local-variable 'font-lock-defaults) - (setq font-lock-defaults '(gomoku-font-lock-keywords t)) - (toggle-read-only t)) + (setq font-lock-defaults '(gomoku-font-lock-keywords t) + buffer-read-only t)) ;;; ;;; THE BOARD. @@ -1206,5 +1206,4 @@ (provide 'gomoku) -;; arch-tag: b1b8205e-77fc-4597-b373-3ea2c04311eb ;;; gomoku.el ends here === modified file 'lisp/play/landmark.el' --- lisp/play/landmark.el 2010-10-27 14:31:44 +0000 +++ lisp/play/landmark.el 2010-10-31 14:40:01 +0000 @@ -255,8 +255,8 @@ (lm-display-statistics) (use-local-map lm-mode-map) (make-local-variable 'font-lock-defaults) - (setq font-lock-defaults '(lm-font-lock-keywords t)) - (toggle-read-only t) + (setq font-lock-defaults '(lm-font-lock-keywords t) + buffer-read-only t) (run-mode-hooks 'lm-mode-hook)) @@ -1702,5 +1702,4 @@ (provide 'landmark) -;; arch-tag: ae5031be-96e6-459e-a3df-1df53117d3f2 ;;; landmark.el ends here === modified file 'lisp/progmodes/sql.el' --- lisp/progmodes/sql.el 2010-09-19 02:11:18 +0000 +++ lisp/progmodes/sql.el 2010-10-31 14:40:01 +0000 @@ -7,7 +7,8 @@ ;; Maintainer: Michael Mauger ;; Version: 2.8 ;; Keywords: comm languages processes -;; URL: http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/progmodes/sql.el +;; URL: http://savannah.gnu.org/projects/emacs/ +;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?SqlMode ;; This file is part of GNU Emacs. @@ -4270,6 +4271,5 @@ (provide 'sql) -;; arch-tag: 7e1fa1c4-9ca2-402e-87d2-83a5eccb7ac3 ;;; sql.el ends here === modified file 'lisp/select.el' --- lisp/select.el 2010-10-24 02:22:43 +0000 +++ lisp/select.el 2010-10-31 14:40:01 +0000 @@ -75,8 +75,9 @@ (declare-function x-get-selection-internal "xselect.c" (selection-symbol target-type &optional time-stamp)) -;; This is for temporary compatibility with pre-release Emacs 19. -(defalias 'x-selection 'x-get-selection) +;; Only declared obsolete in 23.3. +(define-obsolete-function-alias 'x-selection 'x-get-selection "at least 19.34") + (defun x-get-selection (&optional type data-type) "Return the value of an X Windows selection. The argument TYPE (default `PRIMARY') says which selection, === modified file 'lisp/speedbar.el' --- lisp/speedbar.el 2010-05-27 23:30:11 +0000 +++ lisp/speedbar.el 2010-10-31 14:40:01 +0000 @@ -1,7 +1,8 @@ ;;; speedbar --- quick access to files and tags in a frame ;; 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 +;; Free Software Foundation, Inc. ;; Author: Eric M. Ludlam ;; Keywords: file, tags, tools @@ -1128,9 +1129,9 @@ (setq font-lock-keywords nil) ;; no font-locking please (setq truncate-lines t) (make-local-variable 'frame-title-format) - (setq frame-title-format (concat "Speedbar " speedbar-version)) - (setq case-fold-search nil) - (toggle-read-only 1) + (setq frame-title-format (concat "Speedbar " speedbar-version) + case-fold-search nil + buffer-read-only t) (speedbar-set-mode-line-format) ;; Add in our dframe hooks. (if speedbar-track-mouse-flag @@ -4142,5 +4143,4 @@ ;; run load-time hooks (run-hooks 'speedbar-load-hook) -;; arch-tag: 4477e6d1-f78c-48b9-a503-387d3c9767d5 ;;; speedbar ends here === modified file 'lisp/textmodes/bibtex.el' --- lisp/textmodes/bibtex.el 2010-09-10 23:13:42 +0000 +++ lisp/textmodes/bibtex.el 2010-10-31 14:40:01 +0000 @@ -1,7 +1,8 @@ ;;; bibtex.el --- BibTeX mode for GNU Emacs ;; Copyright (C) 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, -;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Stefan Schoef ;; Bengt Martensson @@ -3835,16 +3836,16 @@ (with-current-buffer (get-buffer-create err-buf) (setq default-directory dir) (unless (eq major-mode 'compilation-mode) (compilation-mode)) - (toggle-read-only -1) - (delete-region (point-min) (point-max)) - (insert "BibTeX mode command `bibtex-validate'\n" - (if syntax-error - "Maybe undetected errors due to syntax errors. Correct and validate again.\n" - "\n")) - (dolist (err error-list) - (insert (format "%s:%d: %s\n" file (car err) (cdr err)))) - (set-buffer-modified-p nil) - (toggle-read-only 1) + (let ((inhibit-read-only t)) + (delete-region (point-min) (point-max)) + (insert "BibTeX mode command `bibtex-validate'\n" + (if syntax-error + "Maybe undetected errors due to syntax errors. \ +Correct and validate again.\n" + "\n")) + (dolist (err error-list) + (insert (format "%s:%d: %s\n" file (car err) (cdr err)))) + (set-buffer-modified-p nil)) (goto-char (point-min)) (forward-line 2)) ; first error message (display-buffer err-buf) @@ -3896,12 +3897,11 @@ (let ((err-buf "*BibTeX validation errors*")) (with-current-buffer (get-buffer-create err-buf) (unless (eq major-mode 'compilation-mode) (compilation-mode)) - (toggle-read-only -1) - (delete-region (point-min) (point-max)) - (insert "BibTeX mode command `bibtex-validate-globally'\n\n") - (dolist (err (sort error-list 'string-lessp)) (insert err)) - (set-buffer-modified-p nil) - (toggle-read-only 1) + (let ((inhibit-read-only t)) + (delete-region (point-min) (point-max)) + (insert "BibTeX mode command `bibtex-validate-globally'\n\n") + (dolist (err (sort error-list 'string-lessp)) (insert err)) + (set-buffer-modified-p nil)) (goto-char (point-min)) (forward-line 2)) ; first error message (display-buffer err-buf) @@ -4778,5 +4778,4 @@ (provide 'bibtex) -;; arch-tag: ee2be3af-caad-427f-b42a-d20fad630d04 ;;; bibtex.el ends here === modified file 'lisp/vc/add-log.el' --- lisp/vc/add-log.el 2010-09-23 07:17:08 +0000 +++ lisp/vc/add-log.el 2010-10-31 14:40:01 +0000 @@ -698,7 +698,7 @@ Optional arg BUFFER-FILE overrides `buffer-file-name'." ;; If we are called from a diff, first switch to the source buffer; ;; in order to respect buffer-local settings of change-log-default-name, etc. - (with-current-buffer (let ((buff (if (eq major-mode 'diff-mode) + (with-current-buffer (let ((buff (if (derived-mode-p 'diff-mode) (car (ignore-errors (diff-find-source-location)))))) (if (buffer-live-p buff) buff @@ -1180,7 +1180,7 @@ ((apply 'derived-mode-p add-log-c-like-modes) (or (c-cpp-define-name) (c-defun-name))) - ((memq major-mode add-log-tex-like-modes) + ((apply #'derived-mode-p add-log-tex-like-modes) (if (re-search-backward "\\\\\\(sub\\)*\\(section\\|paragraph\\|chapter\\)" nil t) === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-29 10:43:38 +0000 +++ src/ChangeLog 2010-10-31 14:40:01 +0000 @@ -1,3 +1,15 @@ +2010-10-31 Chong Yidong + + * xterm.c (x_connection_closed): Print informative error message + when aborting on GTK. This requires using shut_down_emacs + directly instead of Fkill_emacs. + +2010-10-31 Michael Albinus + + * dbusbind.c (Fdbus_call_method_asynchronously) + (Fdbus_register_signal, Fdbus_register_method): Check, whether + `dbus-registered-objects-table' is initialized. + 2010-10-29 Eli Zaretskii * emacs.c (main): Call syms_of_filelock unconditionally. === modified file 'src/dbusbind.c' --- src/dbusbind.c 2010-10-11 23:57:49 +0000 +++ src/dbusbind.c 2010-10-31 14:40:01 +0000 @@ -1232,6 +1232,10 @@ SDATA (interface), SDATA (method)); + /* Check dbus-registered-objects-table. */ + if (!HASH_TABLE_P (Vdbus_registered_objects_table)) + XD_SIGNAL1 (build_string ("dbus.el is not loaded")); + /* Open a connection to the bus. */ connection = xd_initialize (bus, TRUE); @@ -1869,6 +1873,10 @@ wrong_type_argument (intern ("functionp"), handler); GCPRO6 (bus, service, path, interface, signal, handler); + /* Check dbus-registered-objects-table. */ + if (!HASH_TABLE_P (Vdbus_registered_objects_table)) + XD_SIGNAL1 (build_string ("dbus.el is not loaded")); + /* Retrieve unique name of service. If service is a known name, we will register for the corresponding unique name, if any. Signals are sent always with the unique name as sender. Note: the unique @@ -1981,6 +1989,10 @@ /* TODO: We must check for a valid service name, otherwise there is a segmentation fault. */ + /* Check dbus-registered-objects-table. */ + if (!HASH_TABLE_P (Vdbus_registered_objects_table)) + XD_SIGNAL1 (build_string ("dbus.el is not loaded")); + /* Open a connection to the bus. */ connection = xd_initialize (bus, TRUE); === modified file 'src/xterm.c' --- src/xterm.c 2010-10-25 16:04:54 +0000 +++ src/xterm.c 2010-10-31 14:40:01 +0000 @@ -7670,47 +7670,44 @@ delete_frame (frame, Qnoelisp); } - /* We have to close the display to inform Xt that it doesn't - exist anymore. If we don't, Xt will continue to wait for - events from the display. As a consequence, a sequence of - - M-x make-frame-on-display RET :1 RET - ...kill the new frame, so that we get an IO error... - M-x make-frame-on-display RET :1 RET - - will indefinitely wait in Xt for events for display `:1', opened - in the first call to make-frame-on-display. - - Closing the display is reported to lead to a bus error on - OpenWindows in certain situations. I suspect that is a bug - in OpenWindows. I don't know how to circumvent it here. */ - + /* If DPYINFO is null, this means we didn't open the display in the + first place, so don't try to close it. */ if (dpyinfo) { #ifdef USE_X_TOOLKIT - /* If DPYINFO is null, this means we didn't open the display - in the first place, so don't try to close it. */ - { - fatal_error_signal_hook = x_fatal_error_signal; - XtCloseDisplay (dpy); - fatal_error_signal_hook = NULL; - } -#endif + /* We have to close the display to inform Xt that it doesn't + exist anymore. If we don't, Xt will continue to wait for + events from the display. As a consequence, a sequence of + + M-x make-frame-on-display RET :1 RET + ...kill the new frame, so that we get an IO error... + M-x make-frame-on-display RET :1 RET + + will indefinitely wait in Xt for events for display `:1', + opened in the first call to make-frame-on-display. + + Closing the display is reported to lead to a bus error on + OpenWindows in certain situations. I suspect that is a bug + in OpenWindows. I don't know how to circumvent it here. */ + extern void (*fatal_error_signal_hook) P_ ((void)); + fatal_error_signal_hook = x_fatal_error_signal; + XtCloseDisplay (dpy); + fatal_error_signal_hook = NULL; +#endif /* USE_X_TOOLKIT */ #ifdef USE_GTK - /* There is a long-standing bug in GTK that prevents the GTK - main loop from recovering gracefully from disconnects - (https://bugzilla.gnome.org/show_bug.cgi?id=85715). Among - other problems, this gives rise to a stream of Glib error - messages that, in one incident, filled up a user's hard disk - (http://lists.gnu.org/archive/html/emacs-devel/2010-10/msg00927.html). - So, kill Emacs unconditionally if the display is closed. */ - { - fprintf (stderr, "%s\n", error_msg); - Fkill_emacs (make_number (70)); - abort (); /* NOTREACHED */ - } -#endif + /* A long-standing GTK bug prevents proper disconnect handling + (https://bugzilla.gnome.org/show_bug.cgi?id=85715). Once, + the resulting Glib error message loop filled a user's disk. + To avoid this, kill Emacs unconditionally on disconnect. */ + shut_down_emacs (0, 0, Qnil); + fprintf (stderr, "%s\n\ +When compiled with GTK, Emacs cannot recover from X disconnects.\n\ +This is a GTK bug: https://bugzilla.gnome.org/show_bug.cgi?id=85715\n\ +For details, see etc/PROBLEMS.\n", + error_msg); + abort (); +#endif /* USE_GTK */ /* Indicate that this display is dead. */ dpyinfo->display = 0; ------------------------------------------------------------ revno: 102165 committer: Alan Mackenzie branch nick: trunk timestamp: Sun 2010-10-31 11:54:02 +0000 message: progmodes/cc-cmds.el (c-mask-paragraph): Fix an off-by-1 error. Fixes bug #7185. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-31 00:06:18 +0000 +++ lisp/ChangeLog 2010-10-31 11:54:02 +0000 @@ -1,3 +1,8 @@ +2010-10-31 Alan Mackenzie + + * progmodes/cc-cmds.el (c-mask-paragraph): Fix an off-by-1 error. + This fixes bug #7185. + 2010-10-30 Chong Yidong * startup.el (command-line): Search for package directories, and === modified file 'lisp/progmodes/cc-cmds.el' --- lisp/progmodes/cc-cmds.el 2010-08-29 16:17:13 +0000 +++ lisp/progmodes/cc-cmds.el 2010-10-31 11:54:02 +0000 @@ -3974,17 +3974,19 @@ ;; "Invalid search bound (wrong side of point)" ;; error in the subsequent re-search. Maybe ;; another fix would be needed (2007-12-08). - (or (<= (- (cdr c-lit-limits) 2) (point)) - (and - (search-forward-regexp - (concat "\\=[ \t]*\\(" c-current-comment-prefix "\\)") - (- (cdr c-lit-limits) 2) t) - (not (search-forward-regexp - "\\(\\s \\|\\sw\\)" - (- (cdr c-lit-limits) 2) 'limit)) - ;; The comment ender IS on its own line. Exclude - ;; this line from the filling. - (set-marker end (c-point 'bol))))) +; (or (<= (- (cdr c-lit-limits) 2) (point)) +; 2010-10-17 Construct removed. +; (or (< (- (cdr c-lit-limits) 2) (point)) + (and + (search-forward-regexp + (concat "\\=[ \t]*\\(" c-current-comment-prefix "\\)") + (- (cdr c-lit-limits) 2) t) + (not (search-forward-regexp + "\\(\\s \\|\\sw\\)" + (- (cdr c-lit-limits) 2) 'limit)) + ;; The comment ender IS on its own line. Exclude this + ;; line from the filling. + (set-marker end (c-point 'bol))));) ;; The comment ender is hanging. Replace all space between it ;; and the last word either by one or two 'x's (when ------------------------------------------------------------ revno: 102164 committer: Katsumi Yamaoka branch nick: trunk timestamp: Sun 2010-10-31 10:01:11 +0000 message: gnus/ChangeLog: Cosmetic fix. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-31 09:53:57 +0000 +++ lisp/gnus/ChangeLog 2010-10-31 10:01:11 +0000 @@ -1464,7 +1464,7 @@ 2010-09-27 David Engster - * nnmairix.el: (nnmairix-replace-group-and-numbers): Deal with NOV as + * nnmairix.el (nnmairix-replace-group-and-numbers): Deal with NOV as well as HEADERS. (nnmairix-retrieve-headers): Provide new argument for the above. @@ -1842,7 +1842,7 @@ (nnimap-make-process-buffer): Store all the process buffers. (nnimap-keepalive): New function. - * starttls.el: (starttls-open-stream): Add autoload cookie. + * starttls.el (starttls-open-stream): Add autoload cookie. 2010-09-24 Michael Welsh Duggan (tiny change) ------------------------------------------------------------ revno: 102163 author: David Engster committer: Katsumi Yamaoka branch nick: trunk timestamp: Sun 2010-10-31 09:53:57 +0000 message: nnmairix.el (nnmairix-get-valid-servers): Return list of strings to conform with changes to gnus-completing-read. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-31 00:13:12 +0000 +++ lisp/gnus/ChangeLog 2010-10-31 09:53:57 +0000 @@ -1,3 +1,8 @@ +2010-10-31 David Engster + + * nnmairix.el (nnmairix-get-valid-servers): Return list of strings to + conform with changes to gnus-completing-read. + 2010-10-30 Lars Magne Ingebrigtsen * shr.el (shr-tag-img): Output "*" instead of "[img]". === modified file 'lisp/gnus/nnmairix.el' --- lisp/gnus/nnmairix.el 2010-10-19 22:20:47 +0000 +++ lisp/gnus/nnmairix.el 2010-10-31 09:53:57 +0000 @@ -1357,7 +1357,7 @@ (not (member (car server) gnus-ephemeral-servers)) (not (member (gnus-method-to-server (car server)) occ))) (push - (list mserver) + mserver openedserver))) openedserver)) ------------------------------------------------------------ revno: 102162 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-10-30 17:38:13 -0700 message: * admin/notes/bugtracker: Mention "found". diff: === modified file 'admin/notes/bugtracker' --- admin/notes/bugtracker 2010-06-09 06:53:17 +0000 +++ admin/notes/bugtracker 2010-10-31 00:38:13 +0000 @@ -384,6 +384,14 @@ *** To remove a "fixed" mark: notfixed 123 23.0.60 +*** To make a bug as present in a particular version: +found 123 23.2 +NB if there is no specified "fixed" version, or if there is one and it +is earlier than the found version, this reopens a closed bug. + +The leading "23.1;" that M-x report-emacs-bug adds to bug subjects +automatically sets a found version (if none is explicitly specified). + *** To assign or reassign a bug to a package or list of packages: reassign 1234 emacs ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.