[Emacs-diffs] /srv/bzr/emacs/trunk r99679: * mail/hashcash.el (declare-function): Remove duplicate definition.

[Glenn Morris]

------------------------------------------------------------
revno: 99679
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2010-03-17 23:21:21 -0700
message:
  * mail/hashcash.el (declare-function): Remove duplicate definition.
modified:
  lisp/ChangeLog
  lisp/mail/hashcash.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-03-18 06:18:47 +0000
+++ b/lisp/ChangeLog    2010-03-18 06:21:21 +0000
@@ -1,5 +1,7 @@
 2010-03-18  Glenn Morris  <address@hidden>
 
+       * mail/hashcash.el (declare-function): Remove duplicate definition.
+
        * mail/emacsbug.el (report-emacs-bug-pretest-address):
        Make it an obsolete alias for report-emacs-bug-address.
        (message-strip-special-text-properties): Declare.

=== modified file 'lisp/mail/hashcash.el'
--- a/lisp/mail/hashcash.el     2010-01-13 08:35:10 +0000
+++ b/lisp/mail/hashcash.el     2010-03-18 06:21:21 +0000
@@ -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 <address@hidden> (1997-2002)
 ;; Maintainer: Paul Foley <address@hidden>
@@ -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))))