[Erc-commit] [commit][emacs22] erc-bbdb: Make unelectric by default.

[mwolson]

commit c712df612f7412f695717b9294cfa2ac566894b9
Author: Michael Olson <address@hidden>
Date:   Tue Mar 21 05:39:23 2006 +0000

    erc-bbdb: Make unelectric by default.
    
    * CREDITS: Add Nelson Ferreira.  Change contact address.
    
    * erc-bbdb.el: Install patch from Nelson Ferreira.
     (erc-bbdb-electric-p): New option that indicates whether to make the
     BBDB buffer electric.  Defaults to "not electric".
     (erc-bbdb-show-entry): Use `erc-bbdb-electric-p'.
    git-archimport-id: address@hidden/erc--cvs--0--patch-138

diff --git a/CREDITS b/CREDITS
index c06ea5e..0d915bf 100644
--- a/CREDITS
+++ b/CREDITS
@@ -124,8 +124,11 @@ Luigi Panzeri (matley AT muppetslab DOT org):
 Simon Josefsson  (jas AT extundo DOT com):
   * Changed erc.el to use tls.el instead of ssl.el.
 
+Nelson Ferreira <address@hidden>:
+  * Made BBDB buffers not electric by default (6 lines changed).
+
 ----
 
 P.S.: Many people contributed small bits to ERC whose names I probably
-forgot. If you aren't listed here, simply write a mail to address@hidden,
-I'll add you then.
+forgot.  If you aren't listed here and should be, send an email to
address@hidden along with a list of your contributions.
diff --git a/ChangeLog b/ChangeLog
index d5b7cc8..d9007e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-21  Michael Olson  <address@hidden>
+
+       * CREDITS: Add Nelson Ferreira.  Change contact address.
+
+       * erc-bbdb.el: Install patch from Nelson Ferreira.
+       (erc-bbdb-electric-p): New option that indicates whether to make
+       the BBDB buffer electric.  Defaults to "not electric".
+       (erc-bbdb-show-entry): Use `erc-bbdb-electric-p'.
+
 2006-03-09  Diane Murray  <address@hidden>
 
        * erc-button.el (erc-button-keymap): Use <backtab> rather than
diff --git a/erc-bbdb.el b/erc-bbdb.el
index b371121..fddd419 100644
--- a/erc-bbdb.el
+++ b/erc-bbdb.el
@@ -113,6 +113,11 @@ their \"displayed name\"."
   :group 'erc-bbdb
   :type 'boolean)
 
+(defcustom erc-bbdb-electric-p nil
+  "*If t, BBDB popup buffer is electric."
+  :group 'erc-bbdb
+  :type 'boolean)
+
 (defun erc-bbdb-search-name-and-create (create-p name nick finger-host silent)
   (let* ((ircnick (cons erc-bbdb-irc-nick-field (concat "^"
                                                        (regexp-quote nick))))
@@ -133,7 +138,8 @@ their \"displayed name\"."
       record)))
 
 (defun erc-bbdb-show-entry (record channel proc)
-  (let ((bbdb-display-layout (bbdb-grovel-elide-arg erc-bbdb-elide-display)))
+  (let ((bbdb-display-layout (bbdb-grovel-elide-arg erc-bbdb-elide-display))
+       (bbdb-electric-p erc-bbdb-electric-p))
     (when (and record (or (eq erc-bbdb-popup-type t)
                          (and (eq erc-bbdb-popup-type 'visible)
                               (and channel