Changes committed gnus/lisp (37 files)

"Miles Bader" <[email protected]>
Newsgroups gmane.emacs.gnus.commits
Message-ID <[email protected]>
Modified: ChangeLog ChangeLog.2 auth-source.el gnus-agent.el gnus-art.el
          gnus-cache.el gnus-ems.el gnus-group.el gnus-logic.el
          gnus-msg.el gnus-picon.el gnus-sum.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 netrc.el nnfolder.el nnheader.el
          nnimap.el nnir.el nnmail.el nnmairix.el nnml.el nnrss.el nntp.el
          nnvirtual.el sieve-manage.el spam-report.el spam.el tls.el

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  <[email protected]>

   * contrib/sendmail.el (mail-interactive): Change default.

2008-06-11  Glenn Morris  <[email protected]>

   * 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  <[email protected]>

   * lisp/auth-source.el: Precise Tramp doc.

2008-06-07  Glenn Morris  <[email protected]>

   * lisp/nnmairix.el: Remove unnecessary eval-when-compile.

2008-06-05  Stefan Monnier  <[email protected]>

   * 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: [email protected]/gnus--devo--0--patch-509


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1873 gnus/lisp/ChangeLog:7.1874
--- ChangeLog:7.1873	Sat Jun  7 00:56:13 2008
+++ ChangeLog	Wed Jun 11 16:19:44 2008
@@ -1,3 +1,35 @@
+2008-06-11  Glenn Morris  <[email protected]>
+
+	* 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  <[email protected]>
+
+	* auth-source.el: Precise Tramp doc.
+
+2008-06-07  Glenn Morris  <[email protected]>
+
+	* nnmairix.el: Remove unnecessary eval-when-compile.
+
 2008-06-06  Katsumi Yamaoka  <[email protected]>
 
 	* lpath.el: Fbind propertize for XEmacs 21.4.
@@ -6,6 +38,12 @@
 
 	* nnir.el: Move here from ../contrib.
 
+2008-06-05  Stefan Monnier  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* 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  <[email protected]>
+2004-09-06  Stefan Monnier  <[email protected]>
 
 	* 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  <[email protected]>
+2004-05-16  Kim-Minh Kaplan  <[email protected]>
 
 	* imap.el (imap-sasl-make-mechanisms): Use sasl.
 
 2004-05-16  Lars Magne Ingebrigtsen  <[email protected]>
 
