diff options
| author | Sam Steingold <sds@goems.com> | 2001-01-24 20:44:01 +0000 |
|---|---|---|
| committer | Sam Steingold <sds@goems.com> | 2001-01-24 20:44:01 +0000 |
| commit | c1d677b8c22d8d4995ac3b6109239d90bceb4260 (patch) | |
| tree | 29ad1ac30548e62de08c14853203c858afff9c4a | |
| parent | 6e2484f61e690a1302517057c6d3f8d94e694949 (diff) | |
lisp/bbdb-merge.el (bbdb-merge-file): bugfix:
the parameter for `match-fun' is `rec', not `r'
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | lisp/bbdb-merge.el | 21 |
2 files changed, 21 insertions, 15 deletions
@@ -1,3 +1,8 @@ +2001-01-24 Sam Steingold <sds@gnu.org> + + * lisp/bbdb-merge.el (bbdb-merge-file): bugfix: + the parameter for `match-fun' is `rec', not `r' + 2001-01-18 Ronan Waide <waider@waider.ie> * lisp/bbdb-vm.el: Proper fix for VM windowing bug @@ -7,8 +12,8 @@ * lisp/bbdb.el (bbdb-always-add-addresses): Docfix * lisp/bbdb-vm.el (bbdb/vm-update-record): - Restored old behavior of returning one record - (bbdb/vm-update-records-mode): + Restored old behavior of returning one record + (bbdb/vm-update-records-mode): (bbdb/vm-update-records): Enhanced in order to allow annotating only new messages, which is now the default. This avoids the annoying questions repetition @@ -18,8 +23,8 @@ * lisp/bbdb-w3.el (bbdb-www-grab-homepage): Fix to read just one record not a list of records - * lisp/bbdb-xemacs.el (bbdb-sounds-directory): - (bbdb-sound-volume): + * lisp/bbdb-xemacs.el (bbdb-sounds-directory): + (bbdb-sound-volume): (bbdb-load-touchtones): Added variables & functions for Xemacs native sound support used by bbdb-dialing stuff @@ -69,7 +74,7 @@ * texinfo/bbdb.texinfo: Removed some things from the TODO list Removed the Log section - Added xref from 'BBDB Mailing Lists' to 'Using BBDB to implement + Added xref from 'BBDB Mailing Lists' to 'Using BBDB to implement Mailing Lists' A few other minor tweaks diff --git a/lisp/bbdb-merge.el b/lisp/bbdb-merge.el index ae9ae32..3f37928 100644 --- a/lisp/bbdb-merge.el +++ b/lisp/bbdb-merge.el @@ -9,7 +9,7 @@ ;;; smarter phone, notes and address merging. ;;;###autoload -(defun bbdb-merge-record( new-record &optional merge-record override ) +(defun bbdb-merge-record (new-record &optional merge-record override) "Generic merge function. Merges new-record into your bbdb, using DATE to check who's more @@ -170,15 +170,16 @@ Returns the Grand Unified Record." merge-record)) ;; fixme this could be a macro, I guess. -(defun bbdb-merge-strings( s1 s2 &optional sep ) - "Merge two strings together uniquely. If s1 doesn't contain s2, return s1+sep+s2." +(defun bbdb-merge-strings (s1 s2 &optional sep) + "Merge two strings together uniquely. +If s1 doesn't contain s2, return s1+sep+s2." (cond ((or (null s1) (string-equal s1 "")) s2) ((or (null s2) (string-equal s2 "")) s1) (t (if (string-match s2 s1) s1 (concat s1 (or sep "") s2))))) ;;;###autoload -(defun bbdb-merge-file( &optional bbdb-new override match-fun) +(defun bbdb-merge-file (&optional bbdb-new override match-fun) "Merge a bbdb file into the in-core bbdb." (interactive "fMerge bbdb file: ") (or bbdb-gag-messages @@ -198,12 +199,12 @@ Returns the Grand Unified Record." (bbdb-refile-notes-default-merge-function 'bbdb-merge-strings)) ;; merge everything - (mapcar (function (lambda(rec) - (bbdb-merge-record rec - (if match-fun - (funcall match-fun r) - nil) - override))) new-records)) + (mapcar (lambda(rec) + (bbdb-merge-record rec + (and match-fun + (funcall match-fun rec)) + override)) + new-records)) ;; hack (setq bbdb-buffer (or (get-file-buffer bbdb-file) nil))) |