emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/ebdb 365b9fb 7/9: Fix mua-auto-update customization val


From: Eric Abrahamsen
Subject: [elpa] externals/ebdb 365b9fb 7/9: Fix mua-auto-update customization values
Date: Tue, 13 Aug 2019 21:46:51 -0400 (EDT)

branch: externals/ebdb
commit 365b9fb2978141de9ef3ad343ce9e9261a8563c4
Author: Eric Abrahamsen <address@hidden>
Commit: Eric Abrahamsen <address@hidden>

    Fix mua-auto-update customization values
    
    * ebdb-mua.el (ebdb-mua-auto-update-p): One of the options had the
    wrong symbol: 'search instead of 'existing. The code looks for
    'existing. Also, clarify wording of option tags.
    (ebdb-mua-sender-update-p):
    (ebdb-mua-reader-update-p):
    * ebdb-vm.el (ebdb-vm-auto-update-p):
    * ebdb-rmail.el (ebdb-rmail-auto-update-p):
    * ebdb-mu4e.el (ebdb-mu4e-auto-update-p):
    * ebdb-mhe.el (ebdb-mhe-auto-update-p):
    * ebdb-message.el (ebdb-message-auto-update-p):
    * ebdb-gnus.el (ebdb-gnus-auto-update-p): Make change in all these
    places.
    * ebdb.org (Auto-Updating Records): Note the 'existing option in
    manual (previously neither this nor 'search were mentioned).
---
 ebdb-gnus.el    |   6 +--
 ebdb-message.el |   6 +--
 ebdb-mhe.el     |   6 +--
 ebdb-mu4e.el    |   6 +--
 ebdb-mua.el     |  22 +++++------
 ebdb-rmail.el   |   6 +--
 ebdb-vm.el      |   6 +--
 ebdb-wl.el      |   6 +--
 ebdb.info       | 121 ++++++++++++++++++++++++++++----------------------------
 ebdb.org        |  13 +++---
 ebdb.texi       |  13 +++---
 11 files changed, 107 insertions(+), 104 deletions(-)

diff --git a/ebdb-gnus.el b/ebdb-gnus.el
index ea059d8..77fa78e 100644
--- a/ebdb-gnus.el
+++ b/ebdb-gnus.el
@@ -38,10 +38,10 @@
 (defcustom ebdb-gnus-auto-update-p ebdb-mua-reader-update-p
   "Gnus-specific value of `ebdb-mua-auto-update-p'."
   :type '(choice (const :tag "do nothing" nil)
-                 (const :tag "search for existing records" search)
+                 (const :tag "search for existing records" existing)
                  (const :tag "update existing records" update)
-                 (const :tag "query annotation of all messages" query)
-                 (const :tag "annotate all messages" create)
+                 (const :tag "query for update or record creation" query)
+                 (const :tag "update or create automatically" create)
                  (function :tag "User-defined function")))
 
 (defcustom ebdb-gnus-window-size ebdb-default-window-size
diff --git a/ebdb-message.el b/ebdb-message.el
index 4701a82..808e163 100644
--- a/ebdb-message.el
+++ b/ebdb-message.el
@@ -39,10 +39,10 @@
 (defcustom ebdb-message-auto-update-p ebdb-mua-sender-update-p
   "Message-specific value of `ebdb-mua-auto-update-p'."
   :type '(choice (const :tag "do nothing" nil)
-                 (const :tag "search for existing records" search)
+                 (const :tag "search for existing records" existing)
                  (const :tag "update existing records" update)
-                 (const :tag "query annotation of all messages" query)
-                 (const :tag "annotate all messages" create)
+                 (const :tag "query for update or record creation" query)
+                 (const :tag "update or create automatically" create)
                  (function :tag "User-defined function")))
 
 (defcustom ebdb-message-window-size ebdb-default-window-size
diff --git a/ebdb-mhe.el b/ebdb-mhe.el
index 9a6146f..fdf147e 100644
--- a/ebdb-mhe.el
+++ b/ebdb-mhe.el
@@ -37,10 +37,10 @@
 (defcustom ebdb-mhe-auto-update-p ebdb-mua-reader-update-p
   "Mh-e-specific value of `ebdb-mua-auto-update-p'."
   :type '(choice (const :tag "do nothing" nil)
-                 (const :tag "search for existing records" search)
+                 (const :tag "search for existing records" existing)
                  (const :tag "update existing records" update)
-                 (const :tag "query annotation of all messages" query)
-                 (const :tag "annotate all messages" create)
+                 (const :tag "query for update or record creation" query)
+                 (const :tag "update or create automatically" create)
                  (function :tag "User-defined function")))
 
 (defcustom ebdb-mhe-window-size ebdb-default-window-size
diff --git a/ebdb-mu4e.el b/ebdb-mu4e.el
index 94024c5..5ede6d8 100644
--- a/ebdb-mu4e.el
+++ b/ebdb-mu4e.el
@@ -39,10 +39,10 @@
 (defcustom ebdb-mu4e-auto-update-p ebdb-mua-reader-update-p
   "Mu4e-specific value of `ebdb-mua-auto-update-p'."
   :type '(choice (const :tag "do nothing" nil)
-                 (const :tag "search for existing records" search)
+                 (const :tag "search for existing records" existing)
                  (const :tag "update existing records" update)
-                 (const :tag "query annotation of all messages" query)
-                 (const :tag "annotate all messages" create)
+                 (const :tag "query for update or record creation" query)
+                 (const :tag "update or create automatically" create)
                  (function :tag "User-defined function")))
 
 (defcustom ebdb-mu4e-window-size ebdb-default-window-size
diff --git a/ebdb-mua.el b/ebdb-mua.el
index 346e6a8..5fb859c 100644
--- a/ebdb-mua.el
+++ b/ebdb-mua.el
@@ -99,36 +99,36 @@ each individual MUA package."
   ;; Also: Used for communication between `ebdb-update-records'
   ;; and `ebdb-query-create'.
   :type '(choice (const :tag "do nothing" nil)
-                 (const :tag "search for existing records" search)
+                 (const :tag "search for existing records" existing)
                  (const :tag "update existing records" update)
-                 (const :tag "query annotation of all messages" query)
-                 (const :tag "annotate all messages" create)
+                 (const :tag "query for update or record creation" query)
+                 (const :tag "update or create automatically" create)
                  (function :tag "User-defined function")))
 
 (defcustom ebdb-mua-reader-update-p ebdb-mua-auto-update-p
-  "Value for `ebdb-mua-auto-update-p' for reader MUAs.
+  "Value of `ebdb-mua-auto-update-p' for reader MUAs.
 \"Reader\" MUAs are those that provide an interface for reading
 incoming messages and articles.
 
 Defaults to the value of `ebdb-mua-auto-update-p'."
   :type '(choice (const :tag "do nothing" nil)
-                 (const :tag "search for existing records" search)
+                 (const :tag "search for existing records" existing)
                  (const :tag "update existing records" update)
-                 (const :tag "query annotation of all messages" query)
-                 (const :tag "annotate all messages" create)
+                 (const :tag "query for update or record creation" query)
+                 (const :tag "update or create automatically" create)
                  (function :tag "User-defined function")))
 
 (defcustom ebdb-mua-sender-update-p ebdb-mua-auto-update-p
-  "Value for `ebdb-mua-auto-update-p' for sender MUAs.
+  "Value of `ebdb-mua-auto-update-p' for sender MUAs.
 \"Sender\" MUAs are those that govern mail composition.  EBDB
 currently only supports the \"message\" and \"mail\" MUAs.
 
 Defaults to the value of `ebdb-mua-auto-update-p'."
   :type '(choice (const :tag "do nothing" nil)
-                 (const :tag "search for existing records" search)
+                 (const :tag "search for existing records" existing)
                  (const :tag "update existing records" update)
-                 (const :tag "query annotation of all messages" query)
-                 (const :tag "annotate all messages" create)
+                 (const :tag "query for update or record creation" query)
+                 (const :tag "update or create automatically" create)
                  (function :tag "User-defined function")))
 
 (defcustom ebdb-message-headers
diff --git a/ebdb-rmail.el b/ebdb-rmail.el
index cfa42db..f9eb10b 100644
--- a/ebdb-rmail.el
+++ b/ebdb-rmail.el
@@ -36,10 +36,10 @@
 (defcustom ebdb-rmail-auto-update-p ebdb-mua-reader-update-p
   "Rmail-specific value of `ebdb-mua-auto-update-p'."
   :type '(choice (const :tag "do nothing" nil)
-                 (const :tag "search for existing records" search)
+                 (const :tag "search for existing records" existing)
                  (const :tag "update existing records" update)
-                 (const :tag "query annotation of all messages" query)
-                 (const :tag "annotate all messages" create)
+                 (const :tag "query for update or record creation" query)
+                 (const :tag "update or create automatically" create)
                  (function :tag "User-defined function")))
 
 (defcustom ebdb-rmail-window-size ebdb-default-window-size
diff --git a/ebdb-vm.el b/ebdb-vm.el
index 1ca0aeb..09552b1 100644
--- a/ebdb-vm.el
+++ b/ebdb-vm.el
@@ -59,10 +59,10 @@
 (defcustom ebdb-vm-auto-update-p ebdb-mua-reader-update-p
   "VM-specific value of `ebdb-mua-auto-update-p'."
   :type '(choice (const :tag "do nothing" nil)
-                 (const :tag "search for existing records" search)
+                 (const :tag "search for existing records" existing)
                  (const :tag "update existing records" update)
-                 (const :tag "query annotation of all messages" query)
-                 (const :tag "annotate all messages" create)
+                 (const :tag "query for update or record creation" query)
+                 (const :tag "update or create automatically" create)
                  (function :tag "User-defined function")))
 
 (defun ebdb/vm-header (header)
diff --git a/ebdb-wl.el b/ebdb-wl.el
index e6e4997..123a23e 100644
--- a/ebdb-wl.el
+++ b/ebdb-wl.el
@@ -45,10 +45,10 @@
 (defcustom ebdb-wl-auto-update-p ebdb-mua-reader-update-p
   "Wl-specific value of `ebdb-m-auto-update-p'."
   :type '(choice (const :tag "do nothing" nil)
-                 (const :tag "search for existing records" search)
+                 (const :tag "search for existing records" existing)
                  (const :tag "update existing records" update)
-                 (const :tag "query annotation of all messages" query)
-                 (const :tag "annotate all messages" create)
+                 (const :tag "query for update or record creation" query)
+                 (const :tag "update or create automatically" create)
                  (function :tag "User-defined function")))
 
 (defcustom ebdb-wl-window-size ebdb-default-window-size
diff --git a/ebdb.info b/ebdb.info
index 0650566..10d17f5 100644
--- a/ebdb.info
+++ b/ebdb.info
@@ -698,12 +698,13 @@ option governing this behavior is:
  -- User Option: ebdb-mua-auto-update-p
      This option determines how EBDB acts upon mail addresses found in
      incoming messages.  If nil, nothing will happen.  Other options
-     include the symbols ‘update’ (only find existing records, and
-     update their name and mail fields as necessary), ‘query’ (find
-     existing records, and query about the editing and creation of new
-     records), and ‘create’ (automatically create new records).  A value
-     of ‘t’ is considered equivalent to ‘create’.  The option can also
-     be set to a function which returns one of the above symbols.
+     include the symbols ‘existing’ (only search for and display
+     existing records), ‘update’ (only find existing records, and update
+     their name and mail fields as necessary), ‘query’ (find existing
+     records, and query about the editing and creation of new records),
+     and ‘create’ (automatically create new records).  A value of ‘t’ is
+     considered equivalent to ‘create’.  The option can also be set to a
+     function which returns one of the above symbols.
 
    This option only governs what EBDB does automatically, each time a
 message is displayed.  The same process can be run interactively using
@@ -2295,13 +2296,13 @@ File: ebdb.info,  Node: Index,  Prev: Hacking EBDB,  
Up: Top
 * E <1>:                                 The Basics of ebdb-mode.
                                                               (line  37)
 * ebdb-accept-header-list:               Auto-Updating Records.
-                                                              (line  57)
+                                                              (line  58)
 * ebdb-add-aka:                          Auto-Updating Records.
-                                                              (line  46)
+                                                              (line  47)
 * ebdb-add-mails:                        Auto-Updating Records.
-                                                              (line  50)
+                                                              (line  51)
 * ebdb-add-name:                         Auto-Updating Records.
-                                                              (line  42)
+                                                              (line  43)
 * ebdb-buffer-name:                      EBDB Buffers.        (line  14)
 * ebdb-case-fold-search:                 Changing Search Behavior.
                                                               (line   8)
@@ -2383,7 +2384,7 @@ File: ebdb.info,  Node: Index,  Prev: Hacking EBDB,  Up: 
Top
 * ebdb-format-to-tmp-buffer:             Exporting/Formatting.
                                                               (line  15)
 * ebdb-gnus-auto-update-p:               Auto-Updating Records.
-                                                              (line  36)
+                                                              (line  37)
 * ebdb-gnus-post-style-function:         Posting Styles.      (line  13)
 * ebdb-hash-extra-predicates:            Fast Lookups.        (line  30)
 * ebdb-hashtable:                        Fast Lookups.        (line  10)
@@ -2394,7 +2395,7 @@ File: ebdb.info,  Node: Index,  Prev: Hacking EBDB,  Up: 
Top
 * ebdb-i18n-countries-pref-scripts:      Internationalization.
                                                               (line  47)
 * ebdb-ignore-header-list:               Auto-Updating Records.
-                                                              (line  61)
+                                                              (line  62)
 * ebdb-info:                             The Basics of ebdb-mode.
                                                               (line 118)
 * ebdb-init-field:                       Init and Delete Methods.
@@ -2417,16 +2418,16 @@ File: ebdb.info,  Node: Index,  Prev: Hacking EBDB,  
Up: Top
 * ebdb-make-buffer-name:                 Writing Integration For New MUAs.
                                                               (line  54)
 * ebdb-message-auto-update-p:            Auto-Updating Records.
-                                                              (line  36)
+                                                              (line  37)
 * ebdb-message-clean-name-function:      Sender name display. (line  14)
 * ebdb-message-mail-as-name:             Sender name display. (line  18)
 * ebdb-mhe-auto-update-p:                Auto-Updating Records.
-                                                              (line  36)
+                                                              (line  37)
 * ebdb-migrate-from-bbdb:                Record Migration.    (line   6)
 * ebdb-migrate-from-org-contacts:        Migration from Org Contacts.
                                                               (line   6)
 * ebdb-mu4e-auto-update-p:               Auto-Updating Records.
-                                                              (line  36)
+                                                              (line  37)
 * ebdb-mua-article-body:                 Article snarfing.    (line  13)
 * ebdb-mua-article-signature:            Article snarfing.    (line  16)
 * ebdb-mua-auto-update:                  Writing Integration For New MUAs.
@@ -2456,9 +2457,9 @@ File: ebdb.info,  Node: Index,  Prev: Hacking EBDB,  Up: 
Top
 * ebdb-mua-prepare-article:              Writing Integration For New MUAs.
                                                               (line  47)
 * ebdb-mua-reader-update-p:              Auto-Updating Records.
-                                                              (line  33)
+                                                              (line  34)
 * ebdb-mua-sender-update-p:              Auto-Updating Records.
-                                                              (line  30)
+                                                              (line  31)
 * ebdb-mua-snarf-article:                Interactive Commands.
                                                               (line  33)
 * ebdb-mua-summary-mark:                 Summary buffer marks.
@@ -2498,12 +2499,12 @@ File: ebdb.info,  Node: Index,  Prev: Hacking EBDB,  
Up: Top
                                                               (line  50)
 * ebdb-record-self:                      Creating Records.    (line  21)
 * ebdb-record-self <1>:                  Auto-Updating Records.
-                                                              (line  65)
+                                                              (line  66)
 * ebdb-reformat-records:                 The Basics of ebdb-mode.
                                                               (line  82)
 * ebdb-rename-buffer:                    EBDB Buffers.        (line  23)
 * ebdb-rmail-auto-update-p:              Auto-Updating Records.
-                                                              (line  36)
+                                                              (line  37)
 * ebdb-save:                             The Basics of ebdb-mode.
                                                               (line 121)
 * ebdb-save-on-exit:                     The EBDB Database.   (line  78)
@@ -2522,11 +2523,11 @@ File: ebdb.info,  Node: Index,  Prev: Hacking EBDB,  
Up: Top
 * ebdb-try-speedups:                     The EBDB Database.   (line  84)
 * ebdb-use-diary:                        Diary Integration.   (line  13)
 * ebdb-user-name-address-re:             Auto-Updating Records.
-                                                              (line  65)
+                                                              (line  66)
 * ebdb-vm-auto-update-p:                 Auto-Updating Records.
-                                                              (line  36)
+                                                              (line  37)
 * ebdb-wl-auto-update-p:                 Auto-Updating Records.
-                                                              (line  36)
+                                                              (line  37)
 * Editing fields:                        Editing Existing Fields.
                                                               (line   6)
 * f:                                     Exporting/Formatting.
@@ -2631,44 +2632,44 @@ Node: Loading MUA Code20835
 Node: Display and Updating21548
 Node: Pop-up Buffers22314
 Node: Auto-Updating Records24234
-Node: Noticing and Automatic Rules27350
-Node: Interactive Commands28683
-Node: EBDB and MUA summary buffers31157
-Node: Sender name display31675
-Node: Summary buffer marks32902
-Node: Mail Address Completion34081
-Node: A Note on Completion36590
-Node: Specific MUAs37213
-Node: Gnus37361
-Node: Posting Styles37583
-Node: EBDB Buffers39158
-Node: Searching40369
-Node: Changing Search Behavior42083
-Node: The Basics of ebdb-mode43330
-Node: Customizing Record Display47639
-Node: Marking51959
-Node: Exporting/Formatting52386
-Node: Completion53321
-Node: Snarfing54117
-Node: Internationalization56134
-Node: Diary Integration58835
-Node: Mail Aliases59700
-Node: vCard Support60414
-Node: Org Integration60913
-Node: Citing Records62811
-Node: Hacking EBDB63569
-Node: Field Classes66160
-Node: Init and Delete Methods69296
-Node: The Labeled Field Class70803
-Node: The Singleton Field Class71657
-Node: Actions72095
-Node: Custom Field Searching72767
-Node: Fast Lookups75634
-Node: Formatting in the EBDB Buffer77444
-Node: Writing Internationalization Libraries79520
-Node: Writing Integration For New MUAs83934
-Node: Article snarfing87382
-Node: Index88100
+Node: Noticing and Automatic Rules27418
+Node: Interactive Commands28751
+Node: EBDB and MUA summary buffers31225
+Node: Sender name display31743
+Node: Summary buffer marks32970
+Node: Mail Address Completion34149
+Node: A Note on Completion36658
+Node: Specific MUAs37281
+Node: Gnus37429
+Node: Posting Styles37651
+Node: EBDB Buffers39226
+Node: Searching40437
+Node: Changing Search Behavior42151
+Node: The Basics of ebdb-mode43398
+Node: Customizing Record Display47707
+Node: Marking52027
+Node: Exporting/Formatting52454
+Node: Completion53389
+Node: Snarfing54185
+Node: Internationalization56202
+Node: Diary Integration58903
+Node: Mail Aliases59768
+Node: vCard Support60482
+Node: Org Integration60981
+Node: Citing Records62879
+Node: Hacking EBDB63637
+Node: Field Classes66228
+Node: Init and Delete Methods69364
+Node: The Labeled Field Class70871
+Node: The Singleton Field Class71725
+Node: Actions72163
+Node: Custom Field Searching72835
+Node: Fast Lookups75702
+Node: Formatting in the EBDB Buffer77512
+Node: Writing Internationalization Libraries79588
+Node: Writing Integration For New MUAs84002
+Node: Article snarfing87450
+Node: Index88168
 
 End Tag Table
 
diff --git a/ebdb.org b/ebdb.org
index fdfa8bf..7a55736 100644
--- a/ebdb.org
+++ b/ebdb.org
@@ -507,12 +507,13 @@ option governing this behavior is:
 #+begin_defopt
 This option determines how EBDB acts upon mail addresses found in
 incoming messages.  If nil, nothing will happen.  Other options
-include the symbols ~update~ (only find existing records, and update
-their name and mail fields as necessary), ~query~ (find existing
-records, and query about the editing and creation of new records), and
-~create~ (automatically create new records).  A value of ~t~ is
-considered equivalent to ~create~.  The option can also be set to a
-function which returns one of the above symbols.
+include the symbols ~existing~ (only search for and display existing
+records), ~update~ (only find existing records, and update their name
+and mail fields as necessary), ~query~ (find existing records, and
+query about the editing and creation of new records), and ~create~
+(automatically create new records).  A value of ~t~ is considered
+equivalent to ~create~.  The option can also be set to a function
+which returns one of the above symbols.
 #+end_defopt
 
 This option only governs what EBDB does automatically, each time a
diff --git a/ebdb.texi b/ebdb.texi
index fd88560..050ade4 100644
--- a/ebdb.texi
+++ b/ebdb.texi
@@ -725,12 +725,13 @@ option governing this behavior is:
 @defopt ebdb-mua-auto-update-p
 This option determines how EBDB acts upon mail addresses found in
 incoming messages.  If nil, nothing will happen.  Other options
-include the symbols @code{update} (only find existing records, and update
-their name and mail fields as necessary), @code{query} (find existing
-records, and query about the editing and creation of new records), and
-@code{create} (automatically create new records).  A value of @code{t} is
-considered equivalent to @code{create}.  The option can also be set to a
-function which returns one of the above symbols.
+include the symbols @code{existing} (only search for and display existing
+records), @code{update} (only find existing records, and update their name
+and mail fields as necessary), @code{query} (find existing records, and
+query about the editing and creation of new records), and @code{create}
+(automatically create new records).  A value of @code{t} is considered
+equivalent to @code{create}.  The option can also be set to a function
+which returns one of the above symbols.
 @end defopt
 
 This option only governs what EBDB does automatically, each time a



reply via email to

[Prev in Thread] Current Thread [Next in Thread]