From 43ad632e3b9167df0234602772943913871831ff Mon Sep 17 00:00:00 2001 From: =?utf8?q?Johan=20Bockg=C3=A5rd?= Date: Sun, 20 Oct 2013 11:51:21 +0200 Subject: [PATCH] * lisp/cedet/semantic/db-mode.el (global-semanticdb-minor-mode): Remove hooks correctly. (semanticdb-toggle-global-mode): Pass `toggle' to minor mode function. --- lisp/cedet/ChangeLog | 7 +++++++ lisp/cedet/semantic/db-mode.el | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index 4a017644c84..c5f93d64710 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,3 +1,10 @@ +2013-10-20 Johan Bockgård + + * 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 * 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 7d147113a92..e0cb3708454 100644 --- 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: ;; -- 2.11.4.GIT