-	* 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.
Index: ChangeLog.2
diff -u gnus/lisp/ChangeLog.2:7.23 gnus/lisp/ChangeLog.2:7.24
--- ChangeLog.2:7.23	Thu Jun  5 08:23:11 2008
+++ ChangeLog.2	Wed Jun 11 16:19:44 2008
@@ -463,7 +463,7 @@
 	* mml-smime.el (mml-smime-sign): Replace CRLF with LF in OpenSSL
 	output.  Reported by Arne J,Ax(Brgensen <[email protected]>.
 
-2003-12-07  Lloyd Zusman <[email protected]>  (tiny change)
+2003-12-07  Lloyd Zusman  <[email protected]>  (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 <[email protected]>.
 
-2003-11-04  Norbert Koch <[email protected]>  (tiny change)
+2003-11-04  Norbert Koch  <[email protected]>  (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 <[email protected]>  (tiny change)
+2003-10-31  Derek Atkins  <[email protected]>  (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   <[email protected]>
+2003-09-10  Eric Knauel  <[email protected]>
 
 	* 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 <[email protected]>  (tiny change)
+2003-07-26  Mark Thomas  <[email protected]>  (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 <[email protected]>  (tiny change)
+2003-05-12  Ville Skytt,Ad(B  <[email protected]>  (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 <[email protected]>  (tiny change)
+2003-01-24  Mark Thomas  <[email protected]>  (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  <[email protected]>
+2003-01-02  Pete Kazmier  <[email protected]>
 
 	* 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  <[email protected]>
+2002-07-21  Jesper Harder  <[email protected]>
 
 	* 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  <[email protected]>
+2002-07-21  Jesper Harder  <[email protected]>
 
 	* 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  <[email protected]>  (tiny change)
+2002-09-28  David Edmondson  <[email protected]>
 
 	* 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  <[email protected]>
+2002-05-20  Jason Baker  <[email protected]>
 	Trivial patch.
 
 	* gnus-art.el (gnus-request-article-this-buffer): Try
Index: auth-source.el
diff -u gnus/lisp/auth-source.el:7.11 gnus/lisp/auth-source.el:7.12
--- auth-source.el:7.11	Tue May 20 20:06:48 2008
+++ auth-source.el	Wed Jun 11 16:19:44 2008
@@ -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 @@
 
 (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)))))
 
Index: gnus-agent.el
diff -u gnus/lisp/gnus-agent.el:7.79 gnus/lisp/gnus-agent.el:7.80
--- gnus-agent.el:7.79	Mon May 19 10:47:42 2008
+++ gnus-agent.el	Wed Jun 11 16:19:44 2008
@@ -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 <[email protected]>
 ;; 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."
Index: gnus-art.el
diff -u gnus/lisp/gnus-art.el:7.273 gnus/lisp/gnus-art.el:7.274
--- gnus-art.el:7.273	Mon May 19 10:47:42 2008
+++ gnus-art.el	Wed Jun 11 16:19:44 2008
@@ -3944,7 +3944,7 @@
 	       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
Index: gnus-cache.el
diff -u gnus/lisp/gnus-cache.el:7.27 gnus/lisp/gnus-cache.el:7.28
--- gnus-cache.el:7.27	Mon May 19 10:47:42 2008
+++ gnus-cache.el	Wed Jun 11 16:19:44 2008
@@ -96,9 +96,8 @@
 
 (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")
 
 
 
Index: gnus-ems.el
diff -u gnus/lisp/gnus-ems.el:7.27 gnus/lisp/gnus-ems.el:7.28
--- gnus-ems.el:7.27	Mon May 19 10:47:41 2008
+++ gnus-ems.el	Wed Jun 11 16:19:44 2008
@@ -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)))
Index: gnus-group.el
diff -u gnus/lisp/gnus-group.el:7.114 gnus/lisp/gnus-group.el:7.115
--- gnus-group.el:7.114	Mon May 19 10:47:41 2008
+++ gnus-group.el	Wed Jun 11 16:19:44 2008
@@ -1108,6 +1108,7 @@
   :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 @@
 		       '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."
Index: gnus-logic.el
diff -u gnus/lisp/gnus-logic.el:7.10 gnus/lisp/gnus-logic.el:7.11
--- gnus-logic.el:7.10	Mon May 19 10:47:41 2008
+++ gnus-logic.el	Wed Jun 11 16:19:44 2008
@@ -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."
Index: gnus-msg.el
diff -u gnus/lisp/gnus-msg.el:7.67 gnus/lisp/gnus-msg.el:7.68
--- gnus-msg.el:7.67	Mon May 19 10:47:42 2008
+++ gnus-msg.el	Wed Jun 11 16:19:44 2008
@@ -333,8 +333,7 @@
 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)
 
 
 ;;;
Index: gnus-picon.el
diff -u gnus/lisp/gnus-picon.el:7.15 gnus/lisp/gnus-picon.el:7.16
--- gnus-picon.el:7.15	Mon May 19 10:47:42 2008
+++ gnus-picon.el	Wed Jun 11 16:19:44 2008
@@ -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)
@@ -164,6 +168,8 @@
 		  gnus-picon-glyph-alist))))
 
 ;;; 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
Index: gnus-sum.el
diff -u gnus/lisp/gnus-sum.el:7.227 gnus/lisp/gnus-sum.el:7.228
--- gnus-sum.el:7.227	Sat May 24 15:06:11 2008
+++ gnus-sum.el	Wed Jun 11 16:19:44 2008
@@ -2889,6 +2889,7 @@
   :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'.
Index: gnus-util.el
diff -u gnus/lisp/gnus-util.el:7.80 gnus/lisp/gnus-util.el:7.81
--- gnus-util.el:7.80	Mon May 19 10:47:42 2008
+++ gnus-util.el	Wed Jun 11 16:19:44 2008
@@ -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 @@
 			(overlays-at pos)))))))
 
 ;;; Protected and atomic operations.  [email protected] 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 @@
 (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 @@
 	(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)
@@ -1797,6 +1797,9 @@
 	     ;; call, and that might allow it to exit thru a condition-case
 	     ;; 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)
 
Index: gnus.el
diff -u gnus/lisp/gnus.el:7.84 gnus/lisp/gnus.el:7.85
--- gnus.el:7.84	Mon May 19 10:47:42 2008
+++ gnus.el	Wed Jun 11 16:19:44 2008
@@ -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 <[email protected]>
 ;;	Lars Magne Ingebrigtsen <[email protected]>
@@ -917,8 +918,7 @@
 
 (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)
