[elpa] externals/ebdb 52d3d54 113/350: Remove all pop-up-window-size type options

[Eric Abrahamsen]

branch: externals/ebdb
commit 52d3d540fe1250bc92cf2b5dbedfd162630f0de6
Author: Eric Abrahamsen <address@hidden>
Commit: Eric Abrahamsen <address@hidden>

    Remove all pop-up-window-size type options
    
    At the moment, the position and size of pop-up windows are hard-coded
    in MUA code. Re-introduce options as and when users demand them.
    
    * ebdb-com.el: Remove `ebdb-pop-up-window-size' and
      `ebdb-horiz-pop-up-window-size'.
    * ebdb-mua.el: Remove `ebdb-mua-pop-up-window-size' and
      `ebdb-mua-horiz-pop-up-window-size'.  Remove let bindings from
      various commands.
    * ebdb.org: Basic documentation of this.
---
 ebdb-com.el | 26 --------------------------
 ebdb-mua.el | 42 ++++--------------------------------------
 ebdb.org    | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 64 deletions(-)

diff --git a/ebdb-com.el b/ebdb-com.el
index 98b2e73..7e35f33 100644
--- a/ebdb-com.el
+++ b/ebdb-com.el
@@ -55,29 +55,6 @@ and redisplay it after the field is edited.")
   "Variables that affect the display of EBDB records"
   :group 'ebdb)
 
-(defcustom ebdb-pop-up-window-size 0.5
-  "Vertical size of EBDB window (vertical split).
-If it is an integer number, it is the number of lines used by EBDB.
-If it is a fraction between 0.0 and 1.0 (inclusive), it is the fraction
-of the tallest existing window that EBDB will take over.
-If it is t use `display-buffer'/`pop-to-buffer' to create the EBDB window.
-See also `ebdb-mua-pop-up-window-size'."
-  :group 'ebdb-record-display
-  :type '(choice (number :tag "EBDB window size")
-                 (const :tag "Use `pop-to-buffer'" t)))
-
-(defcustom ebdb-horiz-pop-up-window-size '(112 . 0.3)
-  "Horizontal size of a pop-up EBDB window (horizontal split).
-It is a cons pair (TOTAL . EBDB-SIZE).
-The window that will be considered for horizontal splitting must have
-at least TOTAL columns. EBDB-SIZE is the horizontal size of the EBDB window.
-If it is an integer number, it is the number of columns used by EBDB.
-If it is a fraction between 0 and 1, it is the fraction of the
-window width that EBDB will take over."
-  :group 'ebdb-mua
-  :type '(cons (number :tag "Total number of columns")
-               (number :tag "Horizontal size of EBDB window")))
-
 (defcustom ebdb-dedicated-window nil
   "Make *EBDB* window a dedicated window.
 Allowed values include nil (not dedicated) 'ebdb (weakly dedicated)
@@ -91,8 +68,6 @@ and t (strongly dedicated)."
   "If t, fill particularly long field values so that they fit
 within the *EBDB* buffer."
   :group 'ebdb-record-display
-  ;; TODO: When we have a 'pop-up and 'user buffer distinction, give
-  ;; this option more potential values.
   :type '(choice (const :tag "Always fill" nil)
                  (const :tag "Never fill" t)))
 
@@ -1071,7 +1046,6 @@ Important variables:
 \t `ebdb-completion-list'
 \t `ebdb-default-domain'
 \t `ebdb-sources'
-\t `ebdb-pop-up-window-size'
 \t `ebdb-mua-auto-update-p'
 \t `ebdb-add-name'
 \t `ebdb-add-aka'
diff --git a/ebdb-mua.el b/ebdb-mua.el
index c682d9d..c102d60 100644
--- a/ebdb-mua.el
+++ b/ebdb-mua.el
@@ -552,39 +552,9 @@ See also `ebdb-auto-notes-ignore-messages'."
                   (regexp :tag "Regexp to match on header value"))))
 
 (defcustom ebdb-mua-pop-up t
-  "If non-nil, display an auto-updated EBDB window while using a MUA.
-If 'horiz, stack the window horizontally if there is room.
-If this is nil, EBDB is updated silently.
-
-See also `ebdb-mua-pop-up-window-size' and 
`ebdb-mua-horiz-pop-up-window-size'."
-  :group 'ebdb-mua
-  :type '(choice (const :tag "MUA EBDB window stacked vertically" t)
-                 (const :tag "MUA EBDB window stacked horizontally" horiz)
-                 (const :tag "No MUA EBDB window" nil)))
-(define-obsolete-variable-alias 'ebdb-message-pop-up 'ebdb-mua-pop-up)
-
-(defcustom ebdb-mua-pop-up-window-size ebdb-pop-up-window-size
-  "Vertical size of MUA pop-up EBDB window (vertical split).
-If it is an integer number, it is the number of lines used by EBDB.
-If it is a fraction between 0.0 and 1.0 (inclusive), it is the fraction
-of the tallest existing window that EBDB will take over.
-If it is t use `pop-to-buffer' to create the EBDB window.
-See also `ebdb-pop-up-window-size'."
+  "If non-nil, display an auto-updated EBDB window while using a MUA."
   :group 'ebdb-mua
-  :type '(choice (number :tag "EBDB window size")
-                 (const :tag "Use `pop-to-buffer'" t)))
-
-(defcustom ebdb-mua-horiz-pop-up-window-size '(112 . 0.3)
-  "Horizontal size of a MUA pop-up EBDB window (horizontal split).
-It is a cons pair (TOTAL . EBDB-SIZE).
-The window that will be considered for horizontal splitting must have
-at least TOTAL columns. EBDB-SIZE is the horizontal size of the EBDB window.
-If it is an integer number, it is the number of columns used by EBDB.
-If it is a fraction between 0 and 1, it is the fraction of the
-window width that EBDB will take over."
-  :group 'ebdb-mua
-  :type '(cons (number :tag "Total number of columns")
-               (number :tag "Horizontal size of EBDB window")))
+  :type 'boolean)
 
 
 
