[elpa] externals/ebdb 59449b9 10/11: New defsubst ebdb-record-self

[Eric Abrahamsen]

branch: externals/ebdb
commit 59449b9d161e5dd2ee368cb8aeff5a24c3c65b02
Author: Eric Abrahamsen <address@hidden>
Commit: Eric Abrahamsen <address@hidden>

    New defsubst ebdb-record-self
    
    * ebdb.el (ebdb-record-self): Convenience subst for returning the self
      record.
      (ebdb-field-phone-signal-text): Use it.
    * ebdb-mua.el (ebdb-get-user-mail-address-re): Use it.
    * ebdb-com.el (ebdb-signal-text): Use it.
---
 ebdb-com.el | 2 +-
 ebdb-mua.el | 2 +-
 ebdb.el     | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ebdb-com.el b/ebdb-com.el
index 449049a..a2aeb36 100644
--- a/ebdb-com.el
+++ b/ebdb-com.el
@@ -2638,7 +2638,7 @@ message."
   (interactive
    (list (or (and ebdb-record-self
                  (ebdb-signal-get-number
-                  (ebdb-gethash ebdb-record-self 'uuid)
+                  (ebdb-record-self)
                   t))
             (ebdb-read-string
              "Number to send from (or set `ebdb-record-self'): "))
diff --git a/ebdb-mua.el b/ebdb-mua.el
index d2cc931..a33eb4e 100644
--- a/ebdb-mua.el
+++ b/ebdb-mua.el
@@ -223,7 +223,7 @@ accordingly."
   (cond ((stringp ebdb-user-mail-address-re)
         ebdb-user-mail-address-re)
        ((eq ebdb-user-mail-address-re 'self)
-        (let ((self-rec (ebdb-gethash ebdb-record-self 'uuid)))
+        (let ((self-rec (ebdb-record-self)))
           (unless self-rec
             (user-error "`ebdb-user-mail-address-re' set to 'self, but 
`ebdb-record-self' is not set."))
           (setq ebdb-user-mail-address-re
diff --git a/ebdb.el b/ebdb.el
index bc91c72..3fc86bb 100644
--- a/ebdb.el
+++ b/ebdb.el
@@ -500,6 +500,10 @@ It takes one argument, the name as extracted by
   :group 'ebdb-utilities
   :type 'function)
 
+(defsubst ebdb-record-self ()
+  "Return the \"self\" record"
+  (ebdb-gethash ebdb-record-self 'uuid))
+
 ;;; Record editing
 
 (defcustom ebdb-default-separator '("[,;]" ", ")
@@ -4320,7 +4324,7 @@ command's docstring for more details."
   (let ((sender
         (or (and ebdb-record-self
                  (ebdb-signal-get-number
-                  (ebdb-gethash ebdb-record-self 'uuid)
+                  (ebdb-record-self)
                   t))
             (ebdb-read-string
              "Number to send from (or set `ebdb-record-self'): ")))