Changes committed gnus/lisp (ChangeLog hashcash.el)

Modified: ChangeLog hashcash.el

(declare-function): Remove duplicate definition by Glenn Morris <[email protected]>.


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.2063 gnus/lisp/ChangeLog:7.2064
--- ChangeLog:7.2063	Wed Mar 17 04:52:56 2010
+++ ChangeLog	Thu Mar 18 10:16:31 2010
@@ -1,3 +1,7 @@
+2010-03-18  Glenn Morris  <[email protected]>
+
+	* hashcash.el (declare-function): Remove duplicate definition.
+
 2010-03-17  Kevin Ryde  <[email protected]>
 
 	* mml.el (mml-read-tag): Unquote values with `read' to reverse
Index: hashcash.el
diff -u gnus/lisp/hashcash.el:7.31 gnus/lisp/hashcash.el:7.32
--- hashcash.el:7.31	Wed Jan 13 11:59:43 2010
+++ hashcash.el	Thu Mar 18 10:16:31 2010
@@ -1,6 +1,7 @@
 ;;; hashcash.el --- Add hashcash payments to email
 
-;; Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010  Free Software Foundation
+;; Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010
+;;   Free Software Foundation
 
 ;; Written by: Paul Foley <[email protected]> (1997-2002)
 ;; Maintainer: Paul Foley <[email protected]>
@@ -115,8 +116,6 @@
 (require 'mail-utils)
 
 (eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
-
   (if (fboundp 'point-at-bol)
       (defalias 'hashcash-point-at-bol 'point-at-bol)
     (defalias 'hashcash-point-at-bol 'line-beginning-position))
@@ -131,10 +130,10 @@
       (concat (match-string 1 addr) (match-string 2 addr))
     addr))
 
-(declare-function  message-narrow-to-headers-or-head "message" ())
-(declare-function  message-fetch-field "message" (header &optional not-all))
-(declare-function  message-goto-eoh "message" ())
-(declare-function  message-narrow-to-headers "message" ())
+(declare-function message-narrow-to-headers-or-head "message" ())
+(declare-function message-fetch-field "message" (header &optional not-all))
+(declare-function message-goto-eoh "message" ())
+(declare-function message-narrow-to-headers "message" ())
 
 (defun hashcash-token-substring ()
   (save-excursion
@@ -287,7 +286,7 @@
   "Ask user whether to wait for hashcash processes to finish."
   (interactive)
   (when (hashcash-processes-running-p (current-buffer))
-    (if (y-or-n-p 
+    (if (y-or-n-p
 	  "Hashcash process(es) still running; wait for them to finish? ")
 	(hashcash-wait-async)
       (hashcash-cancel-async))))