[Commit-womb] addressbook ChangeLog addressbook.el

[Jose E. Marchesi]

CVSROOT:        /cvsroot/womb
Module name:    addressbook
Changes by:     Jose E. Marchesi <jemarch>      07/05/07 19:28:25

Modified files:
        .              : ChangeLog addressbook.el 

Log message:
        addrbook-quit fixed

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/addressbook/ChangeLog?cvsroot=womb&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/addressbook/addressbook.el?cvsroot=womb&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/womb/addressbook/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ChangeLog   7 May 2007 19:11:31 -0000       1.11
+++ ChangeLog   7 May 2007 19:28:25 -0000       1.12
@@ -4,6 +4,7 @@
        the summary.
        Sources reestructured.
        (addrbook-summary-display): renamed from `addrbook-summary-redisplay'
+       (addrbook-quit): Fixed.
 
 2007-05-06  Jose E. Marchesi  <address@hidden>
 

Index: addressbook.el
===================================================================
RCS file: /cvsroot/womb/addressbook/addressbook.el,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- addressbook.el      7 May 2007 19:18:08 -0000       1.11
+++ addressbook.el      7 May 2007 19:28:25 -0000       1.12
@@ -5,7 +5,7 @@
 ;; Maintainer: Jose E. Marchesi
 ;; Keywords: contacts, applications
 
-;; $Id: addressbook.el,v 1.11 2007/05/07 19:18:08 jemarch Exp $
+;; $Id: addressbook.el,v 1.12 2007/05/07 19:28:25 jemarch Exp $
 
 ;; This file is NOT part of GNU Emacs.
 
@@ -1673,16 +1673,16 @@
            (yes-or-no-p "Save addressbook? "))
       (addrbook-save-cards nil))
   (let ((contact-buffer (get-buffer addrbook-contact-buffer-name))
-        (summary-buffer (get-buffer addrbook-summary-buffer-name)))
-    (if summary-buffer
+        (summary-buffer (get-buffer addrbook-summary-buffer-name))
+        win window-list)
+    (when summary-buffer
+      ;; Delete windows (and possibly frames)
+      (delete-windows-on summary-buffer)
         (kill-buffer summary-buffer))
-    (if contact-buffer
-      (if (equal (length (window-list)) 1)
-          (progn
-            (kill-buffer addrbook-buffer)
-            (delete-frame))
-        (kill-buffer-and-window)))))
-
+    (when contact-buffer
+      ;; Delete windows (and possibly frames)
+      (delete-windows-on contact-buffer)
+      (kill-buffer contact-buffer))))
 
 ;;;; Backend management