From 237b5653575e868f67ca8616f9c9c2c464cfbdd1 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 12 Nov 2012 11:50:08 -0500 Subject: [PATCH] * lisp/cedet/semantic/mru-bookmark.el (semantic-mru-bookmark-mode): * lisp/cedet/semantic/grammar.el (semantic-grammar-mode): * lisp/cedet/semantic/util-modes.el (semantic-highlight-edits-mode) (semantic-show-parser-state-mode): Avoid obsolete name semantic-edits-new-change-hooks. Fixes: debbugs:12869 --- lisp/cedet/ChangeLog | 16 ++++++++++++---- lisp/cedet/semantic/grammar.el | 4 ++-- lisp/cedet/semantic/mru-bookmark.el | 6 +++--- lisp/cedet/semantic/util-modes.el | 12 ++++++------ 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index 55fce80e18b..6de901848c7 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,3 +1,11 @@ +2012-11-12 Stefan Monnier + + * semantic/mru-bookmark.el (semantic-mru-bookmark-mode): + * semantic/grammar.el (semantic-grammar-mode): + * semantic/util-modes.el (semantic-highlight-edits-mode) + (semantic-show-parser-state-mode): Avoid obsolete name + semantic-edits-new-change-hooks (bug#12869). + 2012-11-10 Glenn Morris * srecode/srt-mode.el (srecode-template-mode): @@ -5,8 +13,8 @@ 2012-10-25 David Engster - * semantic/analyze.el (semantic-analyze-dereference-alias): New - function to dereference aliases. + * semantic/analyze.el (semantic-analyze-dereference-alias): + New function to dereference aliases. (semantic-analyze-current-context-default): Use it. * semantic/grammar.el (semantic-grammar-create-package): @@ -17,8 +25,8 @@ * semantic.el (semantic-elapsed-time): Make it a defsubst. - * srecode/dictionary.el (srecode-adebug-dictionary): Remove - require for `semantic'. + * srecode/dictionary.el (srecode-adebug-dictionary): + Remove require for `semantic'. * srecode/map.el: * srecode/insert.el: Declare functions from `data-debug'. diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el index c0e7b8f9038..8535c067e09 100644 --- a/lisp/cedet/semantic/grammar.el +++ b/lisp/cedet/semantic/grammar.el @@ -1333,8 +1333,8 @@ the change bounds to encompass the whole nonterminal tag." (add-hook 'before-change-functions 'semantic--grammar-clear-macros-regexp-2 nil t) ;; Handle safe re-parse of grammar rules. - (semantic-make-local-hook 'semantic-edits-new-change-hooks) - (add-hook 'semantic-edits-new-change-hooks + (semantic-make-local-hook 'semantic-edits-new-change-functions) + (add-hook 'semantic-edits-new-change-functions 'semantic-grammar-edits-new-change-hook-fcn nil t) (semantic-run-mode-hooks 'semantic-grammar-mode-hook)) diff --git a/lisp/cedet/semantic/mru-bookmark.el b/lisp/cedet/semantic/mru-bookmark.el index d042ba42582..1358fc7d062 100644 --- a/lisp/cedet/semantic/mru-bookmark.el +++ b/lisp/cedet/semantic/mru-bookmark.el @@ -292,13 +292,13 @@ minor mode is enabled." (setq semantic-mru-bookmark-mode nil) (error "Buffer %s was not set up for parsing" (buffer-name))) - (semantic-make-local-hook 'semantic-edits-new-change-hooks) - (add-hook 'semantic-edits-new-change-hooks + (semantic-make-local-hook 'semantic-edits-new-change-functions) + (add-hook 'semantic-edits-new-change-functions 'semantic-mru-bookmark-change-hook-fcn nil t) (add-hook 'semantic-edits-move-change-hooks 'semantic-mru-bookmark-change-hook-fcn nil t)) ;; Remove hooks - (remove-hook 'semantic-edits-new-change-hooks + (remove-hook 'semantic-edits-new-change-functions 'semantic-mru-bookmark-change-hook-fcn t) (remove-hook 'semantic-edits-move-change-hooks 'semantic-mru-bookmark-change-hook-fcn t))) diff --git a/lisp/cedet/semantic/util-modes.el b/lisp/cedet/semantic/util-modes.el index c9a0faefe6c..744d37ff189 100644 --- a/lisp/cedet/semantic/util-modes.el +++ b/lisp/cedet/semantic/util-modes.el @@ -221,11 +221,11 @@ minor mode is enabled." (setq semantic-highlight-edits-mode nil) (error "Buffer %s was not set up for parsing" (buffer-name))) - (semantic-make-local-hook 'semantic-edits-new-change-hooks) - (add-hook 'semantic-edits-new-change-hooks + (semantic-make-local-hook 'semantic-edits-new-change-functions) + (add-hook 'semantic-edits-new-change-functions 'semantic-highlight-edits-new-change-hook-fcn nil t)) ;; Remove hooks - (remove-hook 'semantic-edits-new-change-hooks + (remove-hook 'semantic-edits-new-change-functions 'semantic-highlight-edits-new-change-hook-fcn t))) (semantic-add-minor-mode 'semantic-highlight-edits-mode @@ -460,8 +460,8 @@ minor mode is enabled." (append mode-line-modified '(semantic-show-parser-state-string)))) ;; Add hooks - (semantic-make-local-hook 'semantic-edits-new-change-hooks) - (add-hook 'semantic-edits-new-change-hooks + (semantic-make-local-hook 'semantic-edits-new-change-functions) + (add-hook 'semantic-edits-new-change-functions 'semantic-show-parser-state-marker nil t) (semantic-make-local-hook 'semantic-edits-incremental-reparse-failed-hook) (add-hook 'semantic-edits-incremental-reparse-failed-hook @@ -491,7 +491,7 @@ minor mode is enabled." (setq mode-line-modified (delq 'semantic-show-parser-state-string mode-line-modified)) ;; Remove hooks - (remove-hook 'semantic-edits-new-change-hooks + (remove-hook 'semantic-edits-new-change-functions 'semantic-show-parser-state-marker t) (remove-hook 'semantic-edits-incremental-reparse-failed-hook 'semantic-show-parser-state-marker t) -- 2.11.4.GIT