The patch below (against the head of the sf.net CVS trunk) fixes a namespace-pollution bug (`digit' should have been `bbdb-digit' at least, although the patch fixes it in a different way) and a bug in the migration query which appears if your `display-buffer' chooses to display the query in a separate (typically dedicated) frame. The patch also fixes the docstring to follow the convention that the first line should be a complete sentence.
Stefan cvs server: Diffing lisp Index: lisp/bbdb-migrate.el =================================================================== RCS file: /cvsroot/bbdb/bbdb/lisp/bbdb-migrate.el,v retrieving revision 1.19 diff -u -r1.19 bbdb-migrate.el --- lisp/bbdb-migrate.el 19 Aug 2002 22:49:12 -0000 1.19 +++ lisp/bbdb-migrate.el 26 Sep 2003 20:36:58 -0000 @@ -101,9 +101,9 @@ ;;;###autoload (defun bbdb-migration-query (ondisk) - "Ask if the database is to be migrated. ONDISK is the version -number of the database as currently stored on disk. Returns the -version for the saved database." + "Ask if the database is to be migrated. +ONDISK is the version number of the database as currently stored on disk. +Returns the version for the saved database." (save-excursion (let ((wc (current-window-configuration)) (buf (get-buffer-create "*BBDB Migration Info*")) @@ -135,7 +135,11 @@ (y-or-n-p (concat "Upgrade BBDB to version " (format "%d" bbdb-file-format) "? "))) - (delete-window win) + (condition-case nil + (delete-window win) + ;; The window might be the only one on its frame. Hopefully, it's + ;; a dedicated window and the kill-buffer below will DTRT. + (error nil)) (kill-buffer buf) (set-window-configuration wc) (if update bbdb-file-format ondisk)))) Index: lisp/bbdb-snarf.el =================================================================== RCS file: /cvsroot/bbdb/bbdb/lisp/bbdb-snarf.el,v retrieving revision 1.38 diff -u -r1.38 bbdb-snarf.el --- lisp/bbdb-snarf.el 7 Mar 2003 22:12:41 -0000 1.38 +++ lisp/bbdb-snarf.el 26 Sep 2003 20:36:58 -0000 @@ -37,7 +37,6 @@ (require 'rfc822) (require 'mail-extr) -(defconst digit "[0-9]") (defvar bbdb-snarf-phone-regexp (concat "\\(([2-9][0-9][0-9])[-. ]?\\|[2-9][0-9][0-9][-. ]\\)?" @@ -46,11 +45,12 @@ ) "regexp to match phones.") (defvar bbdb-snarf-zip-regexp - (concat - "\\<" - digit digit digit digit digit - "\\(-" digit digit digit digit "\\)?" - "\\>$") + (let ((digit "[0-9]")) + (concat + "\\<" + digit digit digit digit digit + "\\(-" digit digit digit digit "\\)?" + "\\>$")) "regexp matching zip.") (defcustom bbdb-snarf-web-prop 'www ------------------------------------------------------- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf _______________________________________________ [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/bbdb-info BBDB Home Page: http://bbdb.sourceforge.net/