* hashcash.el, imap.el, pgg.el, pgg-parse.el (declare-function): Add

new no-op macro for backward compatibility.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9283c6d..8806e5c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2007-12-09  Reiner Steib  <Reiner.Steib@gmx.de>
 
+       * hashcash.el, imap.el, pgg.el, pgg-parse.el (declare-function): Add
+       new no-op macro for backward compatibility.
+
        * imap.el (imap-string-to-integer): New function.
 
 2007-12-07  Katsumi Yamaoka  <yamaoka@jpl.org>

diff --git a/lisp/hashcash.el b/lisp/hashcash.el
index 22005ce..503e9d3 100644 (file)
--- a/lisp/hashcash.el
+++ b/lisp/hashcash.el
@@ -112,13 +112,15 @@ For example, you may want to set this to '(\"-Z2\") to reduce header length."
 (require 'mail-utils)
 
 (eval-and-compile
- (if (fboundp 'point-at-bol)
-     (defalias 'hashcash-point-at-bol 'point-at-bol)
-   (defalias 'hashcash-point-at-bol 'line-beginning-position))
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
 
- (if (fboundp 'point-at-eol)
-     (defalias 'hashcash-point-at-eol 'point-at-eol)
-   (defalias 'hashcash-point-at-eol 'line-end-position)))
+  (if (fboundp 'point-at-bol)
+      (defalias 'hashcash-point-at-bol 'point-at-bol)
+    (defalias 'hashcash-point-at-bol 'line-beginning-position))
+
+  (if (fboundp 'point-at-eol)
+      (defalias 'hashcash-point-at-eol 'point-at-eol)
+    (defalias 'hashcash-point-at-eol 'line-end-position)))
 
 (defun hashcash-strip-quoted-names (addr)
   (setq addr (mail-strip-quoted-names addr))

diff --git a/lisp/imap.el b/lisp/imap.el
index 86b892e..40e41d7 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -140,6 +140,7 @@
 
 (eval-when-compile (require 'cl))
 (eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
   (autoload 'starttls-open-stream "starttls")
   (autoload 'starttls-negotiate "starttls")
   (autoload 'sasl-find-mechanism "sasl")

diff --git a/lisp/pgg-parse.el b/lisp/pgg-parse.el
index 336c492..87bafc0 100644 (file)
--- a/lisp/pgg-parse.el
+++ b/lisp/pgg-parse.el
@@ -36,7 +36,9 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
+(eval-when-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
+  (require 'cl))
 
 (defgroup pgg-parse ()
   "OpenPGP packet parsing."

diff --git a/lisp/pgg.el b/lisp/pgg.el
index 6e4a2a8..74b6ed7 100644 (file)
--- a/lisp/pgg.el
+++ b/lisp/pgg.el
@@ -35,6 +35,7 @@
 
 ;; Don't merge these two `eval-when-compile's.
 (eval-when-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
   (require 'cl))
 
 ;;; @ utility functions