[Commit-womb] addressbook ChangeLog addressbook.el

[Jose E. Marchesi]

CVSROOT:        /cvsroot/womb
Module name:    addressbook
Changes by:     Jose E. Marchesi <jemarch>      07/05/08 08:36:08

Modified files:
        .              : ChangeLog addressbook.el 

Log message:
        Several fixes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/addressbook/ChangeLog?cvsroot=womb&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/addressbook/addressbook.el?cvsroot=womb&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/womb/addressbook/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- ChangeLog   7 May 2007 22:54:19 -0000       1.13
+++ ChangeLog   8 May 2007 08:36:08 -0000       1.14
@@ -1,3 +1,10 @@
+2007-05-08  Jose E. Marchesi  <address@hidden>
+
+       * addressbook.el (addrbook-summary): Remove call to `addrbook-open'.
+       (addrbook-summary-show-contact): Make the contact buffer read only.
+       (addrbook-summary-goto-contact): Make the contact buffer writable
+       before card displaying.
+
 2007-05-07  Jose E. Marchesi  <address@hidden>
 
        * addressbook.el (addrbook-summary-mode): Added mailer function to

Index: addressbook.el
===================================================================
RCS file: /cvsroot/womb/addressbook/addressbook.el,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- addressbook.el      8 May 2007 08:26:05 -0000       1.16
+++ addressbook.el      8 May 2007 08:36:08 -0000       1.17
@@ -5,7 +5,7 @@
 ;; Maintainer: Jose E. Marchesi
 ;; Keywords: contacts, applications
 
-;; $Id: addressbook.el,v 1.16 2007/05/08 08:26:05 jemarch Exp $
+;; $Id: addressbook.el,v 1.17 2007/05/08 08:36:08 jemarch Exp $
 
 ;; This file is NOT part of GNU Emacs.
 
@@ -1438,8 +1438,6 @@
   "Open the addressbook and show the summary window"
   (let ((buffer (get-buffer addrbook-summary-buffer-name)))
     (when (not buffer)
-      (when (not (get-buffer addrbook-contact-buffer-name))
-        (addrbook-open))
       (setq buffer (addrbook-make-summary-buffer)))
     (switch-to-buffer-other-window addrbook-summary-buffer)
     (addrbook-summary-goto-contact 0 t)))
@@ -1515,7 +1513,8 @@
                  (get-buffer addrbook-contact-buffer-name))
         (save-excursion
           (set-buffer (get-buffer addrbook-contact-buffer-name))
-          (addrbook-contact-display-card numcard))))))
+          (let (buffer-read-only)
+            (addrbook-contact-display-card numcard)))))))
 
 (defun addrbook-summary-get-current-card ()
   (get-text-property (point) 'card-index))
@@ -1549,7 +1548,8 @@
     (when (not (get-buffer addrbook-contact-buffer-name))
       (save-excursion
         (addrbook-create-contact-buffer)
-        (addrbook-contact-display-card card-index)))
+        (addrbook-contact-display-card card-index)
+        (setq buffer-read-only t)))
     (addrbook-show-contact)))
 
 ;; Modeline management
@@ -1812,8 +1812,7 @@
 (defun addrbook-open ()
   "Open the addressbook"
   (or (addrbook-read-cards)
-      (addrbook-create-card-2))
-  (addrbook-sort-cards))
+      (addrbook-create-card-2)))
 
 (defun addrbook-get-text-property-line (prop)
   "Return the value of text property PROP in the nearest position on current 
line
@@ -2077,6 +2076,7 @@
                             (read-from-minibuffer "Search for contact [RET 
goes to the summary]: "))))
           (unless (addrbook-open)
             (throw 'exit t))
+          (addrbook-sort-cards)
           (if (not (equal user-input ""))
               (let ((found-cards (addrbook-search-cards user-input)))
                 (if found-cards