summaryrefslogtreecommitdiff
path: root/lisp/bbdb.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/bbdb.el')
-rw-r--r--lisp/bbdb.el10
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/bbdb.el b/lisp/bbdb.el
index 2ae2172..8ffb451 100644
--- a/lisp/bbdb.el
+++ b/lisp/bbdb.el
@@ -1012,6 +1012,12 @@ If the note is absent, returns a zero length string."
(list 'match-beginning match-number)
(list 'match-end match-number))))
+(eval-and-compile
+ (if (fboundp 'display-error)
+ (fset 'bbdb-display-error 'display-error)
+ (defun bbdb-display-error(msg stream)
+ (message "Error: %s" (nth 1 msg)))))
+
(defmacro bbdb-error-retry (form)
(list 'catch ''--bbdb-error-retry--
(list 'while ''t
@@ -1020,9 +1026,7 @@ If the note is absent, returns a zero length string."
'(error
(ding)
(let ((cursor-in-echo-area t))
- (if (fboundp 'display-error) ; lemacs 19.8+
- (display-error --c-- nil)
- (message "Error: %s" (nth 1 --c--)))
+ (bbdb-display-error --c-- nil)
(sit-for 2)))))))
;;; Completion on labels and field data