((fboundp 'display-message)): added macro for

	display-message (for GNU Emacs) used for progress reports in
	bbdb-vm.el
(bbdb-format-record): fixed display for elided display

1 files changed, 7 insertions, 2 deletions

diff --git a/lisp/bbdb.el b/lisp/bbdb.el
index 0559db0..1c6727f 100644
--- a/lisp/bbdb.el
+++ b/lisp/bbdb.el
@@ -72,6 +72,10 @@ prompt the users on how to merge records when duplicates are detected.")
 (unless (fboundp 'characterp)
   (defmacro characterp(c) `(char-or-string-p ,c))) ;; XXX close
 
+(unless (fboundp 'display-message)
+  (defmacro display-message (type mess)
+    `(message ,mess)))
+
 (unless (fboundp 'defvaralias)
   (defun defvaralias (&rest args)))
 
@@ -1180,9 +1184,10 @@ formatted and inserted into the current buffer.  This is used by
     (cond ((eq brief t)
            (let ((p (point)))
              (beginning-of-line)
-             (if (<= (- p (point)) 47)
+             (if (<= (- p (point))
+		     (+ 2 bbdb-pop-up-elided-display-name-end))
                  (goto-char p)
-               (goto-char (+ (point) 44))
+               (goto-char (+ (point) bbdb-pop-up-elided-display-name-end))
                (setq p (point))
                (end-of-line)
                (delete-region p (point))