[Emacs-diffs] trunk r114725: * lisp/cedet/semantic/db-mode.el (global-semanticdb-minor-mode): Remove hooks

[Johan Bockgard]

------------------------------------------------------------
revno: 114725
revision-id: address@hidden
parent: address@hidden
committer: Johan Bockgård <address@hidden>
branch nick: trunk
timestamp: Sun 2013-10-20 11:51:21 +0200
message:
  * lisp/cedet/semantic/db-mode.el (global-semanticdb-minor-mode): Remove hooks
  correctly.
  (semanticdb-toggle-global-mode): Pass `toggle' to minor mode function.
modified:
  lisp/cedet/ChangeLog           changelog-20100919015713-3rbr456yray5m84f-1
  lisp/cedet/semantic/db-mode.el dbmode.el-20091113204419-o5vbwnq5f7feedwu-11264

=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog      2013-09-28 02:54:27 +0000
+++ b/lisp/cedet/ChangeLog      2013-10-20 09:51:21 +0000
@@ -1,3 +1,10 @@
+2013-10-20  Johan Bockgård  <address@hidden>
+
+       * 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  <address@hidden>
 
        * semantic/texi.el (semantic-analyze-possible-completions): Use

=== modified file 'lisp/cedet/semantic/db-mode.el'
--- a/lisp/cedet/semantic/db-mode.el    2013-01-01 09:11:05 +0000
+++ b/lisp/cedet/semantic/db-mode.el    2013-10-20 09:51:21 +0000
@@ -66,7 +66,7 @@
        (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 @@
       ;; Save databases before disabling semanticdb.
       (semanticdb-save-all-db))
   ;; Toggle semanticdb minor mode.
-  (global-semanticdb-minor-mode))
+  (global-semanticdb-minor-mode 'toggle))
 
 ;;; Hook Functions:
 ;;