Mercurial > emacs
changeset 107413:a21a1c5668d6
* mail/hashcash.el (declare-function): Remove duplicate definition.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Wed, 17 Mar 2010 23:21:21 -0700 |
| parents | dcd02d810e03 |
| children | 929a106309b7 |
| files | lisp/ChangeLog lisp/mail/hashcash.el |
| diffstat | 2 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Mar 17 23:18:47 2010 -0700 +++ b/lisp/ChangeLog Wed Mar 17 23:21:21 2010 -0700 @@ -1,5 +1,7 @@ 2010-03-18 Glenn Morris <rgm@gnu.org> + * 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.
--- a/lisp/mail/hashcash.el Wed Mar 17 23:18:47 2010 -0700 +++ b/lisp/mail/hashcash.el Wed Mar 17 23:21:21 2010 -0700 @@ -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 <mycroft@actrix.gen.nz> (1997-2002) ;; Maintainer: Paul Foley <mycroft@actrix.gen.nz> @@ -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))))