X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-toolbar.el;h=75bcb2f32b0e364fdecc98d78605a28be46e7c6a;hb=d88baadbcef92a03274b7ef0bfb61cc19dc9211d;hp=fdad3708fa3141fa65709a6fc484dec30aa4f71d;hpb=c467106d5b795c7d25d6f8d9b12ecf2f250777e3;p=elisp%2Friece.git

diff --git a/lisp/riece-toolbar.el b/lisp/riece-toolbar.el
index fdad370..75bcb2f 100644
--- a/lisp/riece-toolbar.el
+++ b/lisp/riece-toolbar.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:
 
@@ -121,15 +121,18 @@
   '(riece-menu))
 
 (defun riece-toolbar-insinuate ()
+  (if riece-command-buffer
+      (with-current-buffer riece-command-buffer
+	(riece-toolbar-command-mode-hook)))
   (add-hook 'riece-command-mode-hook
-	    'riece-toolbar-command-mode-hook
-	    t))
+	    'riece-toolbar-command-mode-hook t))
 
 (defun riece-toolbar-uninstall ()
+  (if riece-command-buffer
+      (with-current-buffer riece-command-buffer
+	(riece-unset-toolbar)))
   (remove-hook 'riece-command-mode-hook
-	       'riece-toolbar-command-mode-hook)
-  (with-current-buffer riece-command-buffer
-    (riece-unset-toolbar)))
+	       'riece-toolbar-command-mode-hook))
 
 (provide 'riece-toolbar)