From 74e4b07e934f7a37681faf301de36c3ebe3d65a0 Mon Sep 17 00:00:00 2001 From: Reiner Steib Date: Sun, 9 Dec 2007 21:27:14 +0000 Subject: [PATCH] * hashcash.el, imap.el, pgg.el, pgg-parse.el (declare-function): Add new no-op macro for backward compatibility. --- lisp/ChangeLog | 3 +++ lisp/hashcash.el | 14 ++++++++------ lisp/imap.el | 1 + lisp/pgg-parse.el | 4 +++- lisp/pgg.el | 1 + 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9283c6d55..8806e5c34 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2007-12-09 Reiner Steib + * 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 diff --git a/lisp/hashcash.el b/lisp/hashcash.el index 22005ce95..503e9d38f 100644 --- 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 86b892ef8..40e41d79d 100644 --- 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 336c492ef..87bafc08f 100644 --- 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 6e4a2a874..74b6ed7cb 100644 --- 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 -- 2.34.1