@@ -992,6 +992,8 @@
 (defvar gnus-logo-colors
   (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."
Index: mail-source.el
diff -u gnus/lisp/mail-source.el:7.37 gnus/lisp/mail-source.el:7.38
--- mail-source.el:7.37	Mon May 19 10:47:42 2008
+++ mail-source.el	Wed Jun 11 16:19:44 2008
@@ -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 @@
 	      (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 @@
 			 ?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."
Index: message.el
diff -u gnus/lisp/message.el:7.264 gnus/lisp/message.el:7.265
--- message.el:7.264	Thu Jun  5 02:46:37 2008
+++ message.el	Wed Jun 11 16:19:44 2008
@@ -1792,33 +1792,32 @@
   :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 @@
       (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.
Index: mm-decode.el
diff -u gnus/lisp/mm-decode.el:7.67 gnus/lisp/mm-decode.el:7.68
--- mm-decode.el:7.67	Mon May 19 10:47:42 2008
+++ mm-decode.el	Wed Jun 11 16:19:44 2008
@@ -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 @@
   "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)
@@ -1436,6 +1436,8 @@
 	(or (mm-image-type-from-buffer)
 	    (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."
Index: mm-encode.el
diff -u gnus/lisp/mm-encode.el:7.15 gnus/lisp/mm-encode.el:7.16
--- mm-encode.el:7.15	Mon May 19 10:47:42 2008
+++ mm-encode.el	Wed Jun 11 16:19:44 2008
@@ -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)
Index: mm-view.el
diff -u gnus/lisp/mm-view.el:7.56 gnus/lisp/mm-view.el:7.57
--- mm-view.el:7.56	Mon May 19 10:47:42 2008
+++ mm-view.el	Wed Jun 11 16:19:44 2008
@@ -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 <[email protected]>
 ;; 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)
Index: mml.el
diff -u gnus/lisp/mml.el:7.68 gnus/lisp/mml.el:7.69
--- mml.el:7.68	Mon May 19 10:47:42 2008
+++ mml.el	Wed Jun 11 16:19:45 2008
@@ -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 <[email protected]>
 ;; 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")
Index: mml1991.el
diff -u gnus/lisp/mml1991.el:7.27 gnus/lisp/mml1991.el:7.28
--- mml1991.el:7.27	Mon May 19 10:47:42 2008
+++ mml1991.el	Wed Jun 11 16:19:44 2008
@@ -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 <[email protected]>,
 ;;	Simon Josefsson <[email protected]> (Mailcrypt interface, Gnus glue)
@@ -79,8 +79,7 @@
 
 ;;; 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 @@
 
 ;;; 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 @@
 (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)
 
Index: mml2015.el
diff -u gnus/lisp/mml2015.el:7.55 gnus/lisp/mml2015.el:7.56
--- mml2015.el:7.55	Mon May 19 10:47:42 2008
+++ mml2015.el	Wed Jun 11 16:19:44 2008
@@ -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 <[email protected]>
 ;; Keywords: PGP MIME MML
@@ -182,13 +182,12 @@
 
 ;;; 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 @@
 
 ;;; 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 @@
 (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 @@
 (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)
 
Index: netrc.el
diff -u gnus/lisp/netrc.el:7.24 gnus/lisp/netrc.el:7.25
--- netrc.el:7.24	Tue May 20 20:06:48 2008
+++ netrc.el	Wed Jun 11 16:19:44 2008
@@ -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)
Index: nnfolder.el
diff -u gnus/lisp/nnfolder.el:7.23 gnus/lisp/nnfolder.el:7.24
--- nnfolder.el:7.23	Mon May 19 10:47:42 2008
+++ nnfolder.el	Wed Jun 11 16:19:44 2008
@@ -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)
 
Index: nnheader.el
diff -u gnus/lisp/nnheader.el:7.34 gnus/lisp/nnheader.el:7.35
--- nnheader.el:7.34	Mon May 19 17:34:44 2008
+++ nnheader.el	Wed Jun 11 16:19:44 2008
@@ -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 @@
   (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.
 
Index: nnimap.el
diff -u gnus/lisp/nnimap.el:7.50 gnus/lisp/nnimap.el:7.51
--- nnimap.el:7.50	Mon May 19 10:47:42 2008
+++ nnimap.el	Wed Jun 11 16:19:44 2008
@@ -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 <[email protected]>
 ;;         Jim Radford <[email protected]>
@@ -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 @@
  	   (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 @@
 			     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"
Index: nnir.el
diff -u gnus/lisp/nnir.el:7.2 gnus/lisp/nnir.el:7.3
--- nnir.el:7.2	Thu Jun  5 23:50:07 2008
+++ nnir.el	Wed Jun 11 16:19:44 2008
@@ -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 <[email protected]>
 ;; Swish-e and Swish++ backends by:
@@ -11,6 +11,24 @@
 ;; IMAP search improved by Daniel Pittman  <[email protected]>.
 ;; nnmaildir support for Swish++ and Namazu backends by:
 ;;   Justus Piater <Justus <at> 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 <http://www.gnu.org/licenses/>.
+
+;;; 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 @@
 
 
 (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 @@
 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 @@
   "Are we at the end of input?"
   (skip-chars-forward "[[:blank:]]")
   (looking-at "$"))
-  
+
 
 ;; Swish++ interface.
 ;; -cc- Todo
@@ -1663,4 +1661,5 @@
 ;; The end.
 (provide 'nnir)
 
-;;; arch-tag: 9b3fecf8-4397-4bbb-bf3c-6ac3cbbc6664
+;; arch-tag: 9b3fecf8-4397-4bbb-bf3c-6ac3cbbc6664
+;;; nnir.el ends here
Index: nnmail.el
diff -u gnus/lisp/nnmail.el:7.44 gnus/lisp/nnmail.el:7.45
--- nnmail.el:7.44	Mon May 19 10:47:42 2008
+++ nnmail.el	Wed Jun 11 16:19:44 2008
@@ -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."
Index: nnmairix.el
diff -u gnus/lisp/nnmairix.el:7.6 gnus/lisp/nnmairix.el:7.7
--- nnmairix.el:7.6	Mon May 26 10:36:06 2008
+++ nnmairix.el	Wed Jun 11 16:19:44 2008
@@ -851,9 +851,8 @@
 				'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.
Index: nnml.el
diff -u gnus/lisp/nnml.el:7.30 gnus/lisp/nnml.el:7.31
--- nnml.el:7.30	Mon May 19 10:47:42 2008
+++ nnml.el	Wed Jun 11 16:19:44 2008
@@ -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)
 
Index: nnrss.el
diff -u gnus/lisp/nnrss.el:7.58 gnus/lisp/nnrss.el:7.59
--- nnrss.el:7.58	Mon May 19 10:47:42 2008
+++ nnrss.el	Wed Jun 11 16:19:44 2008
@@ -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 <[email protected]>
 ;; Keywords: RSS
@@ -491,7 +491,7 @@
       (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.
Index: nntp.el
diff -u gnus/lisp/nntp.el:7.49 gnus/lisp/nntp.el:7.50
--- nntp.el:7.49	Mon May 19 10:47:42 2008
+++ nntp.el	Wed Jun 11 16:19:44 2008
@@ -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 @@
   (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 @@
 (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 @@
       (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))
Index: nnvirtual.el
diff -u gnus/lisp/nnvirtual.el:7.14 gnus/lisp/nnvirtual.el:7.15
--- nnvirtual.el:7.14	Mon May 19 10:47:42 2008
+++ nnvirtual.el	Wed Jun 11 16:19:45 2008
@@ -81,8 +81,7 @@
 
 (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 @@
 		    tot (+ tot size)
 		    M (max M size))))
 	  nnvirtual-component-groups)
-    
+
     ;; Number of articles in the virtual group.
     (setq nnvirtual-mapping-len tot)
 
Index: sieve-manage.el
diff -u gnus/lisp/sieve-manage.el:7.22 gnus/lisp/sieve-manage.el:7.23
--- sieve-manage.el:7.22	Mon May 19 10:47:41 2008
+++ sieve-manage.el	Wed Jun 11 16:19:44 2008
@@ -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 <[email protected]>
 
@@ -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:
 
Index: spam-report.el
diff -u gnus/lisp/spam-report.el:7.38 gnus/lisp/spam-report.el:7.39
--- spam-report.el:7.38	Mon May 19 10:47:41 2008
+++ spam-report.el	Wed Jun 11 16:19:44 2008
@@ -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 <[email protected]>
 ;; 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."
Index: spam.el
diff -u gnus/lisp/spam.el:7.100 gnus/lisp/spam.el:7.101
--- spam.el:7.100	Mon May 19 10:47:42 2008
+++ spam.el	Wed Jun 11 16:19:45 2008
@@ -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 <[email protected]>
 ;; Maintainer: Ted Zlatanov <[email protected]>
@@ -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")
 
 ;;}}}
 
Index: tls.el
diff -u gnus/lisp/tls.el:7.27 gnus/lisp/tls.el:7.28
--- tls.el:7.27	Mon May 19 10:47:42 2008
+++ tls.el	Wed Jun 11 16:19:44 2008
@@ -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 <[email protected]>
 ;; 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."
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.