[Emacs-diffs] emacs/lisp ChangeLog menu-bar.el cedet/cedet.el...

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/10/31 18:03:07

Modified files:
        lisp           : ChangeLog menu-bar.el 
        lisp/cedet     : cedet.el ede.el semantic.el 

Log message:
        * menu-bar.el (menu-bar-tools-menu): Add Semantic and EDE menu
        items.
        
        * cedet/cedet.el (cedet-menu-map): Remove Semantic and EDE menu
        items.
        
        * cedet/ede.el (ede-minor-mode):
        * cedet/semantic.el (semantic-mode): Toggle menu separators.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16534&r2=1.16535
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/menu-bar.el?cvsroot=emacs&r1=1.364&r2=1.365
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/cedet.el?cvsroot=emacs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/ede.el?cvsroot=emacs&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/semantic.el?cvsroot=emacs&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16534
retrieving revision 1.16535
diff -u -b -r1.16534 -r1.16535
--- ChangeLog   31 Oct 2009 02:38:34 -0000      1.16534
+++ ChangeLog   31 Oct 2009 18:03:02 -0000      1.16535
@@ -1,3 +1,14 @@
+2009-10-31  Chong Yidong  <address@hidden>
+
+       * menu-bar.el (menu-bar-tools-menu): Add Semantic and EDE menu
+       items.
+
+       * cedet/cedet.el (cedet-menu-map): Remove Semantic and EDE menu
+       items.
+
+       * cedet/ede.el (ede-minor-mode):
+       * cedet/semantic.el (semantic-mode): Toggle menu separators.
+
 2009-10-31  Stefan Monnier  <address@hidden>
 
        * textmodes/two-column.el (2C-split):

