X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-biff.el;h=63c5dff315014c0d3ca4221d5f7ca80f324f6de9;hb=f9c7797d207966872dba8c85f0b249e1ef01b7e8;hp=b05df0e460765750a16e49a4fcffcd7f563f922b;hpb=312bb821869adf84c0e0cc3fdfc879dc5b46f0c3;p=elisp%2Friece.git

diff --git a/lisp/riece-biff.el b/lisp/riece-biff.el
index b05df0e..63c5dff 100644
--- a/lisp/riece-biff.el
+++ b/lisp/riece-biff.el
@@ -18,8 +18,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:
 
@@ -51,13 +51,11 @@
 
 (defvar riece-biff-mode-string 'riece-biff-default-mode-string)
 
-(defvar riece-biff-enabled nil)
-
 (defconst riece-biff-description
   "Be notified if messages arrives.")
 
 (defun riece-biff-after-display-message-function (message)
-  (when (and riece-biff-enabled
+  (when (and (get 'riece-biff 'riece-addon-enabled)
 	     (not (or (eq (window-buffer (selected-window))
 			  (get-buffer riece-command-buffer))
 		      (riece-message-own-p message)
@@ -68,7 +66,7 @@
       (setq riece-biff-mode-string 'riece-biff-biff-mode-string))))
 
 (defun riece-biff-clear (&optional dummy)
-  (when riece-biff-enabled
+  (when (get 'riece-biff 'riece-addon-enabled)
     (setq riece-biff-mode-string 'riece-biff-default-mode-string)))
 
 (defun riece-biff-insinuate ()
@@ -94,8 +92,7 @@
 	  (append '("" riece-biff-mode-string)
 		  (remove "" global-mode-string)))
 	 (t
-	  global-mode-string)))
-  (setq riece-biff-enabled t))
+	  global-mode-string))))
 
 (defun riece-biff-disable ()
   (setq global-mode-string
@@ -105,8 +102,7 @@
 	  (remq 'riece-biff-mode-string global-mode-string))
 	 (t
 	  global-mode-string)))
-  (riece-biff-clear)
-  (setq riece-biff-enabled nil))
+  (riece-biff-clear))
 
 (provide 'riece-biff)