Support re-insinuate.

[riece] / lisp / riece-button.el

diff --git a/lisp/riece-button.el b/lisp/riece-button.el
index 05dff6b..f53fb09 100644 (file)
--- a/lisp/riece-button.el
+++ b/lisp/riece-button.el
@@ -247,6 +247,20 @@ This function is used as a callback for a channel button."
        (riece-make-identity-button-map)))
 
 (defun riece-button-insinuate ()
+  (save-excursion
+    (when riece-channel-list-buffer
+      (set-buffer riece-channel-list-buffer)
+      (riece-channel-list-mode-hook)
+    (when riece-user-list-buffer
+      (set-buffer riece-user-list-buffer)
+      (riece-user-list-mode-hook)
+    (let ((buffers riece-buffer-list))
+      (while buffers
+       (set-buffer (car buffers))
+       (if (eq (derived-mode-class major-mode)
+               'riece-dialogue-mode)
+           (riece-dialogue-mode-hook))
+       (setq buffers (cdr buffers)))))
   (add-hook 'riece-channel-list-mode-hook
            'riece-button-channel-list-mode-hook)
   (add-hook 'riece-user-list-mode-hook
@@ -262,6 +276,9 @@ This function is used as a callback for a channel button."
        (set-buffer (car buffers))
        (remove-hook 'riece-update-buffer-functions
                     'riece-button-update-buffer)
+       (if (local-variable-p 'riece-identity-button-map
+                             (car buffers))
+           (kill-local-variable 'riece-identity-button-map))
        (setq buffers (cdr buffers)))))
   (remove-hook 'riece-channel-list-mode-hook
               'riece-button-channel-list-mode-hook)
@@ -270,7 +287,7 @@ This function is used as a callback for a channel button."
   (remove-hook 'riece-dialogue-mode-hook
               'riece-button-dialogue-mode-hook)
   (remove-hook 'riece-after-insert-functions
-              'riece-button-add-identity-button)))
+              'riece-button-add-identity-button))
 
 (defun riece-button-enable ()
   (setq riece-button-enabled t)