aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2009-10-01 02:19:38 +0000
committerGlenn Morris2009-10-01 02:19:38 +0000
commit57b0083abbeba404b30cdae25e9791fd40bc9691 (patch)
tree68fa7910bda7736d49f01cae3771744ed5084e19
parentb15c31c722dab1e91e9a3ab0ae130a79b60d1341 (diff)
downloademacs-57b0083abbeba404b30cdae25e9791fd40bc9691.tar.gz
emacs-57b0083abbeba404b30cdae25e9791fd40bc9691.zip
(semantic-c-reset-preprocessor-symbol-map): Fix declaration.
(semantic-gcc-get-include-paths, semantic-gcc-setup-data): Doc fixes.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/cedet/semantic/bovine/gcc.el11
2 files changed, 9 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f10abfb6b70..decde262f49 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12009-10-01 Glenn Morris <rgm@gnu.org> 12009-10-01 Glenn Morris <rgm@gnu.org>
2 2
3 * cedet/semantic/bovine/gcc.el
4 (semantic-c-reset-preprocessor-symbol-map): Fix declaration.
5 (semantic-gcc-get-include-paths, semantic-gcc-setup-data): Doc fixes.
6
3 * emacs-lisp/check-declare.el (check-declare-scan): Read the declaration 7 * emacs-lisp/check-declare.el (check-declare-scan): Read the declaration
4 rather than parsing it as a regexp. This relaxes the layout 8 rather than parsing it as a regexp. This relaxes the layout
5 requirements and makes errors easier to detect. 9 requirements and makes errors easier to detect.
diff --git a/lisp/cedet/semantic/bovine/gcc.el b/lisp/cedet/semantic/bovine/gcc.el
index 5466546b61c..64797e4aa81 100644
--- a/lisp/cedet/semantic/bovine/gcc.el
+++ b/lisp/cedet/semantic/bovine/gcc.el
@@ -28,8 +28,7 @@
28 28
29(defvar semantic-lex-c-preprocessor-symbol-file) 29(defvar semantic-lex-c-preprocessor-symbol-file)
30(defvar semantic-lex-c-preprocessor-symbol-map) 30(defvar semantic-lex-c-preprocessor-symbol-map)
31(declare-function semantic-c-reset-preprocessor-symbol-map 31(declare-function semantic-c-reset-preprocessor-symbol-map "semantic/bovine/c")
32 "semantic/bovine/gcc")
33 32
34;;; Code: 33;;; Code:
35 34
@@ -63,7 +62,7 @@ to give to the program."
63;;(semantic-gcc-get-include-paths "c") 62;;(semantic-gcc-get-include-paths "c")
64;;(semantic-gcc-get-include-paths "c++") 63;;(semantic-gcc-get-include-paths "c++")
65(defun semantic-gcc-get-include-paths (lang) 64(defun semantic-gcc-get-include-paths (lang)
66 "Return include paths as gcc use them for language LANG." 65 "Return include paths as gcc uses them for language LANG."
67 (let* ((gcc-cmd (cond 66 (let* ((gcc-cmd (cond
68 ((string= lang "c") "gcc") 67 ((string= lang "c") "gcc")
69 ((string= lang "c++") "c++") 68 ((string= lang "c++") "c++")
@@ -139,9 +138,9 @@ to give to the program."
139 "The GCC setup data. 138 "The GCC setup data.
140This is setup by `semantic-gcc-setup'. 139This is setup by `semantic-gcc-setup'.
141This is an alist, and should include keys of: 140This is an alist, and should include keys of:
142 'version - The version of gcc 141 'version - the version of gcc
143 '--host - The host symbol. (Used in include directories) 142 '--host - the host symbol (used in include directories)
144 '--prefix - Where GCC was installed. 143 '--prefix - where GCC was installed.
145It should also include other symbols GCC was compiled with.") 144It should also include other symbols GCC was compiled with.")
146 145
147;;;###autoload 146;;;###autoload