Index: semantic/semantic-decorate-include.el =================================================================== RCS file: /cvsroot/cedet/cedet/semantic/semantic-decorate-include.el,v retrieving revision 1.17 diff -b -u -p -r1.17 semantic-decorate-include.el --- semantic/semantic-decorate-include.el 27 Oct 2008 01:39:39 -0000 1.17 +++ semantic/semantic-decorate-include.el 27 Nov 2008 16:00:44 -0000 @@ -47,7 +47,8 @@ Used by the decoration style: `semantic- (defvar semantic-decoration-on-include-map (let ((km (make-sparse-keymap))) - (define-key km [ mouse-3 ] 'semantic-decoration-include-menu) +; (define-key km [ mouse-3 ] 'semantic-decoration-include-menu) + (define-key km [ button3 ] 'semantic-decoration-include-menu) km) "Keymap used on includes.") @@ -59,39 +60,29 @@ Used by the decoration style: `semantic- semantic-decoration-on-include-menu semantic-decoration-on-include-map "Include Menu" - '("Include" :visible (progn nil) + '("Include" ["What Is This?" semantic-decoration-include-describe - :active t - :help "Describe why this include has been marked this way." ] + :active t] ["Visit This Include" semantic-decoration-include-visit - :active t - :help "Visit this include file." ] + :active t] "---" ["Summarize includes current buffer" semantic-decoration-all-include-summary - :active t - :help "Show a summary for the current buffer containing this include." ] + :active t] ["List found includes (load unparsed)" semanticdb-find-test-translate-path - :active t - :help "List all includes found for this file, and parse unparsed files." ] + :active t] ["List found includes (no loading)" semanticdb-find-test-translate-path-no-loading - :active t - :help "List all includes found for this file, do not parse unparsed files." ] + :active t] ["List all unknown includes" semanticdb-find-adebug-lost-includes - :active t - :help "Show a list of all includes semantic cannot find for this file." ] + :active t] "---" ["Customize System Include Path" semantic-customize-system-include-path - :active (get 'semantic-dependency-system-include-path major-mode) - :help "Run customize for the system include path for this major mode." ] + :active (get 'semantic-dependency-system-include-path major-mode)] ["Add a System Include Path" semantic-add-system-include - :active t - :help "Add an include path for this session." ] + :active t] ["Remove a System Include Path" semantic-remove-system-include - :active t - :help "Add an include path for this session." ] + :active t] ;;["" semantic-decoration-include- - ;; :active t - ;; :help "" ] + ;; :active t] )) ;;; Unknown Includes! @@ -108,7 +99,8 @@ Used by the decoration style: `semantic- (defvar semantic-decoration-on-unknown-include-map (let ((km (make-sparse-keymap))) ;(define-key km [ mouse-2 ] 'semantic-decoration-unknown-include-describe) - (define-key km [ mouse-3 ] 'semantic-decoration-unknown-include-menu) +; (define-key km [ mouse-3 ] 'semantic-decoration-unknown-include-menu) + (define-key km [ button3 ] 'semantic-decoration-unknown-include-menu) km) "Keymap used on unparsed includes.") @@ -119,33 +111,25 @@ Used by the decoration style: `semantic- semantic-decoration-on-unknown-include-menu semantic-decoration-on-unknown-include-map "Unknown Include Menu" - '("Unknown Include" :visible (progn nil) + '("Unknown Include" ["What Is This?" semantic-decoration-unknown-include-describe - :active t - :help "Describe why this include has been marked this way." ] + :active t] ["List all unknown includes" semanticdb-find-adebug-lost-includes - :active t - :Help "Show a list of all includes semantic cannot find for this file." ] + :active t] "---" ["Summarize includes current buffer" semantic-decoration-all-include-summary - :active t - :help "Show a summary for the current buffer containing this include." ] + :active t] ["List found includes (load unparsed)" semanticdb-find-test-translate-path - :active t - :help "List all includes found for this file, and parse unparsed files." ] + :active t] ["List found includes (no loading)" semanticdb-find-test-translate-path-no-loading - :active t - :help "List all includes found for this file, do not parse unparsed files." ] + :active t] "---" ["Customize System Include Path" semantic-customize-system-include-path - :active (get 'semantic-dependency-system-include-path major-mode) - :help "Run customize for the system include path for this major mode." ] + :active (get 'semantic-dependency-system-include-path major-mode)] ["Add a System Include Path" semantic-add-system-include - :active t - :help "Add an include path for this session." ] + :active t] ["Remove a System Include Path" semantic-remove-system-include - :active t - :help "Add an include path for this session." ] + :active t] )) ;;; Includes that need to be parsed. @@ -161,7 +145,8 @@ Used by the decoration style: `semantic- (defvar semantic-decoration-on-unparsed-include-map (let ((km (make-sparse-keymap))) - (define-key km [ mouse-3 ] 'semantic-decoration-unparsed-include-menu) +; (define-key km [ mouse-3 ] 'semantic-decoration-unparsed-include-menu) + (define-key km [ button3 ] 'semantic-decoration-unparsed-include-menu) km) "Keymap used on unparsed includes.") @@ -173,45 +158,33 @@ Used by the decoration style: `semantic- semantic-decoration-on-unparsed-include-menu semantic-decoration-on-unparsed-include-map "Unparsed Include Menu" - '("Unparsed Include" :visible (progn nil) + '("Unparsed Include" ["What Is This?" semantic-decoration-unparsed-include-describe - :active t - :help "Describe why this include has been marked this way." ] + :active t] ["Visit This Include" semantic-decoration-include-visit - :active t - :help "Visit this include file so that header file's tags can be used." ] + :active t] ["Parse This Include" semantic-decoration-unparsed-include-parse-include - :active t - :help "Parse this include file so that header file's tags can be used." ] + :active t] ["Parse All Includes" semantic-decoration-unparsed-include-parse-all-includes - :active t - :help "Parse all the includes so the contents can be used." ] + :active t] "---" ["Summarize includes current buffer" semantic-decoration-all-include-summary - :active t - :help "Show a summary for the current buffer containing this include." ] + :active t] ["List found includes (load unparsed)" semanticdb-find-test-translate-path - :active t - :help "List all includes found for this file, and parse unparsed files." ] + :active t] ["List found includes (no loading)" semanticdb-find-test-translate-path-no-loading - :active t - :help "List all includes found for this file, do not parse unparsed files." ] + :active t] ["List all unknown includes" semanticdb-find-adebug-lost-includes - :active t - :help "Show a list of all includes semantic cannot find for this file." ] + :active t] "---" ["Customize System Include Path" semantic-customize-system-include-path - :active (get 'semantic-dependency-system-include-path major-mode) - :help "Run customize for the system include path for this major mode." ] + :active (get 'semantic-dependency-system-include-path major-mode)] ["Add a System Include Path" semantic-add-system-include - :active t - :help "Add an include path for this session." ] + :active t] ["Remove a System Include Path" semantic-remove-system-include - :active t - :help "Add an include path for this session." ] + :active t] ;;["" semantic-decoration-unparsed-include- - ;; :active t - ;; :help "" ] + ;; :active t] )) @@ -268,7 +241,7 @@ This mode provides a nice context menu o (semantic-tag-end tag) face)) ) - (semantic-overlay-put ol 'mouse-face 'region) + (semantic-overlay-put ol 'mouse-face 'highlight) (semantic-overlay-put ol 'keymap map) (semantic-overlay-put ol 'help-echo "Header File : mouse-3 - Context menu") @@ -362,7 +335,7 @@ its contents. Argument EVENT describes the event that caused this function to be called." (interactive "e") (let* ((startwin (selected-window)) - (win (car (car (cdr event)))) + (win (event-window event)) (eb (window-buffer win)) ) (select-window win t) @@ -443,7 +416,7 @@ See the Semantic manual node on Semantic Argument EVENT describes the event that caused this function to be called." (interactive "e") (let* ((startwin (selected-window)) - (win (car (car (cdr event)))) + (win (event-window event)) (eb (window-buffer win)) ) (select-window win t) @@ -505,7 +478,7 @@ report it to cedet-devel@lists.sf.net.") Argument EVENT describes the event that caused this function to be called." (interactive "e") (let* ((startwin (selected-window)) - (win (car (car (cdr event)))) + (win (event-window event)) (eb (window-buffer win)) ) (select-window win t)