aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-11-12 11:50:08 -0500
committerStefan Monnier2012-11-12 11:50:08 -0500
commit237b5653575e868f67ca8616f9c9c2c464cfbdd1 (patch)
tree04cd9a11b719862b86b91beff4d95bad068e7ac9
parent325202732506c35fec0a7bd772d218eaf0ac659f (diff)
downloademacs-237b5653575e868f67ca8616f9c9c2c464cfbdd1.tar.gz
emacs-237b5653575e868f67ca8616f9c9c2c464cfbdd1.zip
* 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
-rw-r--r--lisp/cedet/ChangeLog16
-rw-r--r--lisp/cedet/semantic/grammar.el4
-rw-r--r--lisp/cedet/semantic/mru-bookmark.el6
-rw-r--r--lisp/cedet/semantic/util-modes.el12
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 @@
12012-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * semantic/mru-bookmark.el (semantic-mru-bookmark-mode):
4 * semantic/grammar.el (semantic-grammar-mode):
5 * semantic/util-modes.el (semantic-highlight-edits-mode)
6 (semantic-show-parser-state-mode): Avoid obsolete name
7 semantic-edits-new-change-hooks (bug#12869).
8
12012-11-10 Glenn Morris <rgm@gnu.org> 92012-11-10 Glenn Morris <rgm@gnu.org>
2 10
3 * srecode/srt-mode.el (srecode-template-mode): 11 * srecode/srt-mode.el (srecode-template-mode):
@@ -5,8 +13,8 @@
5 13
62012-10-25 David Engster <deng@randomsample.de> 142012-10-25 David Engster <deng@randomsample.de>
7 15
8 * semantic/analyze.el (semantic-analyze-dereference-alias): New 16 * semantic/analyze.el (semantic-analyze-dereference-alias):
9 function to dereference aliases. 17 New function to dereference aliases.
10 (semantic-analyze-current-context-default): Use it. 18 (semantic-analyze-current-context-default): Use it.
11 19
12 * semantic/grammar.el (semantic-grammar-create-package): 20 * semantic/grammar.el (semantic-grammar-create-package):
@@ -17,8 +25,8 @@
17 25
18 * semantic.el (semantic-elapsed-time): Make it a defsubst. 26 * semantic.el (semantic-elapsed-time): Make it a defsubst.
19 27
20 * srecode/dictionary.el (srecode-adebug-dictionary): Remove 28 * srecode/dictionary.el (srecode-adebug-dictionary):
21 require for `semantic'. 29 Remove require for `semantic'.
22 30
23 * srecode/map.el: 31 * srecode/map.el:
24 * srecode/insert.el: Declare functions from `data-debug'. 32 * 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."
1333 (add-hook 'before-change-functions 1333 (add-hook 'before-change-functions
1334 'semantic--grammar-clear-macros-regexp-2 nil t) 1334 'semantic--grammar-clear-macros-regexp-2 nil t)
1335 ;; Handle safe re-parse of grammar rules. 1335 ;; Handle safe re-parse of grammar rules.
1336 (semantic-make-local-hook 'semantic-edits-new-change-hooks) 1336 (semantic-make-local-hook 'semantic-edits-new-change-functions)
1337 (add-hook 'semantic-edits-new-change-hooks 1337 (add-hook 'semantic-edits-new-change-functions
1338 'semantic-grammar-edits-new-change-hook-fcn 1338 'semantic-grammar-edits-new-change-hook-fcn
1339 nil t) 1339 nil t)
1340 (semantic-run-mode-hooks 'semantic-grammar-mode-hook)) 1340 (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."
292 (setq semantic-mru-bookmark-mode nil) 292 (setq semantic-mru-bookmark-mode nil)
293 (error "Buffer %s was not set up for parsing" 293 (error "Buffer %s was not set up for parsing"
294 (buffer-name))) 294 (buffer-name)))
295 (semantic-make-local-hook 'semantic-edits-new-change-hooks) 295 (semantic-make-local-hook 'semantic-edits-new-change-functions)
296 (add-hook 'semantic-edits-new-change-hooks 296 (add-hook 'semantic-edits-new-change-functions
297 'semantic-mru-bookmark-change-hook-fcn nil t) 297 'semantic-mru-bookmark-change-hook-fcn nil t)
298 (add-hook 'semantic-edits-move-change-hooks 298 (add-hook 'semantic-edits-move-change-hooks
299 'semantic-mru-bookmark-change-hook-fcn nil t)) 299 'semantic-mru-bookmark-change-hook-fcn nil t))
300 ;; Remove hooks 300 ;; Remove hooks
301 (remove-hook 'semantic-edits-new-change-hooks 301 (remove-hook 'semantic-edits-new-change-functions
302 'semantic-mru-bookmark-change-hook-fcn t) 302 'semantic-mru-bookmark-change-hook-fcn t)
303 (remove-hook 'semantic-edits-move-change-hooks 303 (remove-hook 'semantic-edits-move-change-hooks
304 'semantic-mru-bookmark-change-hook-fcn t))) 304 '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."
221 (setq semantic-highlight-edits-mode nil) 221 (setq semantic-highlight-edits-mode nil)
222 (error "Buffer %s was not set up for parsing" 222 (error "Buffer %s was not set up for parsing"
223 (buffer-name))) 223 (buffer-name)))
224 (semantic-make-local-hook 'semantic-edits-new-change-hooks) 224 (semantic-make-local-hook 'semantic-edits-new-change-functions)
225 (add-hook 'semantic-edits-new-change-hooks 225 (add-hook 'semantic-edits-new-change-functions
226 'semantic-highlight-edits-new-change-hook-fcn nil t)) 226 'semantic-highlight-edits-new-change-hook-fcn nil t))
227 ;; Remove hooks 227 ;; Remove hooks
228 (remove-hook 'semantic-edits-new-change-hooks 228 (remove-hook 'semantic-edits-new-change-functions
229 'semantic-highlight-edits-new-change-hook-fcn t))) 229 'semantic-highlight-edits-new-change-hook-fcn t)))
230 230
231(semantic-add-minor-mode 'semantic-highlight-edits-mode 231(semantic-add-minor-mode 'semantic-highlight-edits-mode
@@ -460,8 +460,8 @@ minor mode is enabled."
460 (append mode-line-modified 460 (append mode-line-modified
461 '(semantic-show-parser-state-string)))) 461 '(semantic-show-parser-state-string))))
462 ;; Add hooks 462 ;; Add hooks
463 (semantic-make-local-hook 'semantic-edits-new-change-hooks) 463 (semantic-make-local-hook 'semantic-edits-new-change-functions)
464 (add-hook 'semantic-edits-new-change-hooks 464 (add-hook 'semantic-edits-new-change-functions
465 'semantic-show-parser-state-marker nil t) 465 'semantic-show-parser-state-marker nil t)
466 (semantic-make-local-hook 'semantic-edits-incremental-reparse-failed-hook) 466 (semantic-make-local-hook 'semantic-edits-incremental-reparse-failed-hook)
467 (add-hook 'semantic-edits-incremental-reparse-failed-hook 467 (add-hook 'semantic-edits-incremental-reparse-failed-hook
@@ -491,7 +491,7 @@ minor mode is enabled."
491 (setq mode-line-modified 491 (setq mode-line-modified
492 (delq 'semantic-show-parser-state-string mode-line-modified)) 492 (delq 'semantic-show-parser-state-string mode-line-modified))
493 ;; Remove hooks 493 ;; Remove hooks
494 (remove-hook 'semantic-edits-new-change-hooks 494 (remove-hook 'semantic-edits-new-change-functions
495 'semantic-show-parser-state-marker t) 495 'semantic-show-parser-state-marker t)
496 (remove-hook 'semantic-edits-incremental-reparse-failed-hook 496 (remove-hook 'semantic-edits-incremental-reparse-failed-hook
497 'semantic-show-parser-state-marker t) 497 'semantic-show-parser-state-marker t)