Hi all,
I did some work on the tarball I downloaded last week... But I don't
have CVS access (nor do I want it, because I have an internet
connection at work but do my BBDB related hacking at home). Can
somebody with write access take a look at these?
Other than the patch appended -- is the following warning an
Emacs-only thing?
While compiling bbdb-complete-name:
** auto-fill-hook is an obsolete variable; use auto-fill-function instead.
** reference to free variable auto-fill-hook
Alex.
cvs diff: Diffing .
Index: ChangeLog
===================================================================
RCS file: /home/cvsroot/emacs/bbdb2/ChangeLog,v
retrieving revision 1.1.1.1
retrieving revision 1.3
diff -c -r1.1.1.1 -r1.3
*** ChangeLog 2000/05/24 22:47:11 1.1.1.1
--- ChangeLog 2000/05/25 00:02:56 1.3
***************
*** 1,3 ****
--- 1,15 ----
+ 2000-05-25 Alex Schroeder <[EMAIL PROTECTED]>
+
+ * lisp/bbdb-migrate.el (bbdb-unmigrate-record): Fixed a paren typo
+ and tried to work some more on the backmigration code from 5 -> 4.
+
+ * lisp/bbdb-com.el (bbdb-address-edit-default): Fixed assignment
+ to free variable. Rewrote street input.
+ * lisp/bbdb.el (bbdb-format-address-continental): Fixed assignment
+ to free variable.
+ (bbdb-format-address-default): Fixed assignment
+ to free variable.
+
2000-04-13 Jochen K�pper <[EMAIL PROTECTED]>
* tex/bbdb-print-brief.tex, tex/bbdb-print.tex: Use ec fonts
cvs diff: Diffing lisp
Index: lisp/bbdb-com.el
===================================================================
RCS file: /home/cvsroot/emacs/bbdb2/lisp/bbdb-com.el,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 bbdb-com.el
*** lisp/bbdb-com.el 2000/05/24 22:47:11 1.1.1.1
--- lisp/bbdb-com.el 2000/05/25 00:15:17
***************
*** 915,932 ****
State: state
Zip Code: zip
Country: country"
! (let* ((stn 0)
! (str nil)
! (crd
! (while (not
! (string= ""
! (setq st (bbdb-read-string
! (format "Street, line %d: " (+ 1 stn))
! (nth stn
! (bbdb-address-streets addr))))))
! (setq str (append str (list st)))
! (setq stn (+ 1 stn))))
!
(cty (bbdb-read-string "City: " (bbdb-address-city addr)))
(ste (bbdb-read-string "State: " (bbdb-address-state addr)))
(zip (bbdb-error-retry
--- 915,927 ----
State: state
Zip Code: zip
Country: country"
! (let* ((str (let ((l) (s) (n 0))
! (while (not (string= "" (setq s (bbdb-read-string
! (format "Street, line %d: " (+ 1 n))
! (nth n (bbdb-address-streets
addr))))))
! (setq l (append l (list s)))
! (setq n (1+ n)))
! l))
(cty (bbdb-read-string "City: " (bbdb-address-city addr)))
(ste (bbdb-read-string "State: " (bbdb-address-state addr)))
(zip (bbdb-error-retry
Index: lisp/bbdb-migrate.el
===================================================================
RCS file: /home/cvsroot/emacs/bbdb2/lisp/bbdb-migrate.el,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -c -r1.1.1.1 -r1.2
*** lisp/bbdb-migrate.el 2000/05/24 22:47:11 1.1.1.1
--- lisp/bbdb-migrate.el 2000/05/25 00:17:39 1.2
***************
*** 176,206 ****
`bbdb-file-format-migration')."
(cond
;; Version 5 -> 4
! ((= (cdr bbdb-file-format-migration 4))
;; Take all the old addresses, ie. the 5th field, and for each
;; address, render the third element (a list of streets) as three
;; vector elements (v4-style address). If there's more than 3
;; lines, everything remaining gets crammed into the third, using
;; commas to separate the bits. If there's less, fill out with nil.
(let ((old-addr-list (aref record 5))
! (new-addr-list))
(while old-addr-list
! (let* ((old-addr (car old-addr-list))
! new-addr
! streets (aref old-addr 1))
! (setq new-addr (vector (aref old-addr 0) ;; tag
! (nth 0 streets)
! (nth 1 streets)
! (if (> (length
streets) 3)
! (mapconcat
func streets ", ")
! (nth 3 streets))
! (aref old-addr 2) ;;
city
! (aref old-addr 3) ;;
state
! (aref old-addr 4) ;;
zip
! (aref old-addr 5)))
;; country
! (setq old-addr-list (cdr old-addr-list))
! (setq new-addr-list (append new-addr-list (list new-addr)))))
! (aset record 5 new-addr-list))
;; Version 4 -> 3
((= (cdr bbdb-file-format-migration) 3)
--- 176,209 ----
`bbdb-file-format-migration')."
(cond
;; Version 5 -> 4
! ((= (cdr bbdb-file-format-migration) 4)
;; Take all the old addresses, ie. the 5th field, and for each
;; address, render the third element (a list of streets) as three
;; vector elements (v4-style address). If there's more than 3
;; lines, everything remaining gets crammed into the third, using
;; commas to separate the bits. If there's less, fill out with nil.
(let ((old-addr-list (aref record 5))
! (new-addr-list))
(while old-addr-list
! (let* ((old-addr (car old-addr-list))
! (new-addr)
! (streets (aref old-addr 1)))
! (setq new-addr (vector (aref old-addr 0) ;; tag
! (nth 0 streets)
! (nth 1 streets)
! (if (> (length streets) 3)
! (let ((more-streets) (i 4))
! (while (<= i (length streets))
! (add-to-list 'more-streets (nth i streets)))
! (mapconcat 'concat more-streets ", "))
! (nth 3 streets))
! (aref old-addr 2) ;; city
! (aref old-addr 3) ;; state
! (aref old-addr 4) ;; zip
! (aref old-addr 5))) ;; country
! (setq old-addr-list (cdr old-addr-list))
! (setq new-addr-list (append new-addr-list (list new-addr)))))
! (aset record 5 new-addr-list)))
;; Version 4 -> 3
((= (cdr bbdb-file-format-migration) 3)
***************
*** 210,227 ****
;; illegal version 3 (as used in 2.00.06) zip codes. This problem
;; has not been solved.
(let ((old-addr-list (aref record 5))
! (new-addr-list))
(while old-addr-list
! (let* ((old-addr (car old-addr-list))
! (len (1- (length old-addr)))
! (new-addr (make-vector len nil))
! (i 0))
! (setq old-addr-list (cdr old-addr-list))
! (while (< i len)
! (aset new-addr i (aref old-addr i))
! (setq i (1+ i)))
! (setq new-addr-list (append new-addr-list (list new-addr)))))
! (aset record 5 new-addr-list)))
;; Version 3 -> 2
((= (cdr bbdb-file-format-migration) 2)
(bbdb-migrate-record record '((bbdb-record-raw-notes
--- 213,230 ----
;; illegal version 3 (as used in 2.00.06) zip codes. This problem
;; has not been solved.
(let ((old-addr-list (aref record 5))
! (new-addr-list))
(while old-addr-list
! (let* ((old-addr (car old-addr-list))
! (len (1- (length old-addr)))
! (new-addr (make-vector len nil))
! (i 0))
! (setq old-addr-list (cdr old-addr-list))
! (while (< i len)
! (aset new-addr i (aref old-addr i))
! (setq i (1+ i)))
! (setq new-addr-list (append new-addr-list (list new-addr)))))
! (aset record 5 new-addr-list)))
;; Version 3 -> 2
((= (cdr bbdb-file-format-migration) 2)
(bbdb-migrate-record record '((bbdb-record-raw-notes
Index: lisp/bbdb.el
===================================================================
RCS file: /home/cvsroot/emacs/bbdb2/lisp/bbdb.el,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -c -r1.1.1.1 -r1.2
*** lisp/bbdb.el 2000/05/24 22:47:11 1.1.1.1
--- lisp/bbdb.el 2000/05/24 22:51:35 1.2
***************
*** 1032,1039 ****
(> (length c) 0))
(> (length s) 0)) ", " "")
s "\n"))))
! (if (= 0 (length (setq str (bbdb-address-country addr)))) nil
! (indent-to 17) (insert str "\n")))
(defun bbdb-format-address-default (addr)
"Insert formated address ADDR in current buffer.
--- 1032,1040 ----
(> (length c) 0))
(> (length s) 0)) ", " "")
s "\n"))))
! (let ((str (bbdb-address-country addr)))
! (if (= 0 (length str)) nil
! (indent-to 17) (insert str "\n"))))
(defun bbdb-format-address-default (addr)
"Insert formated address ADDR in current buffer.
***************
*** 1064,1071 ****
(> (length s) 0))
(> (length z) 0)) " " "")
z "\n"))))
! (if (= 0 (length (setq str (bbdb-address-country addr)))) nil
! (indent-to 17) (insert str "\n")))
(defun bbdb-format-address (addr &optional printing)
"Call appropriate formatting function for address ADDR.
--- 1065,1073 ----
(> (length s) 0))
(> (length z) 0)) " " "")
z "\n"))))
! (let ((str (bbdb-address-country addr)))
! (if (= 0 (length str)) nil
! (indent-to 17) (insert str "\n"))))
(defun bbdb-format-address (addr &optional printing)
"Call appropriate formatting function for address ADDR.
cvs diff: Diffing misc
cvs diff: Diffing tex
cvs diff: Diffing texinfo
cvs diff: Diffing utils
_______________________________________________
bbdb-info mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/mailman/listinfo/bbdb-info
