comparison lisp/cedet/semantic.el @ 104512:aa2a07e5db2f

* cedet/semantic.el (semantic-parser-working-message): Use a less technical parsing message. (semantic-mode): Require semantic/db-ebrowse if we need to. * cedet/semantic/util-modes.el (semantic-highlight-func-mode): Doc fix.
author Chong Yidong <cyd@stupidchicken.com>
date Mon, 21 Sep 2009 19:05:56 +0000
parents 90ca5d588aa9
children c65d65798b34
comparison
equal deleted inserted replaced
104511:afd748c5780c 104512:aa2a07e5db2f
35 35
36 (defvar semantic-version "2.0pre7" 36 (defvar semantic-version "2.0pre7"
37 "Current version of Semantic.") 37 "Current version of Semantic.")
38 38
39 (declare-function inversion-test "inversion") 39 (declare-function inversion-test "inversion")
40 (declare-function semanticdb-load-ebrowse-caches "semantic/db-ebrowse")
40 41
41 (defun semantic-require-version (major minor &optional beta) 42 (defun semantic-require-version (major minor &optional beta)
42 "Non-nil if this version of semantic does not satisfy a specific version. 43 "Non-nil if this version of semantic does not satisfy a specific version.
43 Arguments can be: 44 Arguments can be:
44 45
523 524
524 (defsubst semantic-parser-working-message (&optional arg) 525 (defsubst semantic-parser-working-message (&optional arg)
525 "Return the message string displayed while parsing. 526 "Return the message string displayed while parsing.
526 If optional argument ARG is non-nil it is appended to the message 527 If optional argument ARG is non-nil it is appended to the message
527 string." 528 string."
528 (if semantic-parser-name 529 (concat "Parsing"
529 (format "%s/%s..." semantic-parser-name (or arg "")) 530 (if arg (format " %s" arg))
530 (format "%s" (or arg "")))) 531 (if semantic-parser-name (format " (%s)" semantic-parser-name))
532 "..."))
531 533
532 ;;; Application Parser Entry Points 534 ;;; Application Parser Entry Points
533 ;; 535 ;;
534 ;; The best way to call the parser from programs is via 536 ;; The best way to call the parser from programs is via
535 ;; `semantic-fetch-tags'. This, in turn, uses other internal 537 ;; `semantic-fetch-tags'. This, in turn, uses other internal
876 (unless semantic-load-system-cache-loaded 878 (unless semantic-load-system-cache-loaded
877 (setq semantic-load-system-cache-loaded t) 879 (setq semantic-load-system-cache-loaded t)
878 (when (and (boundp 'semanticdb-default-system-save-directory) 880 (when (and (boundp 'semanticdb-default-system-save-directory)
879 (stringp semanticdb-default-system-save-directory) 881 (stringp semanticdb-default-system-save-directory)
880 (file-exists-p semanticdb-default-system-save-directory)) 882 (file-exists-p semanticdb-default-system-save-directory))
883 (require 'semantic/db-ebrowse)
881 (semanticdb-load-ebrowse-caches))) 884 (semanticdb-load-ebrowse-caches)))
882 (add-hook 'mode-local-init-hook 'semantic-new-buffer-fcn) 885 (add-hook 'mode-local-init-hook 'semantic-new-buffer-fcn)
883 ;; Add mode-local hooks 886 ;; Add mode-local hooks
884 (add-hook 'javascript-mode-hook 'wisent-javascript-setup-parser) 887 (add-hook 'javascript-mode-hook 'wisent-javascript-setup-parser)
885 (add-hook 'ecmascript-mode-hook 'wisent-javascript-setup-parser) 888 (add-hook 'ecmascript-mode-hook 'wisent-javascript-setup-parser)