@@ -1178,8 +1148,7 @@ apply, however."
   (interactive)
   ;; Temporarily copy and paste from `ebdb-mua-display-records',
   ;; refactor later.
-  (let ((ebdb-pop-up-window-size ebdb-mua-pop-up-window-size)
-        (ebdb-message-all-addresses (or all ebdb-message-all-addresses))
+  (let ((ebdb-message-all-addresses (or all ebdb-message-all-addresses))
        (fmt ebdb-default-multiline-formatter)
         records)
     (ebdb-mua-prepare-article)
@@ -1200,8 +1169,7 @@ HEADER-CLASS is defined in `ebdb-message-headers'.  If it 
is nil,
 use all classes in `ebdb-message-headers'.  If ALL is non-nil,
 bind `ebdb-message-all-addresses' to ALL."
   (interactive)
-  (let ((ebdb-pop-up-window-size ebdb-mua-pop-up-window-size)
-        (ebdb-message-all-addresses (or all ebdb-message-all-addresses))
+  (let ((ebdb-message-all-addresses (or all ebdb-message-all-addresses))
        (fmt ebdb-default-multiline-formatter)
         records)
     (ebdb-mua-prepare-article)
@@ -1328,7 +1296,6 @@ use all classes in `ebdb-message-headers'."
   (let ((records (ebdb-update-records
                  (ebdb-get-address-components header-class)
                  'existing))
-       (ebdb-pop-up-window-size ebdb-mua-pop-up-window-size)
        field-instance slot)
     (when records
       (ebdb-display-records records nil nil nil (ebdb-popup-window))
@@ -1382,7 +1349,6 @@ Call `ebdb-mua-auto-update-init' in your init file to put 
this function
 into the respective MUA hooks.
 See `ebdb-mua-display-records' and friends for interactive commands."
   (let* ((ebdb-silent-internal t)
-         (ebdb-pop-up-window-size ebdb-mua-pop-up-window-size)
         records)
     (setq records (ebdb-update-records
                   (ebdb-get-address-components header-class)
diff --git a/ebdb.org b/ebdb.org
index 7b2c50c..d10c4d2 100644
--- a/ebdb.org
+++ b/ebdb.org
@@ -221,6 +221,21 @@ The first and most important option governing this 
behavior is:
 
 
 *** Pop-up buffers
+Each MUA associated with EBDB will create its own pop-up buffer, with
+a name like \ast{}EBDB-Gnus\ast{} or \ast{}EBDB-Rmail\ast{}.  MUAs
+will re-use their own buffers, and not interfere with buffers the user
+has created using `ebdb', or by cloning or renaming existing buffers.
+
+- Variable: ebdb-mua-pop-up
+  If nil, MUAs will not create pop-up buffers.  It may still be
+  possible to manually create the buffer (and/or edit EBDB records)
+  using interactive commands (see 
[[id:38166454-6750-48e9-a5e5-313ff9264c6d][Interactive Commands in MUAs]]).
+
+At present, there are *no* user customization options controlling the
+size and location of MUA pop-up buffers: each MUA creates the pop-up
+according to hard-coded rules.  This will likely change in the future:
+please complain to the author.
+*** Annotation and Noticing
 ** EBDB and MUA summary buffers
 EBDB can affect the way message senders are displayed in your MUA's
 summary buffer.  It can do this in two ways: 1) by changing the way