[Emacs-diffs] Changes to emacs/lisp/net/eudc-export.el

[Pavel Janík]

Index: emacs/lisp/net/eudc-export.el
diff -c emacs/lisp/net/eudc-export.el:1.2 emacs/lisp/net/eudc-export.el:1.3
*** emacs/lisp/net/eudc-export.el:1.2   Mon Jul 16 03:46:48 2001
--- emacs/lisp/net/eudc-export.el       Sun Jan  6 10:05:08 2002
***************
*** 44,50 ****
  If SILENT is non-nil then the created BBDB record is not displayed."
    ;; This function runs in a special context where lisp symbols corresponding
    ;; to field names in record are bound to the corresponding values
!   (eval 
     `(let* (,@(mapcar '(lambda (c)
                        (list (car c) (if (listp (cdr c))
                                          (list 'quote (cdr c))
--- 44,50 ----
  If SILENT is non-nil then the created BBDB record is not displayed."
    ;; This function runs in a special context where lisp symbols corresponding
    ;; to field names in record are bound to the corresponding values
!   (eval
     `(let* (,@(mapcar '(lambda (c)
                        (list (car c) (if (listp (cdr c))
                                          (list 'quote (cdr c))
***************
*** 86,93 ****
                                              (cons (car mapping) value))))
                                       conversion-alist)))
        (setq bbdb-notes (delq nil bbdb-notes))
!       (setq bbdb-record (bbdb-create-internal bbdb-name 
!                                             bbdb-company 
                                              bbdb-net
                                              bbdb-address
                                              bbdb-phones
--- 86,93 ----
                                              (cons (car mapping) value))))
                                       conversion-alist)))
        (setq bbdb-notes (delq nil bbdb-notes))
!       (setq bbdb-record (bbdb-create-internal bbdb-name
!                                             bbdb-company
                                              bbdb-net
                                              bbdb-address
                                              bbdb-phones
***************
*** 98,104 ****
  (defun eudc-parse-spec (spec record recurse)
    "Parse the conversion SPEC using RECORD.
  If RECURSE is non-nil then SPEC may be a list of atomic specs."
!   (cond 
     ((or (stringp spec)
        (symbolp spec)
        (and (listp spec)
--- 98,104 ----
  (defun eudc-parse-spec (spec record recurse)
    "Parse the conversion SPEC using RECORD.
  If RECURSE is non-nil then SPEC may be a list of atomic specs."
!   (cond
     ((or (stringp spec)
        (symbolp spec)
        (and (listp spec)
***************
*** 149,155 ****
              zip (string-to-number (match-string 1 last1))))
         (t
        (error "Cannot parse the address"))))
!     (vector location 
            (or (nth 0 addr-components) "")
            (or (nth 1 addr-components) "")
            (or (nth 2 addr-components) "")
--- 149,155 ----
              zip (string-to-number (match-string 1 last1))))
         (t
        (error "Cannot parse the address"))))
!     (vector location
            (or (nth 0 addr-components) "")
            (or (nth 1 addr-components) "")
            (or (nth 2 addr-components) "")
***************
*** 162,168 ****
  PHONE is either a string supposedly containing a phone number or
  a list of such strings which are concatenated.
  LOCATION is used as the phone location for BBDB."
!   (cond 
     ((stringp phone)
      (let (phone-list)
        (condition-case err
--- 162,168 ----
  PHONE is either a string supposedly containing a phone number or
  a list of such strings which are concatenated.
  LOCATION is used as the phone location for BBDB."
!   (cond
     ((stringp phone)
      (let (phone-list)
        (condition-case err
***************
*** 180,186 ****
      (vector location (mapconcat 'identity phone ", ")))
     (t
      (error "Invalid phone specification"))))
!       
  (defun eudc-batch-export-records-to-bbdb ()
    "Insert all the records returned by a directory query into BBDB."
    (interactive)
--- 180,186 ----
      (vector location (mapconcat 'identity phone ", ")))
     (t
      (error "Invalid phone specification"))))
! 
  (defun eudc-batch-export-records-to-bbdb ()
    "Insert all the records returned by a directory query into BBDB."
    (interactive)