* lisp/cedet/semantic/db-mode.el (global-semanticdb-minor-mode): Remove hooks

correctly.
(semanticdb-toggle-global-mode): Pass `toggle' to minor mode function.

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 4a017644c84c09d9bcb950f6ef0af90f7d5f1bf8..c5f93d64710564a669713f2cf0d08d0cf1191ea8 100644 (file)
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,10 @@
+2013-10-20  Johan Bockgård  <bojohan@gnu.org>
+
+       * semantic/db-mode.el (global-semanticdb-minor-mode): Remove hooks
+       correctly.
+       (semanticdb-toggle-global-mode): Pass `toggle' to minor mode
+       function.
+
 2013-09-28  Leo Liu  <sdl.web@gmail.com>
 
        * semantic/texi.el (semantic-analyze-possible-completions): Use

diff --git a/lisp/cedet/semantic/db-mode.el b/lisp/cedet/semantic/db-mode.el
index 7d147113a92939c70faff6de48acc8ed89f317b1..e0cb370845439600030654f2956059366747b509 100644 (file)
--- a/lisp/cedet/semantic/db-mode.el
+++ b/lisp/cedet/semantic/db-mode.el
@@ -66,7 +66,7 @@ database, which can be saved for future Emacs sessions."
        (add-hook (cadr elt) (car elt)))
     ;; Disable
     (dolist (elt semanticdb-hooks)
-      (add-hook (cadr elt) (car elt)))))
+      (remove-hook (cadr elt) (car elt)))))
 
 (defvaralias 'semanticdb-mode-hook 'global-semanticdb-minor-mode-hook)
 (defvaralias 'semanticdb-global-mode 'global-semanticdb-minor-mode)
@@ -82,7 +82,7 @@ Update the environment of Semantic enabled buffers accordingly."
       ;; Save databases before disabling semanticdb.
       (semanticdb-save-all-db))
   ;; Toggle semanticdb minor mode.
-  (global-semanticdb-minor-mode))
+  (global-semanticdb-minor-mode 'toggle))
 
 ;;; Hook Functions:
 ;;