Make "^C<fg>[,<bg>]" ctlseq matching robuster.

[riece] / lisp / riece-xface.el

diff --git a/lisp/riece-xface.el b/lisp/riece-xface.el
index b94b006..d43cf5e 100644 (file)
--- a/lisp/riece-xface.el
+++ b/lisp/riece-xface.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:
 
@@ -31,9 +31,7 @@
 (require 'riece-identity)
 (require 'riece-globals)
 (require 'riece-display)
-(eval-when-compile (require 'riece-lsdb))
-
-(defvar riece-xface-enabled nil)
+(require 'riece-lsdb)
 
 (defconst riece-xface-description
   "Display X-Face in IRC buffers.")
@@ -41,7 +39,7 @@
 (defvar lsdb-insert-x-face-function)
 
 (defun riece-xface-update-user-list-buffer ()
-  (if riece-xface-enabled
+  (if (get 'riece-xface 'riece-addon-enabled)
       (riece-scan-property-region
        'riece-identity (point-min)(point-max)
        (lambda (start end)
@@ -68,23 +66,25 @@
            'riece-xface-update-user-list-buffer t t))
 
 (defun riece-xface-insinuate ()
+  (if riece-user-list-buffer
+      (with-current-buffer riece-user-list-buffer
+       (riece-xface-user-list-mode-hook)))
   (add-hook 'riece-user-list-mode-hook
            'riece-xface-user-list-mode-hook))
 
 (defun riece-xface-uninstall ()
+  (if riece-user-list-buffer
+      (with-current-buffer riece-user-list-buffer
+       (remove-hook 'riece-update-buffer-functions
+                    'riece-xface-update-user-list-buffer t)))
   (remove-hook 'riece-user-list-mode-hook
-              'riece-xface-user-list-mode-hook)
-  (with-current-buffer riece-user-list-buffer
-    (remove-hook 'riece-update-buffer-functions
-                'riece-xface-update-user-list-buffer t)))
+              'riece-xface-user-list-mode-hook))
 
 (defun riece-xface-enable ()
-  (setq riece-xface-enabled t)
   (if riece-current-channel
       (riece-emit-signal 'user-list-changed riece-current-channel)))
 
 (defun riece-xface-disable ()
-  (setq riece-xface-enabled nil)
   (if riece-current-channel
       (riece-emit-signal 'user-list-changed riece-current-channel)))