emacs: lisp/gnus/message.el comparison

comparison lisp/gnus/message.el @ 107427:ecbe0edc4f69

Stop message.el from loading about 40 libraries it doesn't always need. The general approach is to autoload rather than require, and to require in the specific functions rather than the file. (Bug#5642) * url/url.el: Move mailcap require earlier in the file. * gnus/gmm-utils.el: Don't require wid-edit. (widget-create-child-value, widget-convert, widget-default-get): Autoload. * gnus/gnus-util.el: Don't require time-date, netrc. (message-fetch-field, gnus-group-name-decode): Declare rather than autoloading. (gnus-fetch-field): Require message. (gnus-decode-newsgroups): Require gnus-group. * gnus/ietf-drums.el: Don't require time-date. * gnus/message.el: Don't require hashcash, canlock, ecomplete. Do require mail-utils. Require nnheader only when compiling. (smtpmail-default-smtp-server): Remove declaration. (message-send-mail-function): Check smtpmail-default-smtp-server is bound rather than requiring smtpmail. (message-auto-save-directory, message-insert-signature): Use expand-file-name rather than nnheader-concat. (nnheader-insert-file-contents): Autoload. (hashcash-wait-async): Declare. (message-send-mail): Only call gnus-setup-posting-charset if gnus-group-posting-charset-alist is bound. Require hashcash if needed. (message-send-mail-with-sendmail): Require sendmail. (canlock-password, canlock-password-for-verify): Declare. (message-canlock-password): Require canlock. (nnheader-get-report): Autoload. (gnus-setup-posting-charset): Declare. (message-send-news): Require gnus-msg. (message-make-references, message-make-in-reply-to): Use mail-header-id rather than the alias mail-header-message-id. (ecomplete-add-item, ecomplete-save): Declare. (message-put-addresses-in-ecomplete): Require ecomplete. (ecomplete-display-matches): Autoload. * gnus/mm-decode.el: Don't require mailcap, gnus-util. (gnus-map-function, gnus-replace-in-string, gnus-read-shell-command) (message-fetch-field, mailcap-parse-mailcaps, mailcap-mime-info): Autoload. (mailcap-mime-extensions): Declare. * gnus/mm-encode.el: Don't require mailcap. (mailcap-extension-to-mime): Autoload. * gnus/mml-sec.el: Don't require password-cache. * gnus/mml.el (gnus-setup-posting-charset): Declare rather than autoload. (mailcap-parse-mimetypes, mailcap-mime-types): Declare. (mml-minibuffer-read-type): Require mailcap. (mml-preview): Require gnus-msg. * gnus/mml1991.el: Require password-cache. (password-cache-expiry): Remove declaration. * gnus/mml2015.el: Require password-cache. (password-cache-expiry): Remove declaration. * gnus/nneething.el (mailcap): Require mailcap. * gnus/nnheader.el: (declare-function): Add compatibility stub. (message-remove-header): Declare rather than autoload. (nnheader-replace-header): Require message. * gnus/nnimap.el (declare-function): Add compatibility stub. (netrc-parse, netrc-machine-user-or-password): Declare. (nnimap-open-connection): Require netrc. * gnus/nntp.el (declare-function): Add compatibility stub. (netrc-parse, netrc-machine, netrc-get): Declare. (nntp-send-authinfo): Require netrc. * gnus/rfc2047.el: Don't require qp. (quoted-printable-encode-region, quoted-printable-decode-string): Autoload. * gnus/sieve-mode.el: Don't require easymenu. (easy-menu-add-item): Autoload it. * gnus/spam-stat.el (time-to-number-of-days): Autoload it. * password-cache.el (password-cache, password-cache-expiry): Autoload.

author	Glenn Morris <rgm@gnu.org>
date	Thu, 18 Mar 2010 19:55:37 -0700
parents	a3c102291ce1
children	0fe940324254

comparison

equal deleted inserted replaced

