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

diff --git a/lisp/riece-toolbar.el b/lisp/riece-toolbar.el
index ef466ce..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:
 
@@ -79,10 +79,21 @@
 			      (symbol-name (car pointer)))))))
 		(setq pointer (cdr pointer)))
 	      toolbar))
+	  (defvar riece-toolbar-original-toolbar nil)
 	  (defun riece-set-toolbar (toolbar)
-	    (set-specifier default-toolbar toolbar (current-buffer))))
+	    (make-local-variable 'riece-toolbar-original-toolbar)
+	    (setq riece-toolbar-original-toolbar
+		  (specifier-specs default-toolbar (current-buffer)))
+	    (set-specifier default-toolbar toolbar (current-buffer)))
+	  (defun riece-unset-toolbar ()
+	    (if riece-toolbar-original-toolbar
+		(set-specifier default-toolbar riece-toolbar-original-toolbar
+			       (current-buffer))
+	      (remove-specifier default-toolbar (current-buffer)))
+	    (kill-local-variable 'riece-toolbar-original-toolbar)))
       (defalias 'riece-make-toolbar-from-menu 'ignore)
-      (defalias 'riece-set-toolbar 'ignore))
+      (defalias 'riece-set-toolbar 'ignore)
+      (defalias 'riece-unset-toolbar 'ignore))
   (defun riece-make-toolbar-from-menu (items menu-items map)
     (let ((pointer items)
 	  (tool-bar-map (make-sparse-keymap)))
@@ -94,10 +105,12 @@
       tool-bar-map))
   (defun riece-set-toolbar (toolbar)
     (make-local-variable 'tool-bar-map)
-    (setq tool-bar-map toolbar)))
+    (setq tool-bar-map toolbar))
+  (defun riece-unset-toolbar ()
+    (kill-local-variable 'tool-bar-map)))
 
 (defvar riece-command-mode-map)
-(defun riece-toolbar-insinuate-in-command-buffer ()
+(defun riece-toolbar-command-mode-hook ()
   (riece-set-toolbar
    (riece-make-toolbar-from-menu
     riece-toolbar-items
@@ -108,9 +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-insinuate-in-command-buffer
-	    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))
 
 (provide 'riece-toolbar)