Index: menu-bar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/menu-bar.el,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -b -r1.364 -r1.365
--- menu-bar.el 23 Oct 2009 08:20:20 -0000      1.364
+++ menu-bar.el 31 Oct 2009 18:03:06 -0000      1.365
@@ -1326,6 +1326,18 @@
 (define-key menu-bar-tools-menu [separator-prog]
   '("--"))
 
+(define-key menu-bar-tools-menu [semantic]
+  `(menu-item ,(purecopy "Source Code Parsers (Semantic)")
+             semantic-mode
+             :help ,(purecopy "Toggle automatic parsing in source code buffers 
(Semantic mode)")
+             :button (:toggle . (bound-and-true-p semantic-mode))))
+
+(define-key menu-bar-tools-menu [ede]
+  `(menu-item ,(purecopy "Project support (EDE)")
+             global-ede-mode
+             :help ,(purecopy "Toggle the Emacs Development Environment 
(Global EDE mode)")
+             :button (:toggle . (bound-and-true-p global-ede-mode))))
+
 (define-key menu-bar-tools-menu [gdb]
   `(menu-item ,(purecopy "Debugger (GDB)...") gdb
              :help ,(purecopy "Debug a program from within Emacs with GDB")))

Index: cedet/cedet.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/cedet.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- cedet/cedet.el      2 Oct 2009 10:53:34 -0000       1.4
+++ cedet/cedet.el      31 Oct 2009 18:03:06 -0000      1.5
@@ -63,17 +63,7 @@
     (define-key map [global-semantic-idle-summary-mode]     'undefined)
     (define-key map [global-semanticdb-minor-mode]          'undefined)
     (define-key map [global-semantic-idle-scheduler-mode]   'undefined)
-    (define-key map [semantic-menu-separator] '("--"))
-    (define-key map [semantic-mode]
-      '(menu-item "Enable Parsers (Semantic)" semantic-mode
-                 :help "Enable language parsers (Semantic)"
-                 :visible (not (bound-and-true-p semantic-mode))))
     (define-key map [cedet-menu-separator] 'undefined)
-    (define-key map [ede-mode]
-      '(menu-item "Enable Project Support (EDE)" global-ede-mode
-                 :help "Enable the Emacs Development Environment (EDE)"
-                 :visible (not (bound-and-true-p global-ede-mode))))
-    (define-key map [ede-menu-separator] '("--"))
     (define-key map [ede-find-file]        'undefined)
     (define-key map [ede-speedbar]         'undefined)
     (define-key map [ede] 'undefined)

Index: cedet/ede.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/ede.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- cedet/ede.el        30 Oct 2009 02:16:42 -0000      1.10
+++ cedet/ede.el        31 Oct 2009 18:03:07 -0000      1.11
@@ -585,27 +585,31 @@
 ;; Activate the EDE items in cedet-menu-map
 
 (define-key cedet-menu-map [ede-find-file]
-  '(menu-item "Find File in Project..." ede-find-file :enable ede-object))
+  '(menu-item "Find File in Project..." ede-find-file :enable ede-object
+             :visible global-ede-mode))
 (define-key cedet-menu-map [ede-speedbar]
-  '(menu-item "View Project Tree" ede-speedbar :enable ede-object))
+  '(menu-item "View Project Tree" ede-speedbar :enable ede-object
+             :visible global-ede-mode))
 (define-key cedet-menu-map [ede]
-  '(menu-item "Load Project" ede))
+  '(menu-item "Load Project" ede
+             :visible global-ede-mode))
 (define-key cedet-menu-map [ede-new]
   '(menu-item "Create Project" ede-new
-             :enable (not ede-object)))
+             :enable (not ede-object)
+             :visible global-ede-mode))
 (define-key cedet-menu-map [ede-target-options]
   '(menu-item "Target Options" ede-target-options
-             :filter ede-target-forms-menu))
+             :filter ede-target-forms-menu
+             :visible global-ede-mode))
 (define-key cedet-menu-map [ede-project-options]
   '(menu-item "Project Options" ede-project-options
-             :filter ede-project-forms-menu))
+             :filter ede-project-forms-menu
+             :visible global-ede-mode))
 (define-key cedet-menu-map [ede-build-forms-menu]
   '(menu-item "Build Project" ede-build-forms-menu
              :filter ede-build-forms-menu
-             :enable ede-object))
-(define-key cedet-menu-map [semantic-menu-separator] 'undefined)
-(define-key cedet-menu-map [cedet-menu-separator] 'undefined)
-(define-key cedet-menu-map [ede-menu-separator] '("--"))
+             :enable ede-object
+             :visible global-ede-mode))
 
 (defun ede-menu-obj-of-class-p (class)
   "Return non-nil if some member of `ede-object' is a child of CLASS."
@@ -841,6 +845,8 @@
   (if global-ede-mode
       ;; Turn on global-ede-mode
       (progn
+       (if semantic-mode
+           (define-key cedet-menu-map [cedet-menu-separator] '("--")))
        (add-hook 'semanticdb-project-predicate-functions 
'ede-directory-project-p)
        (add-hook 'semanticdb-project-root-functions 
'ede-toplevel-project-or-nil)
        (add-hook 'ecb-source-path-functions 'ede-ecb-project-paths)
@@ -850,6 +856,7 @@
        (ede-load-cache)
        (ede-reset-all-buffers 1))
     ;; Turn off global-ede-mode
+    (define-key cedet-menu-map [cedet-menu-separator] nil)
     (remove-hook 'semanticdb-project-predicate-functions 
'ede-directory-project-p)
     (remove-hook 'semanticdb-project-root-functions 
'ede-toplevel-project-or-nil)
     (remove-hook 'ecb-source-path-functions 'ede-ecb-project-paths)

Index: cedet/semantic.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/semantic.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- cedet/semantic.el   25 Oct 2009 02:55:28 -0000      1.9
+++ cedet/semantic.el   31 Oct 2009 18:03:07 -0000      1.10
@@ -1002,10 +1002,7 @@
     '(menu-item "Reparse When Idle" global-semantic-idle-scheduler-mode
                :help "Keep a buffer's parse tree up to date when idle"
                :visible semantic-mode
-               :button (:toggle . global-semantic-idle-scheduler-mode)))
-  (define-key cedet-menu-map [ede-menu-separator] 'undefined)
-  (define-key cedet-menu-map [cedet-menu-separator] 'undefined)
-  (define-key cedet-menu-map [semantic-menu-separator] '("--")))
+               :button (:toggle . global-semantic-idle-scheduler-mode))))
 
 ;; The `semantic-mode' command, in conjuction with the
 ;; `semantic-default-submodes' variable, toggles Semantic's various
@@ -1076,11 +1073,15 @@
            (require 'semantic/db-ebrowse)
            (semanticdb-load-ebrowse-caches)))
        (add-hook 'mode-local-init-hook 'semantic-new-buffer-fcn)
+       (if global-ede-mode
+           (define-key cedet-menu-map [cedet-menu-separator] '("--")))
        (dolist (b (buffer-list))
          (with-current-buffer b
            (semantic-new-buffer-fcn))))
     ;; Disable all Semantic features.
     (remove-hook 'mode-local-init-hook 'semantic-new-buffer-fcn)
+    (define-key cedet-menu-map [cedet-menu-separator] nil)
+    (define-key cedet-menu-map [semantic-options-separator] nil)
     ;; FIXME: handle semanticdb-load-ebrowse-caches
     (dolist (mode semantic-submode-list)
       (if (and (boundp mode) (eval mode))