-:e3c196b081c6
+:ecbe0edc4f69
 (eval-and-compile
 (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (eval-when-compile
 (require 'cl))
-(require 'hashcash)
-(require 'canlock)
 (require 'mailheader)
 (require 'gmm-utils)
-(require 'nnheader)
+(require 'mail-utils)
+;; Only for the trivial macros mail-header-from, mail-header-date
+;; mail-header-references, mail-header-subject, mail-header-id
+(eval-when-compile (require 'nnheader))
 ;; This is apparently necessary even though things are autoloaded.
 ;; Because we dynamically bind mail-abbrev-mode-regexp, we'd better
 ;; require mailabbrev here.
 (if (featurep 'xemacs)
 (require 'mail-abbrevs)
 (require 'mailabbrev))
 (require 'mail-parse)
 (require 'mml)
 (require 'rfc822)
-(require 'ecomplete)
 (autoload 'mailclient-send-it "mailclient") ;; Emacs 22 or contrib/
 (defvar gnus-message-group-art)
 (defvar gnus-list-identifiers) ; gnus-sum is required where necessary
 "Message to be inserted in the cancel message."
 :group 'message-interface
 :link '(custom-manual "(message)Canceling News")
 :type 'string)
-(defvar smtpmail-default-smtp-server)
 (defun message-send-mail-function ()
 "Return suitable value for the variable `message-send-mail-function'."
 (cond ((and (require 'sendmail)
 	      (boundp 'sendmail-program)
 	      sendmail-program
 	      (executable-find sendmail-program))
 	 'message-send-mail-with-sendmail)
 	((and (locate-library "smtpmail")
-	      (require 'smtpmail)
+	      (boundp 'smtpmail-default-smtp-server)
 	      smtpmail-default-smtp-server)
 	 'message-smtpmail-send-it)
 	((locate-library "mailclient")
 	 'message-send-mail-with-mailclient)
 	(t
-	 (lambda ()
+	 (error "Don't know how to send mail.  Please customize `message-send-mail-function'"))))
-	   (error "Don't know how to send mail.  Please customize `message-send-mail-function'")))))
 ;; Useful to set in site-init.el
 (defcustom message-send-mail-function
 (cond ((eq send-mail-function 'smtpmail-send-it) 'message-smtpmail-send-it)
 	((eq send-mail-function 'feedmail-send-it) 'feedmail-send-it)
 `egg-self-insert-command', you may want to add it to this list."
 :group 'message-various
 :type '(repeat function))
 (defcustom message-auto-save-directory
-(file-name-as-directory (nnheader-concat message-directory "drafts"))
+(file-name-as-directory (expand-file-name "drafts" message-directory))
 "*Directory where Message auto-saves buffers if Gnus isn't running.
 If nil, Message won't auto-save."
 :group 'message-buffers
 :link '(custom-manual "(message)Various Message Variables")
 :type '(choice directory (const :tag "Don't auto-save" nil)))
 		 (setq paren t))
 		((and (eq (char-after) ?\))
 		      (not quoted))
 		 (setq paren nil))))
 	(nreverse elems)))))
+(autoload 'nnheader-insert-file-contents "nnheader")
 (defun message-mail-file-mbox-p (file)
 "Say whether FILE looks like a Unix mbox file."
 (when (and (file-exists-p file)
 	     (file-readable-p file)
 		       (if (and message-signature-directory
 				;; don't actually use the signature directory
 				;; if message-signature-file contains a path.
 				(not (file-name-directory
 				      message-signature-file)))
-			   (nnheader-concat message-signature-directory
+			   (expand-file-name message-signature-file
-					    message-signature-file)
+					     message-signature-directory)
 			 message-signature-file))
 		 (file-exists-p signature-file))))
 (when signature
 (goto-char (point-max))
 ;; Insert the signature.
 	    (setq n (+ n 1))
 	    (setq p (pop plist))
 	    (erase-buffer)))
 (kill-buffer tembuf))))
+(declare-function hashcash-wait-async "hashcash" (&optional buffer))
 (defun message-send-mail (&optional arg)
 (require 'mail-utils)
 (let* ((tembuf (message-generate-new-buffer-clone-locals " message temp"))
 	 (case-fold-search nil)
 	 (news (message-news-p))
 	 (mailbuf (current-buffer))
 	 (message-this-is-mail t)
+	 ;; gnus-setup-posting-charset is autoloaded in mml.el (FIXME
+	 ;; maybe it should not be), which this file requires.  Hence
+	 ;; the fboundp test is always true.  Loading it from gnus-msg
+	 ;; loads many Gnus files (Bug#5642).  If
+	 ;; gnus-group-posting-charset-alist hasn't been customized,
+	 ;; this is just going to return nil anyway.  FIXME it would
+	 ;; be good to improve this further, because even if g-g-p-c-a
+	 ;; has been customized, that is likely to just be for news.
+	 ;; Eg either move the definition from gnus-msg, or separate out
+	 ;; the mail and news parts.
 	 (message-posting-charset
-	  (if (fboundp 'gnus-setup-posting-charset)
+	  (if (and (fboundp 'gnus-setup-posting-charset)
+		   (boundp 'gnus-group-posting-charset-alist))
 	      (gnus-setup-posting-charset nil)
 	    message-posting-charset))
 	 (headers message-required-mail-headers))
 (when (and message-generate-hashcash
 	       (not (eq message-generate-hashcash 'opportunistic)))
 (message "Generating hashcash...")
+(require 'hashcash)
 ;; Wait for calculations already started to finish...
 (hashcash-wait-async)
 ;; ...and do calculations not already done.  mail-add-payment
 ;; will leave existing X-Hashcash headers alone.
 (mail-add-payment)
 (set-buffer mailbuf)
 (push 'mail message-sent-message-via)))
 (defun message-send-mail-with-sendmail ()
 "Send off the prepared buffer with sendmail."
+(require 'sendmail)
 (let ((errbuf (if message-interactive
 		    (message-generate-new-buffer-clone-locals
 		     " sendmail errors")
 		  0))
 	resend-to-addresses delimline)
 (sha1 (concat (message-unique-id)
 		  (format "%x%x%x" (random) (random t) (random))
 		  (prin1-to-string (recent-keys))
 		  (prin1-to-string (garbage-collect))))))
+(defvar canlock-password)
+(defvar canlock-password-for-verify)
 (defun message-canlock-password ()
 "The password used by message for cancel locks.
 This is the value of `canlock-password', if that option is non-nil.
 Otherwise, generate and save a value for `canlock-password' first."
+(require 'canlock)
 (unless canlock-password
 (customize-save-variable 'canlock-password (message-canlock-generate))
 (setq canlock-password-for-verify canlock-password))
 canlock-password)
 (defun message-insert-canlock ()
 (when message-insert-canlock
 (message-canlock-password)
 (canlock-insert-header)))
+(autoload 'nnheader-get-report "nnheader")
+(declare-function gnus-setup-posting-charset "gnus-msg" (group))
 (defun message-send-news (&optional arg)
+(require 'gnus-msg)
 (let* ((tembuf (message-generate-new-buffer-clone-locals " *message temp*"))
 	 (case-fold-search nil)
 	 (method (if (functionp message-post-method)
 		     (funcall message-post-method arg)
 		   message-post-method))
 (int-to-string (count-lines (point) (point-max))))))
 (defun message-make-references ()
 "Return the References header for this message."
 (when message-reply-headers
-(let ((message-id (mail-header-message-id message-reply-headers))
+(let ((message-id (mail-header-id message-reply-headers))
 	  (references (mail-header-references message-reply-headers)))
 (if (or references message-id)
 	  (concat (or references "") (and references " ")
 		  (or message-id ""))
 	nil))))
 (defun message-make-in-reply-to ()
 "Return the In-Reply-To header for this message."
 (when message-reply-headers
 (let ((from (mail-header-from message-reply-headers))
 	  (date (mail-header-date message-reply-headers))
-	  (msg-id (mail-header-message-id message-reply-headers)))
+	  (msg-id (mail-header-id message-reply-headers)))
 (when from
 	(let ((name (mail-extract-address-components from)))
 	  (concat
 	   msg-id (if msg-id " (")
 	   (if (car name)
 (setq result (or result (looking-at regexp))))
 (if reverse
 	(not result)
 result)))
+(declare-function ecomplete-add-item "ecomplete" (type key text))
+(declare-function ecomplete-save "ecomplete" ())
 (defun message-put-addresses-in-ecomplete ()
+(require 'ecomplete)
 (dolist (header '("to" "cc" "from" "reply-to"))
 (let ((value (message-field-value header)))
 (dolist (string (mail-header-parse-addresses value 'raw))
 	(setq string
 	      (gnus-replace-in-string
 	       (gnus-replace-in-string string "^ +\\| +$" "") "\n" ""))
 	(ecomplete-add-item 'mail (car (mail-header-parse-address string))
 			    string))))
 (ecomplete-save))
+(autoload 'ecomplete-display-matches "ecomplete")
 (defun message-display-abbrev (&optional choose)
 "Display the next possible abbrev for the text before point."
 (interactive (list t))
 (when (and (memq (char-after (point-at-bol)) '(?C ?T ?\t ? ))

Mercurial > emacs

comparison lisp/gnus/message.el @ 107427:ecbe0edc4f69