[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog cedet/ede.el cedet/ede/ema...
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog cedet/ede.el cedet/ede/ema... |
Date: |
Sat, 05 Dec 2009 19:10:49 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 09/12/05 19:10:47
Modified files:
lisp : ChangeLog
lisp/cedet : ede.el
lisp/cedet/ede : emacs.el pmake.el
lisp/cedet/semantic: complete.el
lisp/cedet/semantic/bovine: c.el
Log message:
* cedet/semantic/bovine/c.el (semantic-c-describe-environment):
Describe project macro symbols.
* cedet/semantic/complete.el (semantic-complete-do-completion):
Don't call semantic-collector-current-exact-match.
* cedet/ede.el (ede-apply-preprocessor-map): Accept lists of
ede-objects as targets.
* cedet/ede/pmake.el (ede-proj-makefile-insert-variables): Output
a target's object list even if compiler vars are already in the
Makefile.
* cedet/ede/emacs.el (ede-preprocessor-map): Add config.h to the
list of headers producing necessary macros.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16826&r2=1.16827
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/ede.el?cvsroot=emacs&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/ede/emacs.el?cvsroot=emacs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/ede/pmake.el?cvsroot=emacs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/semantic/complete.el?cvsroot=emacs&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/semantic/bovine/c.el?cvsroot=emacs&r1=1.9&r2=1.10
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16826
retrieving revision 1.16827
diff -u -b -r1.16826 -r1.16827
--- ChangeLog 5 Dec 2009 04:08:48 -0000 1.16826
+++ ChangeLog 5 Dec 2009 19:10:42 -0000 1.16827
@@ -1,3 +1,21 @@
+2009-12-05 Eric Ludlam <address@hidden>
+
+ * cedet/semantic/bovine/c.el (semantic-c-describe-environment):
+ Describe project macro symbols.
+
+ * cedet/semantic/complete.el (semantic-complete-do-completion):
+ Don't call semantic-collector-current-exact-match.
+
+ * cedet/ede.el (ede-apply-preprocessor-map): Accept lists of
+ ede-objects as targets.
+
+ * cedet/ede/pmake.el (ede-proj-makefile-insert-variables): Output
+ a target's object list even if compiler vars are already in the
+ Makefile.
+
+ * cedet/ede/emacs.el (ede-preprocessor-map): Add config.h to the
+ list of headers producing necessary macros.
+
2009-12-05 Roland Winkler <address@hidden>
* textmodes/bibtex.el (bibtex-map-entries): Use marker to keep
Index: cedet/ede.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/ede.el,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- cedet/ede.el 3 Nov 2009 21:45:34 -0000 1.12
+++ cedet/ede.el 5 Dec 2009 19:10:46 -0000 1.13
@@ -1865,12 +1865,17 @@
(defun ede-apply-preprocessor-map ()
"Apply preprocessor tables onto the current buffer."
(when (and ede-object (boundp 'semantic-lex-spp-macro-symbol-obarray))
- (let ((map (ede-preprocessor-map ede-object)))
+ (let* ((objs ede-object)
+ (map (ede-preprocessor-map (if (consp objs)
+ (car objs)
+ objs))))
(when map
;; We can't do a require for the below symbol.
(setq semantic-lex-spp-macro-symbol-obarray
- (semantic-lex-make-spp-table map))
- ))))
+ (semantic-lex-make-spp-table map)))
+ (when (consp objs)
+ (message "Choosing preprocessor syms for project %s"
+ (object-name (car objs)))))))
(defmethod ede-system-include-path ((this ede-project))
"Get the system include path used by project THIS."
Index: cedet/ede/emacs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/ede/emacs.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- cedet/ede/emacs.el 3 Nov 2009 21:45:34 -0000 1.6
+++ cedet/ede/emacs.el 5 Dec 2009 19:10:46 -0000 1.7
@@ -219,6 +219,8 @@
(root (ede-project-root proj))
(table (semanticdb-file-table-object
(ede-expand-filename root "lisp.h")))
+ (config (semanticdb-file-table-object
+ (ede-expand-filename root "config.h")))
filemap
)
(when table
@@ -226,6 +228,11 @@
(semanticdb-refresh-table table))
(setq filemap (append filemap (oref table lexical-table)))
)
+ (when config
+ (when (semanticdb-needs-refresh-p config)
+ (semanticdb-refresh-table config))
+ (setq filemap (append filemap (oref config lexical-table)))
+ )
filemap
))
Index: cedet/ede/pmake.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/ede/pmake.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- cedet/ede/pmake.el 17 Oct 2009 04:18:34 -0000 1.6
+++ cedet/ede/pmake.el 5 Dec 2009 19:10:47 -0000 1.7
@@ -427,9 +427,9 @@
(src (oref this source)))
(while comp
(ede-compiler-only-once (car comp)
- (ede-proj-makefile-insert-object-variables (car comp) name src)
(ede-proj-makefile-insert-variables (car comp)))
(setq comp (cdr comp)))
+ (ede-proj-makefile-insert-object-variables (car comp) name src)
(while link
(ede-linker-only-once (car link)
(ede-proj-makefile-insert-variables (car link)))
Index: cedet/semantic/complete.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/semantic/complete.el,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- cedet/semantic/complete.el 22 Nov 2009 23:49:17 -0000 1.11
+++ cedet/semantic/complete.el 5 Dec 2009 19:10:47 -0000 1.12
@@ -515,8 +515,13 @@
(semantic-displayor-set-completions
displayor
(or
- (and (not (eq na 'displayend))
- (semantic-collector-current-exact-match collector))
+ ;; For the below - This caused problems for Chong Yidong
+ ;; when experimenting with the completion engine. I don't
+ ;; remember what the problem was though, and I wasn't sure why
+ ;; the below two lines were there since they obviously added
+ ;; some odd behavior. -EML
+ ;; (and (not (eq na 'displayend))
+ ;; (semantic-collector-current-exact-match collector))
(semantic-collector-all-completions collector contents))
contents)
;; Ask the displayor to display them.
Index: cedet/semantic/bovine/c.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/semantic/bovine/c.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- cedet/semantic/bovine/c.el 22 Nov 2009 23:49:18 -0000 1.9
+++ cedet/semantic/bovine/c.el 5 Dec 2009 19:10:47 -0000 1.10
@@ -1759,6 +1759,24 @@
(princ "\n")
))
+ (when (arrayp semantic-lex-spp-project-macro-symbol-obarray)
+ (princ "\n Project symbol map:\n")
+ (princ " Your project symbol map is derived from the EDE object:\n
")
+ (princ (object-print ede-object))
+ (princ "\n\n")
+ (let ((macros nil))
+ (mapatoms
+ #'(lambda (symbol)
+ (setq macros (cons symbol macros)))
+ semantic-lex-spp-project-macro-symbol-obarray)
+ (dolist (S macros)
+ (princ " ")
+ (princ (symbol-name S))
+ (princ " = ")
+ (princ (symbol-value S))
+ (princ "\n")
+ )))
+
(princ "\n\n Use: M-x semantic-lex-spp-describe RET\n")
(princ "\n to see the complete macro table.\n")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog cedet/ede.el cedet/ede/ema...,
Chong Yidong <=