branch: externals/ebdb
commit 684452c22ba8aa6bfb5cec8e34cc1acdb62c8d31
Author: Eric Abrahamsen <e...@ericabrahamsen.net>
Commit: Eric Abrahamsen <e...@ericabrahamsen.net>

    Interpret an empty street list as a desire to quit address reading
    
    * ebdb.el (ebdb-edit-address-street): All address fields now catch
    quit/ebdb-empty, meaning there was no way to escape from address
    reading! Interpret an empty list of streets as the intention to abort
    the reading of an address altogether.
---
 ebdb.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ebdb.el b/ebdb.el
index c9d8f6d..7cd8f88 100644
--- a/ebdb.el
+++ b/ebdb.el
@@ -1923,7 +1923,9 @@ Primary sorts before normal sorts before defunct."
          (push street list)
          (setq n (1+ n)))
       ((ebdb-empty quit) nil))
-    (reverse list)))
+    (if list
+       (reverse list)
+      (signal 'ebdb-empty (list 'ebdb-field-address)))))
 
 (cl-defmethod ebdb-string ((address ebdb-field-address))
   (funcall ebdb-default-address-format-function address))

Reply via email to