diff options
| author | Lars Ingebrigtsen | 2019-10-04 15:29:30 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-10-04 15:29:47 +0200 |
| commit | 5f06b9c478894c828fc5467b0aae360e2c2d1fd2 (patch) | |
| tree | 92087639280d1e94e1aedcb96b04cbbb866f5571 | |
| parent | 33702988d9b0ff7ba816bf3a78cfd2586e16744e (diff) | |
| download | emacs-5f06b9c478894c828fc5467b0aae360e2c2d1fd2.tar.gz emacs-5f06b9c478894c828fc5467b0aae360e2c2d1fd2.zip | |
Remove semantic-make-local-hook call from CEDET
* lisp/cedet/semantic/wisent/grammar.el
(wisent-grammar-setupcode-builder):
* lisp/cedet/semantic/util-modes.el (semantic-highlight-edits-mode)
(semantic-show-unmatched-syntax-mode)
(semantic-show-parser-state-mode):
* lisp/cedet/semantic/mru-bookmark.el (semantic-mru-bookmark-mode):
* lisp/cedet/semantic/imenu.el (semantic-create-imenu-index):
* lisp/cedet/semantic/grammar.el (semantic-grammar-mode):
* lisp/cedet/semantic/grammar-wy.el
(semantic-grammar-wy--install-parser):
* lisp/cedet/semantic/decorate/mode.el
(semantic-decorate-add-pending-decoration)
(semantic-decoration-mode):
* lisp/cedet/semantic.el (semantic--set-buffer-cache): Remove all
calls to the function.
* lisp/cedet/semantic/fw.el (semantic-make-local-hook): Made
obsolete alias for #'ignore by removing XEmacs compat code.
| -rw-r--r-- | lisp/cedet/semantic.el | 1 | ||||
| -rw-r--r-- | lisp/cedet/semantic/decorate/mode.el | 3 | ||||
| -rw-r--r-- | lisp/cedet/semantic/fw.el | 4 | ||||
| -rw-r--r-- | lisp/cedet/semantic/grammar-wy.el | 1 | ||||
| -rw-r--r-- | lisp/cedet/semantic/grammar.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/semantic/imenu.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/semantic/mru-bookmark.el | 1 | ||||
| -rw-r--r-- | lisp/cedet/semantic/util-modes.el | 11 | ||||
| -rw-r--r-- | lisp/cedet/semantic/wisent/grammar.el | 1 |
9 files changed, 1 insertions, 25 deletions
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el index 8ffdbf0ff2a..0b878cae525 100644 --- a/lisp/cedet/semantic.el +++ b/lisp/cedet/semantic.el | |||
| @@ -535,7 +535,6 @@ is requested." | |||
| 535 | (set (make-local-variable 'semantic-bovinate-nonterminal-check-obarray) | 535 | (set (make-local-variable 'semantic-bovinate-nonterminal-check-obarray) |
| 536 | nil) | 536 | nil) |
| 537 | (semantic-parse-tree-set-up-to-date) | 537 | (semantic-parse-tree-set-up-to-date) |
| 538 | (semantic-make-local-hook 'after-change-functions) | ||
| 539 | (add-hook 'after-change-functions 'semantic-change-function nil t) | 538 | (add-hook 'after-change-functions 'semantic-change-function nil t) |
| 540 | (run-hook-with-args 'semantic-after-toplevel-cache-change-hook | 539 | (run-hook-with-args 'semantic-after-toplevel-cache-change-hook |
| 541 | semantic--buffer-cache) | 540 | semantic--buffer-cache) |
diff --git a/lisp/cedet/semantic/decorate/mode.el b/lisp/cedet/semantic/decorate/mode.el index 4e3ca2c6ee3..9825f353ce8 100644 --- a/lisp/cedet/semantic/decorate/mode.el +++ b/lisp/cedet/semantic/decorate/mode.el | |||
| @@ -213,7 +213,6 @@ Applies only to the current BUFFER. | |||
| 213 | The setting of FCN will be removed after it is run." | 213 | The setting of FCN will be removed after it is run." |
| 214 | (save-excursion | 214 | (save-excursion |
| 215 | (when buffer (set-buffer buffer)) | 215 | (when buffer (set-buffer buffer)) |
| 216 | (semantic-make-local-hook 'semantic-decorate-flush-pending-decorations) | ||
| 217 | (add-hook 'semantic-decorate-pending-decoration-hook fcn nil t))) | 216 | (add-hook 'semantic-decorate-pending-decoration-hook fcn nil t))) |
| 218 | 217 | ||
| 219 | (defun semantic-decorate-flush-pending-decorations (&optional buffer) | 218 | (defun semantic-decorate-flush-pending-decorations (&optional buffer) |
| @@ -267,10 +266,8 @@ non-nil if the minor mode is enabled." | |||
| 267 | (error "Buffer %s was not set up for parsing" | 266 | (error "Buffer %s was not set up for parsing" |
| 268 | (buffer-name))) | 267 | (buffer-name))) |
| 269 | ;; Add hooks | 268 | ;; Add hooks |
| 270 | (semantic-make-local-hook 'semantic-after-partial-cache-change-hook) | ||
| 271 | (add-hook 'semantic-after-partial-cache-change-hook | 269 | (add-hook 'semantic-after-partial-cache-change-hook |
| 272 | 'semantic-decorate-tags-after-partial-reparse nil t) | 270 | 'semantic-decorate-tags-after-partial-reparse nil t) |
| 273 | (semantic-make-local-hook 'semantic-after-toplevel-cache-change-hook) | ||
| 274 | (add-hook 'semantic-after-toplevel-cache-change-hook | 271 | (add-hook 'semantic-after-toplevel-cache-change-hook |
| 275 | 'semantic-decorate-tags-after-full-reparse nil t) | 272 | 'semantic-decorate-tags-after-full-reparse nil t) |
| 276 | ;; Add decorations to available tags. The above hooks ensure | 273 | ;; Add decorations to available tags. The above hooks ensure |
diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el index 216a47547dc..e07f0901849 100644 --- a/lisp/cedet/semantic/fw.el +++ b/lisp/cedet/semantic/fw.el | |||
| @@ -62,9 +62,7 @@ | |||
| 62 | "Extract the window from EVENT." | 62 | "Extract the window from EVENT." |
| 63 | (car (car (cdr event)))) | 63 | (car (car (cdr event)))) |
| 64 | 64 | ||
| 65 | (defalias 'semantic-make-local-hook | 65 | (define-obsolete-function-alias 'semantic-make-local-hook #'identity "27.1") |
| 66 | (if (featurep 'emacs) | ||
| 67 | #'identity #'make-local-hook)) | ||
| 68 | 66 | ||
| 69 | (defalias 'semantic-mode-line-update #'force-mode-line-update) | 67 | (defalias 'semantic-mode-line-update #'force-mode-line-update) |
| 70 | 68 | ||
diff --git a/lisp/cedet/semantic/grammar-wy.el b/lisp/cedet/semantic/grammar-wy.el index b5066d3d27b..3b99469f558 100644 --- a/lisp/cedet/semantic/grammar-wy.el +++ b/lisp/cedet/semantic/grammar-wy.el | |||
| @@ -428,7 +428,6 @@ | |||
| 428 | semantic-flex-keywords-obarray semantic-grammar-wy--keyword-table | 428 | semantic-flex-keywords-obarray semantic-grammar-wy--keyword-table |
| 429 | semantic-lex-types-obarray semantic-grammar-wy--token-table) | 429 | semantic-lex-types-obarray semantic-grammar-wy--token-table) |
| 430 | ;; Collect unmatched syntax lexical tokens | 430 | ;; Collect unmatched syntax lexical tokens |
| 431 | (semantic-make-local-hook 'wisent-discarding-token-functions) | ||
| 432 | (add-hook 'wisent-discarding-token-functions | 431 | (add-hook 'wisent-discarding-token-functions |
| 433 | 'wisent-collect-unmatched-syntax nil t)) | 432 | 'wisent-collect-unmatched-syntax nil t)) |
| 434 | 433 | ||
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el index 4237f9cef11..813580ba6c2 100644 --- a/lisp/cedet/semantic/grammar.el +++ b/lisp/cedet/semantic/grammar.el | |||
| @@ -1348,11 +1348,9 @@ the change bounds to encompass the whole nonterminal tag." | |||
| 1348 | '(nonterminal)) | 1348 | '(nonterminal)) |
| 1349 | ;; Before each change, clear the cached regexp used to highlight | 1349 | ;; Before each change, clear the cached regexp used to highlight |
| 1350 | ;; macros local in this grammar. | 1350 | ;; macros local in this grammar. |
| 1351 | (semantic-make-local-hook 'before-change-functions) | ||
| 1352 | (add-hook 'before-change-functions | 1351 | (add-hook 'before-change-functions |
| 1353 | 'semantic--grammar-clear-macros-regexp-2 nil t) | 1352 | 'semantic--grammar-clear-macros-regexp-2 nil t) |
| 1354 | ;; Handle safe re-parse of grammar rules. | 1353 | ;; Handle safe re-parse of grammar rules. |
| 1355 | (semantic-make-local-hook 'semantic-edits-new-change-functions) | ||
| 1356 | (add-hook 'semantic-edits-new-change-functions | 1354 | (add-hook 'semantic-edits-new-change-functions |
| 1357 | 'semantic-grammar-edits-new-change-hook-fcn | 1355 | 'semantic-grammar-edits-new-change-hook-fcn |
| 1358 | nil t)) | 1356 | nil t)) |
diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el index 5119eb62f3d..7dcf75fefa6 100644 --- a/lisp/cedet/semantic/imenu.el +++ b/lisp/cedet/semantic/imenu.el | |||
| @@ -240,10 +240,8 @@ Optional argument STREAM is an optional stream of tags used to create menus." | |||
| 240 | (or stream (semantic-fetch-tags-fast))) | 240 | (or stream (semantic-fetch-tags-fast))) |
| 241 | (semantic-create-imenu-index-1 | 241 | (semantic-create-imenu-index-1 |
| 242 | (or stream (semantic-fetch-tags-fast)) nil)) | 242 | (or stream (semantic-fetch-tags-fast)) nil)) |
| 243 | (semantic-make-local-hook 'semantic-after-toplevel-cache-change-hook) | ||
| 244 | (add-hook 'semantic-after-toplevel-cache-change-hook | 243 | (add-hook 'semantic-after-toplevel-cache-change-hook |
| 245 | 'semantic-imenu-flush-fcn nil t) | 244 | 'semantic-imenu-flush-fcn nil t) |
| 246 | (semantic-make-local-hook 'semantic-after-partial-cache-change-hook) | ||
| 247 | (add-hook 'semantic-after-partial-cache-change-hook | 245 | (add-hook 'semantic-after-partial-cache-change-hook |
| 248 | 'semantic-imenu-flush-fcn nil t))) | 246 | 'semantic-imenu-flush-fcn nil t))) |
| 249 | 247 | ||
diff --git a/lisp/cedet/semantic/mru-bookmark.el b/lisp/cedet/semantic/mru-bookmark.el index 627c71a01b8..13cfc586fd7 100644 --- a/lisp/cedet/semantic/mru-bookmark.el +++ b/lisp/cedet/semantic/mru-bookmark.el | |||
| @@ -288,7 +288,6 @@ non-nil if the minor mode is enabled." | |||
| 288 | (setq semantic-mru-bookmark-mode nil) | 288 | (setq semantic-mru-bookmark-mode nil) |
| 289 | (error "Buffer %s was not set up for parsing" | 289 | (error "Buffer %s was not set up for parsing" |
| 290 | (buffer-name))) | 290 | (buffer-name))) |
| 291 | (semantic-make-local-hook 'semantic-edits-new-change-functions) | ||
| 292 | (add-hook 'semantic-edits-new-change-functions | 291 | (add-hook 'semantic-edits-new-change-functions |
| 293 | 'semantic-mru-bookmark-change-hook-fcn nil t) | 292 | 'semantic-mru-bookmark-change-hook-fcn nil t) |
| 294 | (add-hook 'semantic-edits-move-change-hooks | 293 | (add-hook 'semantic-edits-move-change-hooks |
diff --git a/lisp/cedet/semantic/util-modes.el b/lisp/cedet/semantic/util-modes.el index 954181c2cd9..9e9f054d737 100644 --- a/lisp/cedet/semantic/util-modes.el +++ b/lisp/cedet/semantic/util-modes.el | |||
| @@ -220,7 +220,6 @@ non-nil if the minor mode is enabled." | |||
| 220 | (setq semantic-highlight-edits-mode nil) | 220 | (setq semantic-highlight-edits-mode nil) |
| 221 | (error "Buffer %s was not set up for parsing" | 221 | (error "Buffer %s was not set up for parsing" |
| 222 | (buffer-name))) | 222 | (buffer-name))) |
| 223 | (semantic-make-local-hook 'semantic-edits-new-change-functions) | ||
| 224 | (add-hook 'semantic-edits-new-change-functions | 223 | (add-hook 'semantic-edits-new-change-functions |
| 225 | 'semantic-highlight-edits-new-change-hook-fcn nil t)) | 224 | 'semantic-highlight-edits-new-change-hook-fcn nil t)) |
| 226 | ;; Remove hooks | 225 | ;; Remove hooks |
| @@ -372,10 +371,8 @@ non-nil if the minor mode is enabled. | |||
| 372 | (error "Buffer %s was not set up for parsing" | 371 | (error "Buffer %s was not set up for parsing" |
| 373 | (buffer-name))) | 372 | (buffer-name))) |
| 374 | ;; Add hooks | 373 | ;; Add hooks |
| 375 | (semantic-make-local-hook 'semantic-unmatched-syntax-hook) | ||
| 376 | (add-hook 'semantic-unmatched-syntax-hook | 374 | (add-hook 'semantic-unmatched-syntax-hook |
| 377 | 'semantic-show-unmatched-syntax nil t) | 375 | 'semantic-show-unmatched-syntax nil t) |
| 378 | (semantic-make-local-hook 'semantic-pre-clean-token-hooks) | ||
| 379 | (add-hook 'semantic-pre-clean-token-hooks | 376 | (add-hook 'semantic-pre-clean-token-hooks |
| 380 | 'semantic-clean-token-of-unmatched-syntax nil t) | 377 | 'semantic-clean-token-of-unmatched-syntax nil t) |
| 381 | ;; Show unmatched syntax elements | 378 | ;; Show unmatched syntax elements |
| @@ -456,31 +453,23 @@ non-nil if the minor mode is enabled." | |||
| 456 | (append mode-line-modified | 453 | (append mode-line-modified |
| 457 | '(semantic-show-parser-state-string)))) | 454 | '(semantic-show-parser-state-string)))) |
| 458 | ;; Add hooks | 455 | ;; Add hooks |
| 459 | (semantic-make-local-hook 'semantic-edits-new-change-functions) | ||
| 460 | (add-hook 'semantic-edits-new-change-functions | 456 | (add-hook 'semantic-edits-new-change-functions |
| 461 | 'semantic-show-parser-state-marker nil t) | 457 | 'semantic-show-parser-state-marker nil t) |
| 462 | (semantic-make-local-hook 'semantic-edits-incremental-reparse-failed-hook) | ||
| 463 | (add-hook 'semantic-edits-incremental-reparse-failed-hook | 458 | (add-hook 'semantic-edits-incremental-reparse-failed-hook |
| 464 | 'semantic-show-parser-state-marker nil t) | 459 | 'semantic-show-parser-state-marker nil t) |
| 465 | (semantic-make-local-hook 'semantic-after-partial-cache-change-hook) | ||
| 466 | (add-hook 'semantic-after-partial-cache-change-hook | 460 | (add-hook 'semantic-after-partial-cache-change-hook |
| 467 | 'semantic-show-parser-state-marker nil t) | 461 | 'semantic-show-parser-state-marker nil t) |
| 468 | (semantic-make-local-hook 'semantic-after-toplevel-cache-change-hook) | ||
| 469 | (add-hook 'semantic-after-toplevel-cache-change-hook | 462 | (add-hook 'semantic-after-toplevel-cache-change-hook |
| 470 | 'semantic-show-parser-state-marker nil t) | 463 | 'semantic-show-parser-state-marker nil t) |
| 471 | (semantic-show-parser-state-marker) | 464 | (semantic-show-parser-state-marker) |
| 472 | 465 | ||
| 473 | (semantic-make-local-hook 'semantic-before-auto-parse-hooks) | ||
| 474 | (add-hook 'semantic-before-auto-parse-hooks | 466 | (add-hook 'semantic-before-auto-parse-hooks |
| 475 | 'semantic-show-parser-state-auto-marker nil t) | 467 | 'semantic-show-parser-state-auto-marker nil t) |
| 476 | (semantic-make-local-hook 'semantic-after-auto-parse-hooks) | ||
| 477 | (add-hook 'semantic-after-auto-parse-hooks | 468 | (add-hook 'semantic-after-auto-parse-hooks |
| 478 | 'semantic-show-parser-state-marker nil t) | 469 | 'semantic-show-parser-state-marker nil t) |
| 479 | 470 | ||
| 480 | (semantic-make-local-hook 'semantic-before-idle-scheduler-reparse-hook) | ||
| 481 | (add-hook 'semantic-before-idle-scheduler-reparse-hook | 471 | (add-hook 'semantic-before-idle-scheduler-reparse-hook |
| 482 | 'semantic-show-parser-state-auto-marker nil t) | 472 | 'semantic-show-parser-state-auto-marker nil t) |
| 483 | (semantic-make-local-hook 'semantic-after-idle-scheduler-reparse-hook) | ||
| 484 | (add-hook 'semantic-after-idle-scheduler-reparse-hook | 473 | (add-hook 'semantic-after-idle-scheduler-reparse-hook |
| 485 | 'semantic-show-parser-state-marker nil t)) | 474 | 'semantic-show-parser-state-marker nil t)) |
| 486 | ;; Remove parts of mode line | 475 | ;; Remove parts of mode line |
diff --git a/lisp/cedet/semantic/wisent/grammar.el b/lisp/cedet/semantic/wisent/grammar.el index d23e293552a..e6b389b60ba 100644 --- a/lisp/cedet/semantic/wisent/grammar.el +++ b/lisp/cedet/semantic/wisent/grammar.el | |||
| @@ -304,7 +304,6 @@ Return the expanded expression." | |||
| 304 | semantic-flex-keywords-obarray %s\n\ | 304 | semantic-flex-keywords-obarray %s\n\ |
| 305 | semantic-lex-types-obarray %s)\n\ | 305 | semantic-lex-types-obarray %s)\n\ |
| 306 | ;; Collect unmatched syntax lexical tokens\n\ | 306 | ;; Collect unmatched syntax lexical tokens\n\ |
| 307 | (semantic-make-local-hook 'wisent-discarding-token-functions)\n\ | ||
| 308 | (add-hook 'wisent-discarding-token-functions\n\ | 307 | (add-hook 'wisent-discarding-token-functions\n\ |
| 309 | 'wisent-collect-unmatched-syntax nil t)" | 308 | 'wisent-collect-unmatched-syntax nil t)" |
| 310 | (semantic-grammar-parsetable) | 309 | (semantic-grammar-parsetable) |