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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/11/20 01:35:54

Modified files:
        lisp           : ChangeLog 
        lisp/cedet     : cedet.el semantic.el 
        lisp/cedet/semantic: idle.el 

Log message:
        * cedet/cedet.el (cedet-menu-map): Re-order menu items.
        
        * cedet/semantic.el: Enable idle-mode menu items only if
        global-semantic-idle-scheduler-mode is enabled.
        (semantic-default-submodes): Doc fix.
        
        * cedet/semantic/idle.el (global-semantic-idle-scheduler-mode):
        When turning off, disable other idle modes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16679&r2=1.16680
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/cedet.el?cvsroot=emacs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/semantic.el?cvsroot=emacs&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/semantic/idle.el?cvsroot=emacs&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16679
retrieving revision 1.16680
diff -u -b -r1.16679 -r1.16680
--- ChangeLog   20 Nov 2009 01:17:15 -0000      1.16679
+++ ChangeLog   20 Nov 2009 01:35:49 -0000      1.16680
@@ -1,3 +1,14 @@
+2009-11-20  Chong Yidong  <address@hidden>
+
+       * cedet/cedet.el (cedet-menu-map): Re-order menu items.
+
+       * cedet/semantic.el: Enable idle-mode menu items only if
+       global-semantic-idle-scheduler-mode is enabled.
+       (semantic-default-submodes): Doc fix.
+
+       * cedet/semantic/idle.el (global-semantic-idle-scheduler-mode):
+       When turning off, disable other idle modes.
+
 2009-11-20  Jay Belanger  <address@hidden>
 
        * calc/calc.el (calc-set-mode-line): Rename

Index: cedet/cedet.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/cedet.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- cedet/cedet.el      31 Oct 2009 18:03:06 -0000      1.5
+++ cedet/cedet.el      20 Nov 2009 01:35:53 -0000      1.6
@@ -61,8 +61,8 @@
     (define-key map [global-semantic-decoration-mode]       'undefined)
     (define-key map [global-semantic-idle-completions-mode] 'undefined)
     (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 [global-semanticdb-minor-mode]          'undefined)
     (define-key map [cedet-menu-separator] 'undefined)
     (define-key map [ede-find-file]        'undefined)
     (define-key map [ede-speedbar]         'undefined)

Index: cedet/semantic.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/semantic.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- cedet/semantic.el   31 Oct 2009 18:03:07 -0000      1.10
+++ cedet/semantic.el   20 Nov 2009 01:35:54 -0000      1.11
@@ -987,22 +987,24 @@
     '(menu-item "Show Tag Completions" global-semantic-idle-completions-mode
                :help "Show tag completions when idle"
                :visible semantic-mode
+               :enable global-semantic-idle-scheduler-mode
                :button (:toggle . global-semantic-idle-completions-mode)))
   (define-key cedet-menu-map [global-semantic-idle-summary-mode]
     '(menu-item "Show Tag Summaries" global-semantic-idle-summary-mode
                :help "Show tag summaries when idle"
                :visible semantic-mode
+               :enable global-semantic-idle-scheduler-mode
                :button (:toggle . global-semantic-idle-summary-mode)))
-  (define-key cedet-menu-map [global-semanticdb-minor-mode]
-    '(menu-item "Semantic Database" global-semanticdb-minor-mode
-               :help "Store tag information in a database"
-               :visible semantic-mode
-               :button (:toggle . global-semanticdb-minor-mode)))
   (define-key cedet-menu-map [global-semantic-idle-scheduler-mode]
     '(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))))
+               :button (:toggle . global-semantic-idle-scheduler-mode)))
+  (define-key cedet-menu-map [global-semanticdb-minor-mode]
+    '(menu-item "Semantic Database" global-semanticdb-minor-mode
+               :help "Store tag information in a database"
+               :visible semantic-mode
+               :button (:toggle . global-semanticdb-minor-mode))))
 
 ;; The `semantic-mode' command, in conjuction with the
 ;; `semantic-default-submodes' variable, toggles Semantic's various
@@ -1029,15 +1031,14 @@
   "List of auxiliary Semantic minor modes enabled by `semantic-mode'.
 The possible elements of this list include the following:
 
- `semantic-highlight-func-mode'   - Highlight the current tag.
- `semantic-decoration-mode' - Decorate tags based on various attributes.
- `semantic-stickyfunc-mode' - Track current function in the header-line.
- `semantic-idle-completions-mode' - Provide smart symbol completion
-                                    automatically when idle.
- `semantic-idle-scheduler-mode'   - Keep a buffer's parse tree up to date.
- `semanticdb-minor-mode'    - Store tags when a buffer is not in memory.
- `semantic-idle-summary-mode'     - Show a summary for the code at point.
- `semantic-mru-bookmark-mode'     - Provide `switch-to-buffer'-like
+ `global-semanticdb-minor-mode'        - Maintain tag database.
+ `global-semantic-idle-scheduler-mode' - Reparse buffer when idle.
+ `global-semantic-idle-summary-mode'   - Show summary of tag at point.
+ `global-semantic-idle-completions-mode' - Show completions when idle.
+ `global-semantic-decoration-mode'     - Additional tag decorations.
+ `global-semantic-highlight-func-mode' - Highlight the current tag.
+ `global-semantic-stickyfunc-mode'     - Show current fun in header line.
+ `global-semantic-mru-bookmark-mode'   - Provide `switch-to-buffer'-like
                                     keybinding for tag names."
   :group 'semantic
   :type `(set ,@(mapcar (lambda (c) (list 'const c))

Index: cedet/semantic/idle.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/semantic/idle.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- cedet/semantic/idle.el      15 Nov 2009 15:37:20 -0000      1.10
+++ cedet/semantic/idle.el      20 Nov 2009 01:35:54 -0000      1.11
@@ -147,12 +147,18 @@
 If ARG is positive, enable, if it is negative, disable.
 If ARG is nil, then toggle."
   (interactive "P")
+  ;; When turning off, disable other idle modes.
+  (when (or (and (numberp arg) (< arg 0))
+           (and (null arg) global-semantic-idle-scheduler-mode))
+    (global-semantic-idle-summary-mode -1)
+    (global-semantic-idle-tag-highlight-mode -1)
+    (global-semantic-idle-completions-mode -1))
   (setq global-semantic-idle-scheduler-mode
         (semantic-toggle-minor-mode-globally
          'semantic-idle-scheduler-mode arg)))
 
 (defcustom semantic-idle-scheduler-mode-hook nil
-  "Hook run at the end of function `semantic-idle-scheduler-mode'."
+  "Hook run at the end of the function `semantic-idle-scheduler-mode'."
   :group 'semantic
   :type 'hook)