diff options
| author | Glenn Morris | 2009-11-24 02:38:08 +0000 |
|---|---|---|
| committer | Glenn Morris | 2009-11-24 02:38:08 +0000 |
| commit | 65235b0a3834e833d45e72bdcddf20fd0e868938 (patch) | |
| tree | 39f6358921decb35a749b14b900ff64fded5085c | |
| parent | c83b8d1bc78881bea0ea716afacd91d16fc297a6 (diff) | |
| download | emacs-65235b0a3834e833d45e72bdcddf20fd0e868938.tar.gz emacs-65235b0a3834e833d45e72bdcddf20fd0e868938.zip | |
(global-semantic-idle-scheduler-mode): Move after definition of
global-semantic-idle-tag-highlight-mode.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/cedet/semantic/idle.el | 38 |
2 files changed, 23 insertions, 18 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c051c1e1a66..212ab1f1846 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -3,6 +3,9 @@ | |||
| 3 | * bookmark.el (bookmark-bmenu-hide-filenames): Remove assignment to | 3 | * bookmark.el (bookmark-bmenu-hide-filenames): Remove assignment to |
| 4 | deleted variable bookmark-bmenu-bookmark-column. | 4 | deleted variable bookmark-bmenu-bookmark-column. |
| 5 | 5 | ||
| 6 | * cedet/semantic/idle.el (global-semantic-idle-scheduler-mode): | ||
| 7 | Move after definition of global-semantic-idle-tag-highlight-mode. | ||
| 8 | |||
| 6 | 2009-11-24 Stefan Monnier <monnier@iro.umontreal.ca> | 9 | 2009-11-24 Stefan Monnier <monnier@iro.umontreal.ca> |
| 7 | 10 | ||
| 8 | * bookmark.el (bookmark-bmenu-search): Clear echo area when exiting. | 11 | * bookmark.el (bookmark-bmenu-search): Clear echo area when exiting. |
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el index ca5a00a79f5..acb2a737bda 100644 --- a/lisp/cedet/semantic/idle.el +++ b/lisp/cedet/semantic/idle.el | |||
| @@ -139,24 +139,6 @@ unlikely the user would be ready to type again right away." | |||
| 139 | :set (lambda (sym val) | 139 | :set (lambda (sym val) |
| 140 | (global-semantic-idle-scheduler-mode (if val 1 -1)))) | 140 | (global-semantic-idle-scheduler-mode (if val 1 -1)))) |
| 141 | 141 | ||
| 142 | ;;;###autoload | ||
| 143 | (defun global-semantic-idle-scheduler-mode (&optional arg) | ||
| 144 | "Toggle global use of option `semantic-idle-scheduler-mode'. | ||
| 145 | The idle scheduler with automatically reparse buffers in idle time, | ||
| 146 | and then schedule other jobs setup with `semantic-idle-scheduler-add'. | ||
| 147 | If ARG is positive, enable, if it is negative, disable. | ||
| 148 | If ARG is nil, then toggle." | ||
| 149 | (interactive "P") | ||
| 150 | ;; When turning off, disable other idle modes. | ||
| 151 | (when (or (and (numberp arg) (< arg 0)) | ||
| 152 | (and (null arg) global-semantic-idle-scheduler-mode)) | ||
| 153 | (global-semantic-idle-summary-mode -1) | ||
| 154 | (global-semantic-idle-tag-highlight-mode -1) | ||
| 155 | (global-semantic-idle-completions-mode -1)) | ||
| 156 | (setq global-semantic-idle-scheduler-mode | ||
| 157 | (semantic-toggle-minor-mode-globally | ||
| 158 | 'semantic-idle-scheduler-mode arg))) | ||
| 159 | |||
| 160 | (defcustom semantic-idle-scheduler-mode-hook nil | 142 | (defcustom semantic-idle-scheduler-mode-hook nil |
| 161 | "Hook run at the end of the function `semantic-idle-scheduler-mode'." | 143 | "Hook run at the end of the function `semantic-idle-scheduler-mode'." |
| 162 | :group 'semantic | 144 | :group 'semantic |
| @@ -589,6 +571,7 @@ Does nothing if the current buffer doesn't need reparsing." | |||
| 589 | ;; needed to create the minor mode that will enable or disable | 571 | ;; needed to create the minor mode that will enable or disable |
| 590 | ;; a services. The services must provide a single function. | 572 | ;; a services. The services must provide a single function. |
| 591 | 573 | ||
| 574 | ;; FIXME doc is incomplete. | ||
| 592 | (defmacro define-semantic-idle-service (name doc &rest forms) | 575 | (defmacro define-semantic-idle-service (name doc &rest forms) |
| 593 | "Create a new idle services with NAME. | 576 | "Create a new idle services with NAME. |
| 594 | DOC will be a documentation string describing FORMS. | 577 | DOC will be a documentation string describing FORMS. |
| @@ -973,6 +956,25 @@ Call `semantic-symref-hits-in-region' to identify local references." | |||
| 973 | )))) | 956 | )))) |
| 974 | 957 | ||
| 975 | 958 | ||
| 959 | ;;;###autoload | ||
| 960 | (defun global-semantic-idle-scheduler-mode (&optional arg) | ||
| 961 | "Toggle global use of option `semantic-idle-scheduler-mode'. | ||
| 962 | The idle scheduler with automatically reparse buffers in idle time, | ||
| 963 | and then schedule other jobs setup with `semantic-idle-scheduler-add'. | ||
| 964 | If ARG is positive, enable, if it is negative, disable. | ||
| 965 | If ARG is nil, then toggle." | ||
| 966 | (interactive "P") | ||
| 967 | ;; When turning off, disable other idle modes. | ||
| 968 | (when (or (and (numberp arg) (< arg 0)) | ||
| 969 | (and (null arg) global-semantic-idle-scheduler-mode)) | ||
| 970 | (global-semantic-idle-summary-mode -1) | ||
| 971 | (global-semantic-idle-tag-highlight-mode -1) | ||
| 972 | (global-semantic-idle-completions-mode -1)) | ||
| 973 | (setq global-semantic-idle-scheduler-mode | ||
| 974 | (semantic-toggle-minor-mode-globally | ||
| 975 | 'semantic-idle-scheduler-mode arg))) | ||
| 976 | |||
| 977 | |||
| 976 | ;;; Completion Popup Mode | 978 | ;;; Completion Popup Mode |
| 977 | ;; | 979 | ;; |
| 978 | ;; This mode uses tooltips to display a (hopefully) short list of possible | 980 | ;; This mode uses tooltips to display a (hopefully) short list of possible |