diff options
author | Eric M. Ludlam <zappo@gnu.org> | 2010-09-21 18:11:23 -0400 |
---|---|---|
committer | Chong Yidong <cyd@stupidchicken.com> | 2010-09-21 18:11:23 -0400 |
commit | b9749554532876da8bc15e10bc3fb8bd8c0f32ea (patch) | |
tree | 0d00b9800e8eb95e8466ab322fde1879e378fddb /lisp/cedet/pulse.el | |
parent | fbb3da770f233a8e0cf99d5f053b0c31cbbc8db4 (diff) | |
download | emacs-b9749554532876da8bc15e10bc3fb8bd8c0f32ea.tar.gz |
Synch SRecode to CEDET 1.0.
* lisp/cedet/cedet.el (cedet-version):
* lisp/cedet/srecode.el (srecode-version): Bump version to 1.0.
* lisp/cedet/pulse.el (pulse-momentary-highlight-overlay): If pulse-flag is
'never, disable all pulsing.
* lisp/cedet/srecode/compile.el (srecode-compile-templates): Fix directory
compare of built-in templates. Give built-ins lower piority.
Support special variable "project".
(srecode-compile-template-table): Set :project slot of new tables.
(srecode-compile-one-template-tag): Use
srecode-create-dictionaries-from-tags.
* lisp/cedet/srecode/cpp.el (srecode-cpp): New defgroup.
(srecode-cpp-namespaces): New option.
(srecode-semantic-handle-:using-namespaces)
(srecode-cpp-apply-templates): New functions.
(srecode-semantic-apply-tag-to-dict): Handle template parameters
by calling `srecode-cpp-apply-templates'.
* lisp/cedet/srecode/dictionary.el (srecode-dictionary-add-template-table):
Do not add variables in tables not for the current project.
(srecode-compound-toString): Handle cases where the default value
is another compound value.
(srecode-dictionary-lookup-name): New optional argument
NON-RECURSIVE, which inhibits visiting dictionary parents.
(srecode-dictionary-add-section-dictionary)
(srecode-dictionary-merge): New optional argument FORCE adds
values even if an identically named entry exists.
(srecode-dictionary-add-entries): New method.
(srecode-create-dictionaries-from-tags): New function.
* lisp/cedet/srecode/fields.el (srecode-fields-exit-confirmation): New option.
(srecode-field-exit-ask): Use it.
* lisp/cedet/srecode/find.el (srecode-template-get-table)
(srecode-template-get-table-for-binding)
(srecode-all-template-hash): Skip if not in current project.
(srecode-template-table-in-project-p): New method.
* lisp/cedet/srecode/getset.el (srecode-insert-getset): Force tag table
update. Don't query the class if it is empty.
* lisp/cedet/srecode/insert.el (srecode-insert-fcn): Merge template
dictionary before resolving arguments.
(srecode-insert-method-helper): Add error checking to make sure
that we only have dictionaries.
(srecode-insert-method): Check template nesting depth when using
point inserter override.
(srecode-insert-method): Install override with depth limit.
* lisp/cedet/srecode/map.el (srecode-map-update-map): Make map loading more
robust.
* lisp/cedet/srecode/mode.el (srecode-bind-insert): Call
srecode-load-tables-for-mode.
(srecode-minor-mode-templates-menu): Do not list templates that
are not in the current project.
(srecode-menu-bar): Add binding for srecode-macro-help.
* lisp/cedet/srecode/table.el (srecode-template-table): Add :project slot.
(srecode-dump): Dump it.
* lisp/cedet/srecode/texi.el (srecode-texi-insert-tag-as-doc): New function.
(semantic-insert-foreign-tag): Use it.
Diffstat (limited to 'lisp/cedet/pulse.el')
-rw-r--r-- | lisp/cedet/pulse.el | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/lisp/cedet/pulse.el b/lisp/cedet/pulse.el index ce11c18e609..593f196982b 100644 --- a/lisp/cedet/pulse.el +++ b/lisp/cedet/pulse.el @@ -3,6 +3,7 @@ ;;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <eric@siege-engine.com> +;; Version: 1.0 ;; This file is part of GNU Emacs. @@ -57,10 +58,14 @@ (error nil))) (defcustom pulse-flag (pulse-available-p) - "*Non-nil means to pulse the overlay face for momentary highlighting. -Pulsing involves a bright highlight that slowly shifts to the background -color. Non-nil just means to highlight with an unchanging color for a short -time. + "Whether to use pulsing for momentary highlighting. +Pulsing involves a bright highlight that slowly shifts to the +background color. + +If the value is nil, highlight with an unchanging color until a +key is pressed. +If the value is `never', do no coloring at all. +Any other value means to the default pulsing behavior. If `pulse-flag' is non-nil, but `pulse-available-p' is nil, then this flag is ignored." @@ -178,22 +183,23 @@ Be sure to call `pulse-reset-face' after calling pulse." Optional argument FACE specifies the fact to do the highlighting." (overlay-put o 'original-face (overlay-get o 'face)) (add-to-list 'pulse-momentary-overlay o) - (if (or (not pulse-flag) (not (pulse-available-p))) - ;; Provide a face... clear on next command - (progn - (overlay-put o 'face (or face 'pulse-highlight-start-face)) - (add-hook 'pre-command-hook - 'pulse-momentary-unhighlight) - ) - ;; pulse it. - (unwind-protect + (if (eq pulse-flag 'never) + nil + (if (or (not pulse-flag) (not (pulse-available-p))) + ;; Provide a face... clear on next command (progn - (overlay-put o 'face 'pulse-highlight-face) - ;; The pulse function puts FACE onto 'pulse-highlight-face. - ;; Thus above we put our face on the overlay, but pulse - ;; with a reference face needed for the color. - (pulse face)) - (pulse-momentary-unhighlight)))) + (overlay-put o 'face (or face 'pulse-highlight-start-face)) + (add-hook 'pre-command-hook + 'pulse-momentary-unhighlight)) + ;; pulse it. + (unwind-protect + (progn + (overlay-put o 'face 'pulse-highlight-face) + ;; The pulse function puts FACE onto 'pulse-highlight-face. + ;; Thus above we put our face on the overlay, but pulse + ;; with a reference face needed for the color. + (pulse face)) + (pulse-momentary-unhighlight))))) (defun pulse-momentary-unhighlight () "Unhighlight a line recently highlighted." |