From 5193de49edd84a0e8d74e8289269b6055e14d6b1 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Wed, 11 Jun 2008 14:19:45 +0000 Subject: [PATCH] Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 1214-1215, 1218-1219, 1223, 1226, 1228) - Update from CVS - Merge from gnus--devo--0 2008-06-06 Stefan Monnier * contrib/sendmail.el (mail-interactive): Change default. 2008-06-11 Glenn Morris * lisp/gnus-util.el (x-focus-frame): * lisp/gnus.el (image-size): * lisp/mm-decode.el (image-size): Declare. * lisp/gnus-picon.el (declare-function): Add compat definition. (image-size): Declare. * lisp/gnus-group.el (tool-bar-map): * lisp/gnus-sum.el (tool-bar-map): Define for compiler. * lisp/gnus-ems.el (gnus-x-splash): Check tool-bar-mode is bound. * lisp/nnfolder.el (gnus-intersection): Remove unnecessary autoload. * lisp/gnus-agent.el, lisp/gnus-cache.el, lisp/gnus-ems.el, lisp/gnus-group.el: * lisp/gnus-logic.el, lisp/gnus-msg.el, lisp/gnus-util.el, lisp/gnus.el, lisp/mail-source.el: * lisp/message.el, lisp/mm-decode.el, lisp/mm-encode.el, lisp/mm-view.el, lisp/mml.el: * lisp/mml1991.el, lisp/mml2015.el, lisp/nnfolder.el, lisp/nnheader.el, lisp/nnimap.el: * lisp/nnmail.el, lisp/nnml.el, lisp/nnrss.el, lisp/nntp.el, lisp/nnvirtual.el: * lisp/sieve-manage.el, lisp/spam-report.el, lisp/spam.el: Remove unnecessary eval-and-compile of autoloads. 2008-06-08 Michael Albinus * lisp/auth-source.el: Precise Tramp doc. 2008-06-07 Glenn Morris * lisp/nnmairix.el: Remove unnecessary eval-when-compile. 2008-06-05 Stefan Monnier * lisp/gnus-util.el (gnus-read-shell-command): New function. * lisp/mm-decode.el (mm-pipe-part): * lisp/gnus-art.el (gnus-summary-save-in-pipe): Use it. Revision: emacs@sv.gnu.org/gnus--devo--0--patch-509 --- contrib/ChangeLog | 4 +++ contrib/sendmail.el | 9 +++-- contrib/smtpmail.el | 12 +++---- lisp/ChangeLog | 44 +++++++++++++++++++++-- lisp/ChangeLog.2 | 24 ++++++------- lisp/auth-source.el | 20 +++++------ lisp/gnus-agent.el | 10 +++--- lisp/gnus-art.el | 2 +- lisp/gnus-cache.el | 5 ++- lisp/gnus-ems.el | 9 ++--- lisp/gnus-group.el | 8 ++--- lisp/gnus-logic.el | 3 +- lisp/gnus-msg.el | 3 +- lisp/gnus-picon.el | 6 ++++ lisp/gnus-sum.el | 1 + lisp/gnus-util.el | 31 ++++++++-------- lisp/gnus.el | 8 +++-- lisp/mail-source.el | 39 ++++++++++---------- lisp/message.el | 58 +++++++++++++++--------------- lisp/mm-decode.el | 14 ++++---- lisp/mm-encode.el | 5 ++- lisp/mm-view.el | 15 ++++---- lisp/mml.el | 23 ++++++------ lisp/mml1991.el | 35 +++++++++--------- lisp/mml2015.el | 84 +++++++++++++++++++++----------------------- lisp/netrc.el | 7 ++-- lisp/nnfolder.el | 5 ++- lisp/nnheader.el | 19 +++++----- lisp/nnimap.el | 11 +++--- lisp/nnir.el | 53 ++++++++++++++-------------- lisp/nnmail.el | 5 ++- lisp/nnmairix.el | 5 ++- lisp/nnml.el | 6 ++-- lisp/nnrss.el | 6 ++-- lisp/nntp.el | 17 ++++----- lisp/nnvirtual.el | 5 ++- lisp/sieve-manage.el | 9 +++-- lisp/spam-report.el | 6 ++-- lisp/spam.el | 18 +++++----- lisp/tls.el | 9 +++-- 40 files changed, 338 insertions(+), 315 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 60211e5f7..c5c41de04 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2008-06-06 Stefan Monnier + + * sendmail.el (mail-interactive): Change default. + 2008-06-05 Reiner Steib * README: Remove entry about nnir.el. diff --git a/contrib/sendmail.el b/contrib/sendmail.el index 8109e0201..68096edcb 100644 --- a/contrib/sendmail.el +++ b/contrib/sendmail.el @@ -1,7 +1,8 @@ ;;; sendmail.el --- mail sending commands for Emacs. -*- byte-compile-dynamic: t -*- ;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1998, 2000, -;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +;; Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail @@ -114,7 +115,11 @@ so you can remove or alter the BCC field to override the default." :group 'sendmail) ;;;###autoload -(defcustom mail-interactive nil +(defcustom mail-interactive t + ;; We used to use a default of nil rather than t, but nowadays it is very + ;; common for sendmail to be misconfigured, so one cannot rely on the + ;; bounce message to be delivered anywhere, least of all to the + ;; user's mailbox. "Non-nil means when sending a message wait for and display errors. nil means let mailer mail back a message to report errors." :type 'boolean diff --git a/contrib/smtpmail.el b/contrib/smtpmail.el index 67c7fa14b..1c2cb80a3 100644 --- a/contrib/smtpmail.el +++ b/contrib/smtpmail.el @@ -1,7 +1,7 @@ ;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail -;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, -;; 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008 Free Software Foundation, Inc. ;; Author: Tomoji Kagatani ;; Maintainer: Simon Josefsson @@ -82,9 +82,7 @@ (autoload 'netrc-parse "netrc") (autoload 'netrc-machine "netrc") (autoload 'netrc-get "netrc") - -(eval-and-compile - (autoload 'auth-source-user-or-password "auth-source")) +(autoload 'auth-source-user-or-password "auth-source") ;;; (defgroup smtpmail nil @@ -548,9 +546,9 @@ This is relative to `smtpmail-queue-dir'.") (defun smtpmail-try-auth-methods (process supported-extensions host port) (let* ((mechs (cdr-safe (assoc 'auth supported-extensions))) (mech (car (smtpmail-intersection smtpmail-auth-supported mechs))) - (auth-user (auth-source-user-or-password + (auth-user (auth-source-user-or-password "login" host (or port "smtp"))) - (auth-pass (auth-source-user-or-password + (auth-pass (auth-source-user-or-password "password" host (or port "smtp"))) (cred (if (and auth-user auth-pass) ; try user-auth-* before netrc-* (list host port auth-user auth-pass) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6ab73513f..0ee99cbcf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,35 @@ +2008-06-11 Glenn Morris + + * gnus-util.el (x-focus-frame): + * gnus.el (image-size): + * mm-decode.el (image-size): Declare. + + * gnus-picon.el (declare-function): Add compat definition. + (image-size): Declare. + + * gnus-group.el (tool-bar-map): + * gnus-sum.el (tool-bar-map): Define for compiler. + + * gnus-ems.el (gnus-x-splash): Check tool-bar-mode is bound. + + * nnfolder.el (gnus-intersection): Remove unnecessary autoload. + + * gnus-agent.el, gnus-cache.el, gnus-ems.el, gnus-group.el: + * gnus-logic.el, gnus-msg.el, gnus-util.el, gnus.el, mail-source.el: + * message.el, mm-decode.el, mm-encode.el, mm-view.el, mml.el: + * mml1991.el, mml2015.el, nnfolder.el, nnheader.el, nnimap.el: + * nnmail.el, nnml.el, nnrss.el, nntp.el, nnvirtual.el: + * sieve-manage.el, spam-report.el, spam.el: + Remove unnecessary eval-and-compile of autoloads. + +2008-06-08 Michael Albinus + + * auth-source.el: Precise Tramp doc. + +2008-06-07 Glenn Morris + + * nnmairix.el: Remove unnecessary eval-when-compile. + 2008-06-06 Katsumi Yamaoka * lpath.el: Fbind propertize for XEmacs 21.4. @@ -6,6 +38,12 @@ * nnir.el: Move here from ../contrib. +2008-06-05 Stefan Monnier + + * gnus-util.el (gnus-read-shell-command): New function. + * mm-decode.el (mm-pipe-part): + * gnus-art.el (gnus-summary-save-in-pipe): Use it. + 2008-06-05 Katsumi Yamaoka * message.el (message-disassociate-draft): Revert 2008-03-18 change. @@ -10112,7 +10150,7 @@ * flow-fill.el (fill-flowed-display-column) (fill-flowed-encode-column): Ditto. -2004-09-06 Stefan +2004-09-06 Stefan Monnier * message.el (message-tokenize-header, message-send-mail-with-qmail): Use point-min rather than 1. @@ -11250,13 +11288,13 @@ * gnus-art.el (gnus-emphasis-alist): Removed strikethru; too many false positives. -2004-05-16 Kim Minh Kaplan +2004-05-16 Kim-Minh Kaplan * imap.el (imap-sasl-make-mechanisms): Use sasl. 2004-05-16 Lars Magne Ingebrigtsen - * nneething.el (nneething-file-name): Don't create spurions + * nneething.el (nneething-file-name): Don't create spurious files. * gnus-msg.el (gnus-inews-do-gcc): Ignore read-only groups. diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2 index e31ea993e..e72e733ae 100644 --- a/lisp/ChangeLog.2 +++ b/lisp/ChangeLog.2 @@ -463,7 +463,7 @@ * mml-smime.el (mml-smime-sign): Replace CRLF with LF in OpenSSL output. Reported by Arne J,Ax(Brgensen . -2003-12-07 Lloyd Zusman (tiny change) +2003-12-07 Lloyd Zusman (tiny change) * pgg-gpg.el (pgg-gpg-recipient-arg): Add. (pgg-gpg-encrypt-region): Use it. @@ -911,7 +911,7 @@ * spam.el (spam-spamoracle): Doc change, suggested by Jean-Marc Lasgouttes . -2003-11-04 Norbert Koch (tiny change) +2003-11-04 Norbert Koch (tiny change) * gnus-score.el (gnus-decay-score): Protect against arithmetic errors. @@ -931,7 +931,7 @@ (spam-spamoracle-learn-ham, spam-spamoracle-learn-spam): Change spam-log-processing-to-registry invocations appropriately. -2003-10-31 Derek Atkins (tiny change) +2003-10-31 Derek Atkins (tiny change) * imap.el (imap-kerberos4-open): Ignore output from ATHENA imtest. @@ -1475,7 +1475,7 @@ * gnus.el (gnus-group-charter-alist): Update. -2003-09-10 Eric Knauel +2003-09-10 Eric Knauel * spam-report.el: Use mm-url.el functions for external URL loading when the built-in HTTP GET is insufficient (e.g. proxies are in @@ -1761,7 +1761,7 @@ * gnus-registry.el (gnus-registry-install): Add an initial registry read to the loading when gnus-registry-install is set. -2003-07-26 Mark Thomas (tiny change) +2003-07-26 Mark Thomas (tiny change) * flow-fill.el (fill-flowed): Empty lines separate paragraphs even if the preceding line ends with a soft break. @@ -2428,7 +2428,7 @@ (rfc2047-syntax-table): Fix building table to work in Emacs 22. (rfc2047-unfold-region): Delete unused var `leading'. -2003-05-12 Ville Skytt,Ad(B (tiny change) +2003-05-12 Ville Skytt,Ad(B (tiny change) * pgg.el (pgg-temp-buffer-show-function): Reuse existing visible output window if one is available. @@ -5381,7 +5381,7 @@ * gnus.el: Oort Gnus v0.14 is released. -2003-01-24 Mark Thomas (tiny change) +2003-01-24 Mark Thomas (tiny change) * gnus-sum.el (gnus-summary-prepare-threads): Reset state for %B before beginning. @@ -6421,7 +6421,7 @@ * gnus-art.el (article-wash-html): Clean up. -2003-01-02 pete-temp +2003-01-02 Pete Kazmier * gnus-art.el (gnus-treat-wash-html): New variable. @@ -6666,13 +6666,13 @@ * message.el (message-completion-alist): Added "Mail-Followup-To" and "Mail-Copies-To". -2002-07-21 Jesper harder +2002-07-21 Jesper Harder * gnus-group.el: Add key bindings for gnus-group-sort-groups-by-real-name and gnus-group-sort-selected-groups-by-real-name. -2002-07-21 Jesper harder +2002-07-21 Jesper Harder * gnus.texi (Sorting Groups): Add key bindings for gnus-group-sort-groups-by-real-name and @@ -7910,7 +7910,7 @@ (mml1991-pgg-sign, mml1991-pgg-encrypt): New functions. (mml1991-pgg-encrypt): Fix recipients querying. -2002-09-28 (tiny change) +2002-09-28 David Edmondson * mml2015.el (autoload): Autoload correct files. @@ -8930,7 +8930,7 @@ * sieve-manage.el (sieve-manage-cram-md5-auth): Just send the SASL name (makes it work with recent Cyrus timsieved). -2002-05-20 Jason +2002-05-20 Jason Baker Trivial patch. * gnus-art.el (gnus-request-article-this-buffer): Try diff --git a/lisp/auth-source.el b/lisp/auth-source.el index cd8a196d9..a19327e79 100644 --- a/lisp/auth-source.el +++ b/lisp/auth-source.el @@ -48,14 +48,12 @@ ;;; digest). If you want finer controls, explore the url-auth source ;;; code and variables. -;;; (Tramp patch pending for this!) ;;; For tramp authentication, use: -;;; machine yourmachine.com port tramp login testuser password testpass +;;; machine yourmachine.com port scp login testuser password testpass -;;; Note that the port can be scp or ssh, for example, to match only -;;; those protocols. When you use port = tramp, you match any Tramp -;;; protocol. +;;; Note that the port denotes the Tramp connection method. When you +;;; don't use a port entry, you match any Tramp method. ;;; Code: @@ -88,7 +86,7 @@ (defconst auth-source-protocols-customize (mapcar (lambda (a) (let ((p (car-safe a))) - (list 'const + (list 'const :tag (upcase (symbol-name p)) p))) auth-source-protocols)) @@ -154,23 +152,23 @@ Returns fallback choices (where PROTOCOL or HOST are nil) with FALLBACK t." (defun auth-source-user-or-password (mode host protocol) "Find user or password (from the string MODE) matching HOST and PROTOCOL." - (gnus-message 9 + (gnus-message 9 "auth-source-user-or-password: get %s for %s (%s)" mode host protocol) (let (found) (dolist (choice (auth-source-pick host protocol)) - (setq found (netrc-machine-user-or-password + (setq found (netrc-machine-user-or-password mode (plist-get choice :source) (list host) (list (format "%s" protocol)) (auth-source-protocol-defaults protocol))) (when found - (gnus-message 9 + (gnus-message 9 "auth-source-user-or-password: found %s=%s for %s (%s)" - mode + mode ;; don't show the password - (if (equal mode "password") "SECRET" found) + (if (equal mode "password") "SECRET" found) host protocol) (return found))))) diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index 4b828032f..545dc595f 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -1,7 +1,7 @@ ;;; gnus-agent.el --- unplugged support for Gnus -;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, +;; 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; This file is part of GNU Emacs. @@ -37,10 +37,8 @@ (require 'timer)) (require 'cl)) -(eval-and-compile - (autoload 'gnus-server-update-server "gnus-srvr") - (autoload 'gnus-agent-customize-category "gnus-cus") -) +(autoload 'gnus-server-update-server "gnus-srvr") +(autoload 'gnus-agent-customize-category "gnus-cus") (defcustom gnus-agent-directory (nnheader-concat gnus-directory "agent/") "Where the Gnus agent will store its files." diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index c6eeb1af6..2dc95ea49 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -3944,7 +3944,7 @@ The directory to save in defaults to `gnus-article-save-directory'." gnus-last-shell-command) ((stringp command) command) - (t (read-string + (t (gnus-read-shell-command (format "Shell command on %s: " (if (and gnus-number-of-articles-to-be-saved diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el index 7ed30944b..0c7ca3038 100644 --- a/lisp/gnus-cache.el +++ b/lisp/gnus-cache.el @@ -96,9 +96,8 @@ it's not cached." (declare-function nnvirtual-find-group-art "nnvirtual" (group article)) -(eval-and-compile - (autoload 'nnml-generate-nov-databases-directory "nnml") - (autoload 'nnvirtual-find-group-art "nnvirtual")) +(autoload 'nnml-generate-nov-databases-directory "nnml") +(autoload 'nnvirtual-find-group-art "nnvirtual") diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el index ef557c762..97e209c18 100644 --- a/lisp/gnus-ems.el +++ b/lisp/gnus-ems.el @@ -42,10 +42,10 @@ (eval-and-compile (autoload 'gnus-xmas-define "gnus-xmas") - (autoload 'gnus-xmas-redefine "gnus-xmas") - (autoload 'gnus-get-buffer-create "gnus") - (autoload 'nnheader-find-etc-directory "nnheader")) + (autoload 'gnus-xmas-redefine "gnus-xmas")) +(autoload 'gnus-get-buffer-create "gnus") +(autoload 'nnheader-find-etc-directory "nnheader") (autoload 'smiley-region "smiley") (defun gnus-kill-all-overlays () @@ -214,7 +214,8 @@ (car sbars) (/ (or (car fringes) 0) fcw)) yoffset (cadr (window-edges)) - top (max 0 (- (* (max (if (and tool-bar-mode + top (max 0 (- (* (max (if (and (boundp 'tool-bar-mode) + tool-bar-mode (not (featurep 'gtk)) (eq (frame-first-window) (selected-window))) diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index 0e414312d..947ed6d0f 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -1108,6 +1108,7 @@ See `gmm-tool-bar-from-list' for the format of the list." :group 'gnus-group) (defvar image-load-path) +(defvar tool-bar-map) (defun gnus-group-make-tool-bar (&optional force) "Make a group mode tool bar from `gnus-group-tool-bar'. @@ -3230,10 +3231,9 @@ score file entries for articles to include in the group." 'summary 'group))) (error "Couldn't enter %s" dir)))) -(eval-and-compile - (autoload 'nnimap-expunge "nnimap") - (autoload 'nnimap-acl-get "nnimap") - (autoload 'nnimap-acl-edit "nnimap")) +(autoload 'nnimap-expunge "nnimap") +(autoload 'nnimap-acl-get "nnimap") +(autoload 'nnimap-acl-edit "nnimap") (defun gnus-group-nnimap-expunge (group) "Expunge deleted articles in current nnimap GROUP." diff --git a/lisp/gnus-logic.el b/lisp/gnus-logic.el index c2b0030c0..0f93173d5 100644 --- a/lisp/gnus-logic.el +++ b/lisp/gnus-logic.el @@ -53,8 +53,7 @@ ("body" nil gnus-advanced-body) ("all" nil gnus-advanced-body))) -(eval-and-compile - (autoload 'parse-time-string "parse-time")) +(autoload 'parse-time-string "parse-time") (defun gnus-score-advanced (rule &optional trace) "Apply advanced scoring RULE to all the articles in the current group." diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index 29e804c41..77210e95b 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -333,8 +333,7 @@ Please describe the bug in annoying, painstaking detail. Thank you for your help in stamping out bugs. ") -(eval-and-compile - (autoload 'gnus-uu-post-news "gnus-uu" nil t)) +(autoload 'gnus-uu-post-news "gnus-uu" nil t) ;;; diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el index e1ee6b784..c462345fc 100644 --- a/lisp/gnus-picon.el +++ b/lisp/gnus-picon.el @@ -38,6 +38,10 @@ ;; ;;; Code: +;; For Emacs < 22.2. +(eval-and-compile + (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))) + (eval-when-compile (require 'cl)) (require 'gnus) @@ -165,6 +169,8 @@ replacement is added." ;;; Functions that does picon transformations: +(declare-function image-size "image.c" (spec &optional pixels frame)) + (defun gnus-picon-transform-address (header category) (gnus-with-article-headers (let ((addresses diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 7833ca5ab..276b20501 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -2889,6 +2889,7 @@ See `gmm-tool-bar-from-list' for the format of the list." :group 'gnus-summary) (defvar image-load-path) +(defvar tool-bar-map) (defun gnus-summary-make-tool-bar (&optional force) "Make a summary mode tool bar from `gnus-summary-tool-bar'. diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el index a3275224e..110e2e038 100644 --- a/lisp/gnus-util.el +++ b/lisp/gnus-util.el @@ -50,19 +50,18 @@ (require 'time-date) (require 'netrc) -(eval-and-compile - (autoload 'message-fetch-field "message") - (autoload 'gnus-get-buffer-window "gnus-win") - (autoload 'rmail-insert-rmail-file-header "rmail") - (autoload 'rmail-count-new-messages "rmail") - (autoload 'rmail-show-message "rmail") - (autoload 'nnheader-narrow-to-headers "nnheader") - (autoload 'nnheader-replace-chars-in-string "nnheader")) +(autoload 'message-fetch-field "message") +(autoload 'gnus-get-buffer-window "gnus-win") +(autoload 'rmail-insert-rmail-file-header "rmail") +(autoload 'rmail-count-new-messages "rmail") +(autoload 'rmail-show-message "rmail") +(autoload 'nnheader-narrow-to-headers "nnheader") +(autoload 'nnheader-replace-chars-in-string "nnheader") (eval-and-compile (cond ;; Prefer `replace-regexp-in-string' (present in Emacs, XEmacs 21.5, - ;; SXEmacs 22.1.4) over `replace-in-string'. The later leads to inf-loops + ;; SXEmacs 22.1.4) over `replace-in-string'. The latter leads to inf-loops ;; on empty matches: ;; (replace-in-string "foo" "/*$" "/") ;; (replace-in-string "xe" "\\(x\\)?" "") @@ -957,10 +956,10 @@ If there's no subdirectory, delete DIRECTORY as well." (overlays-at pos))))))) ;;; Protected and atomic operations. dmoore@ucsd.edu 21.11.1996 -;;; The primary idea here is to try to protect internal datastructures -;;; from becoming corrupted when the user hits C-g, or if a hook or -;;; similar blows up. Often in Gnus multiple tables/lists need to be -;;; updated at the same time, or information can be lost. +;; The primary idea here is to try to protect internal datastructures +;; from becoming corrupted when the user hits C-g, or if a hook or +;; similar blows up. Often in Gnus multiple tables/lists need to be +;; updated at the same time, or information can be lost. (defvar gnus-atomic-be-safe t "If t, certain operations will be protected from interruption by C-g.") @@ -979,7 +978,7 @@ variables and then do only the assignment atomically." (put 'gnus-atomic-progn 'lisp-indent-function 0) (defmacro gnus-atomic-progn-assign (protect &rest forms) - "Evaluate FORMS, but insure that the variables listed in PROTECT + "Evaluate FORMS, but ensure that the variables listed in PROTECT are not changed if anything in FORMS signals an error or otherwise non-locally exits. The variables listed in PROTECT are updated atomically. It is safe to use gnus-atomic-progn-assign with long computations. @@ -1592,6 +1591,7 @@ CHOICE is a list of the choice char and help message at IDX." (kill-buffer buf)) tchar)) +(declare-function x-focus-frame "xfns.c" (frame)) (declare-function w32-focus-frame "../term/w32-win" (frame)) (defun gnus-select-frame-set-input-focus (frame) @@ -1798,6 +1798,9 @@ is allowed once again. (Immediately, if `inhibit-quit' is nil.)" ;; that intends to handle the quit signal next time. (eval '(ignore nil)))))) +(defalias 'gnus-read-shell-command + (if (fboundp 'read-shell-command) 'read-shell-command 'read-string)) + (provide 'gnus-util) ;; arch-tag: f94991af-d32b-4c97-8c26-ca12a934de49 diff --git a/lisp/gnus.el b/lisp/gnus.el index b549f4b2e..8c7559b4a 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -1,7 +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 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +;; Free Software Foundation, Inc. ;; Author: Masanobu UMEDA ;; Lars Magne Ingebrigtsen @@ -917,8 +918,7 @@ be set in `.emacs' instead." (defvar gnus-group-buffer "*Group*") -(eval-and-compile - (autoload 'gnus-play-jingle "gnus-audio")) +(autoload 'gnus-play-jingle "gnus-audio") (defface gnus-splash '((((class color) @@ -993,6 +993,8 @@ be set in `.emacs' instead." (cdr (assq gnus-logo-color-style gnus-logo-color-alist)) "Colors used for the Gnus logo.") +(declare-function image-size "image.c" (spec &optional pixels frame)) + (defun gnus-group-startup-message (&optional x y) "Insert startup message in current buffer." ;; Insert the message. diff --git a/lisp/mail-source.el b/lisp/mail-source.el index 3ff83514a..c6c8d6b23 100644 --- a/lisp/mail-source.el +++ b/lisp/mail-source.el @@ -33,11 +33,10 @@ (eval-when-compile (require 'cl) (require 'imap)) -(eval-and-compile - (autoload 'auth-source-user-or-password "auth-source") - (autoload 'pop3-movemail "pop3") - (autoload 'pop3-get-message-count "pop3") - (autoload 'nnheader-cancel-timer "nnheader")) +(autoload 'auth-source-user-or-password "auth-source") +(autoload 'pop3-movemail "pop3") +(autoload 'pop3-get-message-count "pop3") +(autoload 'nnheader-cancel-timer "nnheader") (require 'mm-util) (require 'message) ;; for `message-directory' @@ -1023,20 +1022,19 @@ This only works when `display-time' is enabled." (mail-source-delete-crash-box))))) found))) -(eval-and-compile - (autoload 'imap-open "imap") - (autoload 'imap-authenticate "imap") - (autoload 'imap-mailbox-select "imap") - (autoload 'imap-mailbox-unselect "imap") - (autoload 'imap-mailbox-close "imap") - (autoload 'imap-search "imap") - (autoload 'imap-fetch "imap") - (autoload 'imap-close "imap") - (autoload 'imap-error-text "imap") - (autoload 'imap-message-flags-add "imap") - (autoload 'imap-list-to-message-set "imap") - (autoload 'imap-range-to-message-set "imap") - (autoload 'nnheader-ms-strip-cr "nnheader")) +(autoload 'imap-open "imap") +(autoload 'imap-authenticate "imap") +(autoload 'imap-mailbox-select "imap") +(autoload 'imap-mailbox-unselect "imap") +(autoload 'imap-mailbox-close "imap") +(autoload 'imap-search "imap") +(autoload 'imap-fetch "imap") +(autoload 'imap-close "imap") +(autoload 'imap-error-text "imap") +(autoload 'imap-message-flags-add "imap") +(autoload 'imap-list-to-message-set "imap") +(autoload 'imap-range-to-message-set "imap") +(autoload 'nnheader-ms-strip-cr "nnheader") (autoload 'gnus-compress-sequence "gnus-range") @@ -1116,8 +1114,7 @@ This only works when `display-time' is enabled." ?s server ?P port ?u user)) found))) -(eval-and-compile - (autoload 'webmail-fetch "webmail")) +(autoload 'webmail-fetch "webmail") (defun mail-source-fetch-webmail (source callback) "Fetch for webmail source." diff --git a/lisp/message.el b/lisp/message.el index a1782a86e..8ccce9665 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -1792,33 +1792,32 @@ You must have the \"hashcash\" binary installed, see `hashcash-path'." :group 'message-headers :type 'regexp) -(eval-and-compile - (autoload 'gnus-alive-p "gnus-util") - (autoload 'gnus-delay-article "gnus-delay") - (autoload 'gnus-extract-address-components "gnus-util") - (autoload 'gnus-find-method-for-group "gnus") - (autoload 'gnus-group-decoded-name "gnus-group") - (autoload 'gnus-group-name-charset "gnus-group") - (autoload 'gnus-group-name-decode "gnus-group") - (autoload 'gnus-groups-from-server "gnus") - (autoload 'gnus-make-local-hook "gnus-util") - (autoload 'gnus-open-server "gnus-int") - (autoload 'gnus-output-to-mail "gnus-util") - (autoload 'gnus-output-to-rmail "gnus-util") - (autoload 'gnus-request-post "gnus-int") - (autoload 'gnus-select-frame-set-input-focus "gnus-util") - (autoload 'gnus-server-string "gnus") - (autoload 'idna-to-ascii "idna") - (autoload 'message-setup-toolbar "messagexmas") - (autoload 'mh-new-draft-name "mh-comp") - (autoload 'mh-send-letter "mh-comp") - (autoload 'nndraft-request-associate-buffer "nndraft") - (autoload 'nndraft-request-expire-articles "nndraft") - (autoload 'nnvirtual-find-group-art "nnvirtual") - (autoload 'rmail-dont-reply-to "mail-utils") - (autoload 'rmail-msg-is-pruned "rmail") - (autoload 'rmail-msg-restore-non-pruned-header "rmail") - (autoload 'rmail-output "rmailout")) +(autoload 'gnus-alive-p "gnus-util") +(autoload 'gnus-delay-article "gnus-delay") +(autoload 'gnus-extract-address-components "gnus-util") +(autoload 'gnus-find-method-for-group "gnus") +(autoload 'gnus-group-decoded-name "gnus-group") +(autoload 'gnus-group-name-charset "gnus-group") +(autoload 'gnus-group-name-decode "gnus-group") +(autoload 'gnus-groups-from-server "gnus") +(autoload 'gnus-make-local-hook "gnus-util") +(autoload 'gnus-open-server "gnus-int") +(autoload 'gnus-output-to-mail "gnus-util") +(autoload 'gnus-output-to-rmail "gnus-util") +(autoload 'gnus-request-post "gnus-int") +(autoload 'gnus-select-frame-set-input-focus "gnus-util") +(autoload 'gnus-server-string "gnus") +(autoload 'idna-to-ascii "idna") +(autoload 'message-setup-toolbar "messagexmas") +(autoload 'mh-new-draft-name "mh-comp") +(autoload 'mh-send-letter "mh-comp") +(autoload 'nndraft-request-associate-buffer "nndraft") +(autoload 'nndraft-request-expire-articles "nndraft") +(autoload 'nnvirtual-find-group-art "nnvirtual") +(autoload 'rmail-dont-reply-to "mail-utils") +(autoload 'rmail-msg-is-pruned "rmail") +(autoload 'rmail-msg-restore-non-pruned-header "rmail") +(autoload 'rmail-output "rmailout") @@ -7107,9 +7106,8 @@ Optional DIGEST will use digest to forward." (message-forward-make-body-digest-mime forward-buffer) (message-forward-make-body-digest-plain forward-buffer))) -(eval-and-compile - (autoload 'mm-uu-dissect-text-parts "mm-uu") - (autoload 'mm-uu-dissect "mm-uu")) +(autoload 'mm-uu-dissect-text-parts "mm-uu") +(autoload 'mm-uu-dissect "mm-uu") (defun message-signed-or-encrypted-p (&optional dont-emulate-mime handles) "Say whether the current buffer contains signed or encrypted message. diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el index f9d8311c0..721e40822 100644 --- a/lisp/mm-decode.el +++ b/lisp/mm-decode.el @@ -35,11 +35,10 @@ (eval-when-compile (require 'cl) (require 'term)) -(eval-and-compile - (autoload 'mm-inline-partial "mm-partial") - (autoload 'mm-inline-external-body "mm-extern") - (autoload 'mm-extern-cache-contents "mm-extern") - (autoload 'mm-insert-inline "mm-view")) +(autoload 'mm-inline-partial "mm-partial") +(autoload 'mm-inline-external-body "mm-extern") +(autoload 'mm-extern-cache-contents "mm-extern") +(autoload 'mm-insert-inline "mm-view") (defvar gnus-current-window-configuration) @@ -1295,7 +1294,8 @@ text/\\(\\sw+\\)\\(?:\;\\s-*charset=\\(.+?\\)\\)?[\"'][^>]*>" nil t) "Pipe HANDLE to a process." (let* ((name (mail-content-type-get (mm-handle-type handle) 'name)) (command - (read-string "Shell command on MIME part: " mm-last-shell-command))) + (gnus-read-shell-command + "Shell command on MIME part: " mm-last-shell-command))) (mm-with-unibyte-buffer (mm-insert-part handle) (mm-add-meta-html-tag handle) @@ -1437,6 +1437,8 @@ be determined." (intern type)) :data (buffer-string))))))) +(declare-function image-size "image.c" (spec &optional pixels frame)) + (defun mm-image-fit-p (handle) "Say whether the image in HANDLE will fit the current window." (let ((image (mm-get-image handle))) diff --git a/lisp/mm-encode.el b/lisp/mm-encode.el index 750240d89..e3b3bcd38 100644 --- a/lisp/mm-encode.el +++ b/lisp/mm-encode.el @@ -27,9 +27,8 @@ (eval-when-compile (require 'cl)) (require 'mail-parse) (require 'mailcap) -(eval-and-compile - (autoload 'mm-body-7-or-8 "mm-bodies") - (autoload 'mm-long-lines-p "mm-bodies")) +(autoload 'mm-body-7-or-8 "mm-bodies") +(autoload 'mm-long-lines-p "mm-bodies") (defcustom mm-content-transfer-encoding-defaults '(("text/x-patch" 8bit) diff --git a/lisp/mm-view.el b/lisp/mm-view.el index 0eba5c937..bfadd4720 100644 --- a/lisp/mm-view.el +++ b/lisp/mm-view.el @@ -1,7 +1,7 @@ ;;; mm-view.el --- functions for viewing MIME objects -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; This file is part of GNU Emacs. @@ -31,12 +31,11 @@ (require 'mm-decode) (require 'smime) -(eval-and-compile - (autoload 'gnus-article-prepare-display "gnus-art") - (autoload 'vcard-parse-string "vcard") - (autoload 'vcard-format-string "vcard") - (autoload 'fill-flowed "flow-fill") - (autoload 'html2text "html2text" nil t)) +(autoload 'gnus-article-prepare-display "gnus-art") +(autoload 'vcard-parse-string "vcard") +(autoload 'vcard-format-string "vcard") +(autoload 'fill-flowed "flow-fill") +(autoload 'html2text "html2text" nil t) (defvar gnus-article-mime-handles) (defvar gnus-newsgroup-charset) diff --git a/lisp/mml.el b/lisp/mml.el index 7490a002d..e3ab803dd 100644 --- a/lisp/mml.el +++ b/lisp/mml.el @@ -1,7 +1,7 @@ ;;; mml.el --- A package for parsing and validating MML documents -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; This file is part of GNU Emacs. @@ -34,16 +34,15 @@ (require 'mml-sec) (eval-when-compile (require 'cl)) -(eval-and-compile - (autoload 'message-make-message-id "message") - (autoload 'gnus-setup-posting-charset "gnus-msg") - (autoload 'gnus-make-local-hook "gnus-util") - (autoload 'message-fetch-field "message") - (autoload 'message-mark-active-p "message") - (autoload 'message-info "message") - (autoload 'fill-flowed-encode "flow-fill") - (autoload 'message-posting-charset "message") - (autoload 'dnd-get-local-file-name "dnd")) +(autoload 'message-make-message-id "message") +(autoload 'gnus-setup-posting-charset "gnus-msg") +(autoload 'gnus-make-local-hook "gnus-util") +(autoload 'message-fetch-field "message") +(autoload 'message-mark-active-p "message") +(autoload 'message-info "message") +(autoload 'fill-flowed-encode "flow-fill") +(autoload 'message-posting-charset "message") +(autoload 'dnd-get-local-file-name "dnd") (autoload 'message-options-set "message") (autoload 'message-narrow-to-head "message") diff --git a/lisp/mml1991.el b/lisp/mml1991.el index ca02f1b37..17793b2a4 100644 --- a/lisp/mml1991.el +++ b/lisp/mml1991.el @@ -1,7 +1,7 @@ ;;; mml1991.el --- Old PGP message format (RFC 1991) support for MML -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008 Free Software Foundation, Inc. ;; Author: Sascha Ldecke , ;; Simon Josefsson (Mailcrypt interface, Gnus glue) @@ -79,8 +79,7 @@ Whether the passphrase is cached at all is controlled by ;;; mailcrypt wrapper -(eval-and-compile - (autoload 'mc-sign-generic "mc-toplev")) +(autoload 'mc-sign-generic "mc-toplev") (defvar mml1991-decrypt-function 'mailcrypt-decrypt) (defvar mml1991-verify-function 'mailcrypt-verify) @@ -168,8 +167,7 @@ Whether the passphrase is cached at all is controlled by ;;; gpg wrapper -(eval-and-compile - (autoload 'gpg-sign-cleartext "gpg")) +(autoload 'gpg-sign-cleartext "gpg") (declare-function gpg-sign-encrypt "ext:gpg" (plaintext ciphertext result recipients &optional @@ -332,19 +330,18 @@ Whether the passphrase is cached at all is controlled by (defvar epg-user-id-alist) (defvar password-cache-expiry) -(eval-and-compile - (autoload 'epg-make-context "epg") - (autoload 'epg-passphrase-callback-function "epg") - (autoload 'epa-select-keys "epa") - (autoload 'epg-list-keys "epg") - (autoload 'epg-context-set-armor "epg") - (autoload 'epg-context-set-textmode "epg") - (autoload 'epg-context-set-signers "epg") - (autoload 'epg-context-set-passphrase-callback "epg") - (autoload 'epg-sign-string "epg") - (autoload 'epg-encrypt-string "epg") - (autoload 'epg-configuration "epg-config") - (autoload 'epg-expand-group "epg-config")) +(autoload 'epg-make-context "epg") +(autoload 'epg-passphrase-callback-function "epg") +(autoload 'epa-select-keys "epa") +(autoload 'epg-list-keys "epg") +(autoload 'epg-context-set-armor "epg") +(autoload 'epg-context-set-textmode "epg") +(autoload 'epg-context-set-signers "epg") +(autoload 'epg-context-set-passphrase-callback "epg") +(autoload 'epg-sign-string "epg") +(autoload 'epg-encrypt-string "epg") +(autoload 'epg-configuration "epg-config") +(autoload 'epg-expand-group "epg-config") (defvar mml1991-epg-secret-key-id-list nil) diff --git a/lisp/mml2015.el b/lisp/mml2015.el index 76b865664..83b5dd6bd 100644 --- a/lisp/mml2015.el +++ b/lisp/mml2015.el @@ -1,7 +1,7 @@ ;;; mml2015.el --- MIME Security with Pretty Good Privacy (PGP) -;; Copyright (C) 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: PGP MIME MML @@ -182,13 +182,12 @@ Whether the passphrase is cached at all is controlled by ;;; mailcrypt wrapper -(eval-and-compile - (autoload 'mailcrypt-decrypt "mailcrypt") - (autoload 'mailcrypt-verify "mailcrypt") - (autoload 'mc-pgp-always-sign "mailcrypt") - (autoload 'mc-encrypt-generic "mc-toplev") - (autoload 'mc-cleanup-recipient-headers "mc-toplev") - (autoload 'mc-sign-generic "mc-toplev")) +(autoload 'mailcrypt-decrypt "mailcrypt") +(autoload 'mailcrypt-verify "mailcrypt") +(autoload 'mc-pgp-always-sign "mailcrypt") +(autoload 'mc-encrypt-generic "mc-toplev") +(autoload 'mc-cleanup-recipient-headers "mc-toplev") +(autoload 'mc-sign-generic "mc-toplev") (defvar mc-default-scheme) (defvar mc-schemes) @@ -453,14 +452,13 @@ Whether the passphrase is cached at all is controlled by ;;; gpg wrapper -(eval-and-compile - (autoload 'gpg-decrypt "gpg") - (autoload 'gpg-verify "gpg") - (autoload 'gpg-verify-cleartext "gpg") - (autoload 'gpg-sign-detached "gpg") - (autoload 'gpg-sign-encrypt "gpg") - (autoload 'gpg-encrypt "gpg") - (autoload 'gpg-passphrase-read "gpg")) +(autoload 'gpg-decrypt "gpg") +(autoload 'gpg-verify "gpg") +(autoload 'gpg-verify-cleartext "gpg") +(autoload 'gpg-sign-detached "gpg") +(autoload 'gpg-sign-encrypt "gpg") +(autoload 'gpg-encrypt "gpg") +(autoload 'gpg-passphrase-read "gpg") (defun mml2015-gpg-passphrase () (or (message-options-get 'gpg-passphrase) @@ -731,12 +729,11 @@ Whether the passphrase is cached at all is controlled by (defvar pgg-errors-buffer) (defvar pgg-output-buffer) -(eval-and-compile - (autoload 'pgg-decrypt-region "pgg") - (autoload 'pgg-verify-region "pgg") - (autoload 'pgg-sign-region "pgg") - (autoload 'pgg-encrypt-region "pgg") - (autoload 'pgg-parse-armor "pgg-parse")) +(autoload 'pgg-decrypt-region "pgg") +(autoload 'pgg-verify-region "pgg") +(autoload 'pgg-sign-region "pgg") +(autoload 'pgg-encrypt-region "pgg") +(autoload 'pgg-parse-armor "pgg-parse") (defun mml2015-pgg-decrypt (handle ctl) (catch 'error @@ -968,27 +965,26 @@ Whether the passphrase is cached at all is controlled by (defvar epg-digest-algorithm-alist) (defvar inhibit-redisplay) -(eval-and-compile - (autoload 'epg-make-context "epg") - (autoload 'epg-context-set-armor "epg") - (autoload 'epg-context-set-textmode "epg") - (autoload 'epg-context-set-signers "epg") - (autoload 'epg-context-result-for "epg") - (autoload 'epg-new-signature-digest-algorithm "epg") - (autoload 'epg-verify-result-to-string "epg") - (autoload 'epg-list-keys "epg") - (autoload 'epg-decrypt-string "epg") - (autoload 'epg-verify-string "epg") - (autoload 'epg-sign-string "epg") - (autoload 'epg-encrypt-string "epg") - (autoload 'epg-passphrase-callback-function "epg") - (autoload 'epg-context-set-passphrase-callback "epg") - (autoload 'epg-key-sub-key-list "epg") - (autoload 'epg-sub-key-capability "epg") - (autoload 'epg-sub-key-validity "epg") - (autoload 'epg-configuration "epg-config") - (autoload 'epg-expand-group "epg-config") - (autoload 'epa-select-keys "epa")) +(autoload 'epg-make-context "epg") +(autoload 'epg-context-set-armor "epg") +(autoload 'epg-context-set-textmode "epg") +(autoload 'epg-context-set-signers "epg") +(autoload 'epg-context-result-for "epg") +(autoload 'epg-new-signature-digest-algorithm "epg") +(autoload 'epg-verify-result-to-string "epg") +(autoload 'epg-list-keys "epg") +(autoload 'epg-decrypt-string "epg") +(autoload 'epg-verify-string "epg") +(autoload 'epg-sign-string "epg") +(autoload 'epg-encrypt-string "epg") +(autoload 'epg-passphrase-callback-function "epg") +(autoload 'epg-context-set-passphrase-callback "epg") +(autoload 'epg-key-sub-key-list "epg") +(autoload 'epg-sub-key-capability "epg") +(autoload 'epg-sub-key-validity "epg") +(autoload 'epg-configuration "epg-config") +(autoload 'epg-expand-group "epg-config") +(autoload 'epa-select-keys "epa") (defvar password-cache-expiry) diff --git a/lisp/netrc.el b/lisp/netrc.el index ae06af872..ca219defa 100644 --- a/lisp/netrc.el +++ b/lisp/netrc.el @@ -34,15 +34,14 @@ ;;; ;; use encrypt if loaded (encrypt-file-alist has to be set as well) -(eval-and-compile - (autoload 'encrypt-find-model "encrypt") - (autoload 'encrypt-insert-file-contents "encrypt")) +(autoload 'encrypt-find-model "encrypt") +(autoload 'encrypt-insert-file-contents "encrypt") (defalias 'netrc-point-at-eol (if (fboundp 'point-at-eol) 'point-at-eol 'line-end-position)) +(defvar encrypt-file-alist) (eval-when-compile - (defvar encrypt-file-alist) ;; This is unnecessary in the compiled version as it is a macro. (if (fboundp 'bound-and-true-p) (defalias 'netrc-bound-and-true-p 'bound-and-true-p) diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el index bafa475ea..36e057148 100644 --- a/lisp/nnfolder.el +++ b/lisp/nnfolder.el @@ -42,9 +42,8 @@ (require 'gnus-util) (require 'gnus-range) -(eval-and-compile - (autoload 'gnus-article-unpropagatable-p "gnus-sum") - (autoload 'gnus-intersection "gnus-range")) +;; FIXME not explicitly used in this file. +(autoload 'gnus-article-unpropagatable-p "gnus-sum") (nnoo-declare nnfolder) diff --git a/lisp/nnheader.el b/lisp/nnheader.el index dd0dc4ad3..349c452b8 100644 --- a/lisp/nnheader.el +++ b/lisp/nnheader.el @@ -41,11 +41,11 @@ (require 'mail-utils) (require 'mm-util) (require 'gnus-util) -(eval-and-compile - (autoload 'gnus-sorted-intersection "gnus-range") - (autoload 'gnus-intersection "gnus-range") - (autoload 'gnus-sorted-complement "gnus-range") - (autoload 'gnus-sorted-difference "gnus-range")) +;; FIXME none of these are used explicitly in this file. +(autoload 'gnus-sorted-intersection "gnus-range") +(autoload 'gnus-intersection "gnus-range") +(autoload 'gnus-sorted-complement "gnus-range") +(autoload 'gnus-sorted-difference "gnus-range") (defcustom gnus-verbose-backends 7 "Integer that says how verbose the Gnus backends should be. @@ -112,11 +112,10 @@ on your system, you could say something like: (string-to-char (substring (file-name-as-directory ".") -1)) "*A character used to a directory separator.") -(eval-and-compile - (autoload 'nnmail-message-id "nnmail") - (autoload 'mail-position-on-field "sendmail") - (autoload 'message-remove-header "message") - (autoload 'gnus-buffer-live-p "gnus-util")) +(autoload 'nnmail-message-id "nnmail") +(autoload 'mail-position-on-field "sendmail") +(autoload 'message-remove-header "message") +(autoload 'gnus-buffer-live-p "gnus-util") ;;; Header access macros. diff --git a/lisp/nnimap.el b/lisp/nnimap.el index ceaf5107d..9d4966246 100644 --- a/lisp/nnimap.el +++ b/lisp/nnimap.el @@ -1,7 +1,7 @@ ;;; nnimap.el --- imap backend for Gnus -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Jim Radford @@ -71,8 +71,7 @@ (eval-when-compile (require 'cl)) -(eval-and-compile - (autoload 'auth-source-user-or-password "auth-source")) +(autoload 'auth-source-user-or-password "auth-source") (nnoo-declare nnimap) @@ -799,7 +798,7 @@ If EXAMINE is non-nil the group is selected read-only." (port (if nnimap-server-port (int-to-string nnimap-server-port) "imap")) - (user (or + (user (or (auth-source-user-or-password "login" server port) ; this is preferred to netrc-* (netrc-machine-user-or-password "login" @@ -809,7 +808,7 @@ If EXAMINE is non-nil the group is selected read-only." nnimap-address)) (list port) (list "imap" "imaps" "143" "993")))) - (passwd (or + (passwd (or (auth-source-user-or-password "password" server port) ; this is preferred to netrc-* (netrc-machine-user-or-password "password" diff --git a/lisp/nnir.el b/lisp/nnir.el index df83f18c8..e57b7d80c 100644 --- a/lisp/nnir.el +++ b/lisp/nnir.el @@ -1,7 +1,7 @@ ;;; nnir.el --- search mail with various search engines -*- coding: iso-8859-1 -*- -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008 Free Software Foundation, Inc. ;; Author: Kai Großjohann ;; Swish-e and Swish++ backends by: @@ -11,6 +11,24 @@ ;; IMAP search improved by Daniel Pittman . ;; nnmaildir support for Swish++ and Namazu backends by: ;; Justus Piater Piater.name> +;; Keywords: news mail searching ir + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: ;; TODO: Documentation in the Gnus manual @@ -32,26 +50,6 @@ ;; `gnus-group-make-nnir-group' might be described in (info ;; "(gnus)Foreign Groups") as well. -;; Keywords: news mail searching ir - -;; This file is part of GNU Emacs. - -;; This is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 3, or (at your option) -;; any later version. - -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. - -;;; Commentary: ;; The most recent version of this can always be fetched from the Gnus ;; CVS repository. See http://www.gnus.org/ for more information. @@ -366,7 +364,7 @@ `((wais nnir-run-waissearch ()) (imap nnir-run-imap - ((criteria + ((criteria "Search in: " ; Prompt ,nnir-imap-search-arguments ; alist for completing nil ; no filtering @@ -842,7 +840,7 @@ and show thread that contains this article." (defmacro nnir-add-result (dirnam artno score prefix server artlist) - "Ask `nnir-compose-result' to construct a result vector, + "Ask `nnir-compose-result' to construct a result vector, and if it is non-nil, add it to artlist." `(let ((result (nnir-compose-result ,dirnam ,artno ,score ,prefix ,server))) (when (not (null result)) @@ -977,7 +975,7 @@ This implements a little language designed to return the expected results to an arbitrary query string to the end user. The search is always case-insensitive, as defined by RFC2060, and supports -the following features (inspired by the Google search input language): +the following features (inspired by the Google search input language): Automatic \"and\" queries If you specify multiple words then they will be treated as an \"and\" @@ -1138,7 +1136,7 @@ returning the one at the supplied position." "Are we at the end of input?" (skip-chars-forward "[[:blank:]]") (looking-at "$")) - + ;; Swish++ interface. ;; -cc- Todo @@ -1663,4 +1661,5 @@ The Gnus backend/server information is added." ;; The end. (provide 'nnir) -;;; arch-tag: 9b3fecf8-4397-4bbb-bf3c-6ac3cbbc6664 +;; arch-tag: 9b3fecf8-4397-4bbb-bf3c-6ac3cbbc6664 +;;; nnir.el ends here diff --git a/lisp/nnmail.el b/lisp/nnmail.el index 85f22c17a..f0419c7bf 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -39,9 +39,8 @@ (require 'mm-util) (require 'gnus-int) -(eval-and-compile - (autoload 'gnus-add-buffer "gnus") - (autoload 'gnus-kill-buffer "gnus")) +(autoload 'gnus-add-buffer "gnus") +(autoload 'gnus-kill-buffer "gnus") (defgroup nnmail nil "Reading mail with Gnus." diff --git a/lisp/nnmairix.el b/lisp/nnmairix.el index 33d164267..13c862365 100644 --- a/lisp/nnmairix.el +++ b/lisp/nnmairix.el @@ -851,9 +851,8 @@ with `nnmairix-mairix-update-options'." 'nnmairix-sentinel-mairix-update-finished)))))) ;; Silence byte-compiler. -(eval-when-compile - (defvar gnus-registry-install) - (autoload 'gnus-registry-fetch-group "gnus-registry")) +(defvar gnus-registry-install) +(autoload 'gnus-registry-fetch-group "gnus-registry") (defun nnmairix-goto-original-article (&optional no-registry) "Jump to the original group and display article. diff --git a/lisp/nnml.el b/lisp/nnml.el index 76dbf333d..30a54543a 100644 --- a/lisp/nnml.el +++ b/lisp/nnml.el @@ -38,9 +38,9 @@ (require 'nnoo) (eval-when-compile (require 'cl)) -(eval-and-compile - (autoload 'gnus-article-unpropagatable-p "gnus-sum") - (autoload 'gnus-backlog-remove-article "gnus-bcklg")) +;; FIXME first is unused in this file. +(autoload 'gnus-article-unpropagatable-p "gnus-sum") +(autoload 'gnus-backlog-remove-article "gnus-bcklg") (nnoo-declare nnml) diff --git a/lisp/nnrss.el b/lisp/nnrss.el index ea8197d27..41fc7b65c 100644 --- a/lisp/nnrss.el +++ b/lisp/nnrss.el @@ -1,7 +1,7 @@ ;;; nnrss.el --- interfacing with RSS -;; Copyright (C) 2001, 2002, 2003, 2004, 2005, -;; 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: RSS @@ -491,7 +491,7 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s" (unless (assoc (car elem) nnrss-group-alist) (insert (prin1-to-string (car elem)) " 0 1 y\n"))))) -(eval-and-compile (autoload 'timezone-parse-date "timezone")) +(autoload 'timezone-parse-date "timezone") (defun nnrss-normalize-date (date) "Return a date string of DATE in the RFC822 style. diff --git a/lisp/nntp.el b/lisp/nntp.el index ea053531b..8c64cefad 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -36,8 +36,7 @@ (eval-when-compile (require 'cl)) -(eval-and-compile - (autoload 'auth-source-user-or-password "auth-source")) +(autoload 'auth-source-user-or-password "auth-source") (defgroup nntp nil "NNTP access for Gnus." @@ -1180,10 +1179,10 @@ If SEND-IF-FORCE, only send authinfo to the server if the (let* ((list (netrc-parse nntp-authinfo-file)) (alist (netrc-machine list nntp-address "nntp")) (force (or (netrc-get alist "force") nntp-authinfo-force)) - (user (or + (user (or ;; this is preferred to netrc-* (auth-source-user-or-password "login" nntp-address "nntp") - (netrc-get alist "login") + (netrc-get alist "login") nntp-authinfo-user)) (passwd (or ;; this is preferred to netrc-* @@ -1302,10 +1301,9 @@ password contained in '~/.nntp-authinfo'." (defun nntp-open-network-stream (buffer) (open-network-stream "nntpd" buffer nntp-address nntp-port-number)) -(eval-and-compile - (autoload 'format-spec "format-spec") - (autoload 'format-spec-make "format-spec") - (autoload 'open-tls-stream "tls")) +(autoload 'format-spec "format-spec") +(autoload 'format-spec-make "format-spec") +(autoload 'open-tls-stream "tls") (defun nntp-open-ssl-stream (buffer) (let* ((process-connection-type nil) @@ -2120,8 +2118,7 @@ Please refer to the following variables to customize the connection: (make-directory (directory-file-name dir) t) (nnheader-message 5 "Creating nntp marks directory %s" dir)))) -(eval-and-compile - (autoload 'time-less-p "time-date")) +(autoload 'time-less-p "time-date") (defun nntp-marks-changed-p (group server) (let ((file (nntp-group-pathname server group nntp-marks-file-name)) diff --git a/lisp/nnvirtual.el b/lisp/nnvirtual.el index a92cff87a..4b744f451 100644 --- a/lisp/nnvirtual.el +++ b/lisp/nnvirtual.el @@ -81,8 +81,7 @@ component group will show up when you enter the virtual group.") (defvoo nnvirtual-status-string "") -(eval-and-compile - (autoload 'gnus-cache-articles-in-group "gnus-cache")) +(autoload 'gnus-cache-articles-in-group "gnus-cache") @@ -715,7 +714,7 @@ based on the marks on the component groups." tot (+ tot size) M (max M size)))) nnvirtual-component-groups) - + ;; Number of articles in the virtual group. (setq nnvirtual-mapping-len tot) diff --git a/lisp/sieve-manage.el b/lisp/sieve-manage.el index 5fb3287f9..38fece27a 100644 --- a/lisp/sieve-manage.el +++ b/lisp/sieve-manage.el @@ -1,7 +1,7 @@ ;;; sieve-manage.el --- Implementation of the managesive protocol in elisp -;; Copyright (C) 2001, 2002, 2003, 2004, 2005, -;; 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008 Free Software Foundation, Inc. ;; Author: Simon Josefsson @@ -85,9 +85,8 @@ (eval-when-compile (require 'sasl) (require 'starttls)) -(eval-and-compile - (autoload 'sasl-find-mechanism "sasl") - (autoload 'starttls-open-stream "starttls")) +(autoload 'sasl-find-mechanism "sasl") +(autoload 'starttls-open-stream "starttls") ;; User customizable variables: diff --git a/lisp/spam-report.el b/lisp/spam-report.el index f401f5420..e8658bd4e 100644 --- a/lisp/spam-report.el +++ b/lisp/spam-report.el @@ -1,6 +1,7 @@ ;;; spam-report.el --- Reporting spam -;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 +;; Free Software Foundation, Inc. ;; Author: Ted Zlatanov ;; Keywords: network, spam, mail, gmane, report @@ -30,8 +31,7 @@ (require 'gnus) (require 'gnus-sum) -(eval-and-compile - (autoload 'mm-url-insert "mm-url")) +(autoload 'mm-url-insert "mm-url") (defgroup spam-report nil "Spam reporting configuration." diff --git a/lisp/spam.el b/lisp/spam.el index 6d4b3069f..ca274268c 100644 --- a/lisp/spam.el +++ b/lisp/spam.el @@ -1,6 +1,7 @@ ;;; spam.el --- Identifying spam -;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 +;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Maintainer: Ted Zlatanov @@ -57,8 +58,7 @@ (eval-when-compile (require 'nnimap)) ;; autoload query-dig -(eval-and-compile - (autoload 'query-dig "dig")) +(autoload 'query-dig "dig") ;; autoload spam-report (eval-and-compile @@ -68,15 +68,13 @@ (autoload 'spam-report-resend "spam-report")) ;; autoload gnus-registry -(eval-and-compile - (autoload 'gnus-registry-group-count "gnus-registry") - (autoload 'gnus-registry-add-group "gnus-registry") - (autoload 'gnus-registry-store-extra-entry "gnus-registry") - (autoload 'gnus-registry-fetch-extra "gnus-registry")) +(autoload 'gnus-registry-group-count "gnus-registry") +(autoload 'gnus-registry-add-group "gnus-registry") +(autoload 'gnus-registry-store-extra-entry "gnus-registry") +(autoload 'gnus-registry-fetch-extra "gnus-registry") ;; autoload query-dns -(eval-and-compile - (autoload 'query-dns "dns")) +(autoload 'query-dns "dns") ;;}}} diff --git a/lisp/tls.el b/lisp/tls.el index e1e01b002..3044cb4ab 100644 --- a/lisp/tls.el +++ b/lisp/tls.el @@ -1,7 +1,7 @@ ;;; tls.el --- TLS/SSL support via wrapper around GnuTLS -;; Copyright (C) 1996, 1997, 1998, 1999, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Keywords: comm, tls, gnutls, ssl @@ -45,9 +45,8 @@ ;;; Code: -(eval-and-compile - (autoload 'format-spec "format-spec") - (autoload 'format-spec-make "format-spec")) +(autoload 'format-spec "format-spec") +(autoload 'format-spec-make "format-spec") (defgroup tls nil "Transport Layer Security (TLS) parameters." -- 2.25.1