X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-lsdb.el;h=22bbbeda0f86af0424c84b66774e70ae5feff33d;hb=b747430c3b729e5d42299f583f9df81ae856a0d4;hp=f61a11a10638a53219b691c55a1293b38f337a17;hpb=312bb821869adf84c0e0cc3fdfc879dc5b46f0c3;p=elisp%2Friece.git

diff --git a/lisp/riece-lsdb.el b/lisp/riece-lsdb.el
index f61a11a..22bbbed 100644
--- a/lisp/riece-lsdb.el
+++ b/lisp/riece-lsdb.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -29,6 +29,7 @@
 ;;; Code:
 
 (require 'riece-identity)
+(require 'riece-misc)
 
 (eval-when-compile
   (autoload 'lsdb-maybe-load-hash-tables "lsdb")
@@ -42,8 +43,6 @@
 
 (defvar riece-lsdb-cache nil)
 
-(defvar riece-lsdb-enabled nil)
-
 (defconst riece-lsdb-description
   "Help register nicknames in LSDB rolodex program.")
 
@@ -116,6 +115,9 @@
 			  (list (cons 'irc (cons irc old)))))))
 
 (defvar riece-command-mode-map)
+(defvar lsdb-secondary-hash-tables)
+(defvar lsdb-after-update-record-functions)
+(defvar lsdb-after-delete-record-functions)
 (defun riece-lsdb-insinuate ()
   (require 'lsdb)
   (add-to-list 'lsdb-secondary-hash-tables
@@ -131,21 +133,19 @@
 	lsdb-after-update-record-functions
 	(delq 'riece-lsdb-update-cache lsdb-after-update-record-functions)
 	lsdb-after-delete-record-functions
-	(delq 'riece-lsdb-delete-cache lsdb-after-delete-record-functions))
+	(delq 'riece-lsdb-delete-cache lsdb-after-delete-record-functions)))
 
 (defun riece-lsdb-enable ()
   (define-key riece-command-mode-map
     "\C-c\C-ll" 'riece-lsdb-display-records)
   (define-key riece-command-mode-map
-    "\C-c\C-la" 'riece-lsdb-add-user)
-  (setq riece-lsdb-enabled t))
+    "\C-c\C-la" 'riece-lsdb-add-user))
 
 (defun riece-lsdb-disable ()
   (define-key riece-command-mode-map
     "\C-c\C-ll" nil)
   (define-key riece-command-mode-map
-    "\C-c\C-la" nil)
-  (setq riece-lsdb-enabled nil))
+    "\C-c\C-la" nil))
 
 (provide 'riece-lsdb)