diff options
Diffstat (limited to 'lisp/cedet/semantic/lex-spp.el')
| -rw-r--r-- | lisp/cedet/semantic/lex-spp.el | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el index aa1bc8e5af2..f63d316c1ac 100644 --- a/lisp/cedet/semantic/lex-spp.el +++ b/lisp/cedet/semantic/lex-spp.el @@ -153,13 +153,13 @@ The search priority is: "Return the dynamic macro map for the current buffer." (or semantic-lex-spp-dynamic-macro-symbol-obarray (setq semantic-lex-spp-dynamic-macro-symbol-obarray - (make-vector 13 0)))) + (obarray-make 13)))) (defsubst semantic-lex-spp-dynamic-map-stack () "Return the dynamic macro map for the current buffer." (or semantic-lex-spp-dynamic-macro-symbol-obarray-stack (setq semantic-lex-spp-dynamic-macro-symbol-obarray-stack - (make-vector 13 0)))) + (obarray-make 13)))) (defun semantic-lex-spp-value-valid-p (value) "Return non-nil if VALUE is valid." @@ -260,7 +260,7 @@ NAME is the name of the spp macro symbol to define. REPLACEMENT a string that would be substituted in for NAME." ;; Create the symbol hash table - (let ((semantic-lex-spp-macro-symbol-obarray (make-vector 13 0)) + (let ((semantic-lex-spp-macro-symbol-obarray (obarray-make 13)) spec) ;; fill it with stuff (while specs @@ -434,8 +434,7 @@ continue processing recursively." (symbolp (car (car val)))) (mapconcat (lambda (subtok) (semantic-lex-spp-one-token-to-txt subtok)) - val - "")) + val)) ;; If val is nil, that's probably wrong. ;; Found a system header case where this was true. ((null val) "") @@ -699,8 +698,7 @@ be merged recursively." (message "Invalid merge macro encountered; \ will return empty string instead.") ""))) - txt - "")) + txt)) (defun semantic-lex-spp-find-closing-macro () "Find next macro which closes a scope through a close-paren. @@ -1243,7 +1241,7 @@ Finds the header file belonging to NAME, gets the macros from that file, and then merge the macros with our current symbol table." (when semantic-lex-spp-use-headers-flag - ;; @todo - do this someday, ok? + nil ; @todo - do this someday, ok? )) (defmacro define-lex-spp-include-analyzer (name doc regexp tokidx |