diff options
Diffstat (limited to 'lisp/cedet/srecode')
| -rw-r--r-- | lisp/cedet/srecode/compile.el | 1 | ||||
| -rw-r--r-- | lisp/cedet/srecode/dictionary.el | 4 | ||||
| -rw-r--r-- | lisp/cedet/srecode/extract.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/srecode/map.el | 11 | ||||
| -rw-r--r-- | lisp/cedet/srecode/mode.el | 25 | ||||
| -rw-r--r-- | lisp/cedet/srecode/srt-mode.el | 3 | ||||
| -rw-r--r-- | lisp/cedet/srecode/srt.el | 1 | ||||
| -rw-r--r-- | lisp/cedet/srecode/table.el | 4 |
8 files changed, 21 insertions, 30 deletions
diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el index a19df179013..204211b5e53 100644 --- a/lisp/cedet/srecode/compile.el +++ b/lisp/cedet/srecode/compile.el @@ -31,7 +31,6 @@ ;; The output are a series of EIEIO objects which represent the ;; templates in a way that could be inserted later. -(eval-when-compile (require 'cl)) (require 'semantic) (require 'eieio) (require 'cl-generic) diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el index 6e7887f0530..a13c42df330 100644 --- a/lisp/cedet/srecode/dictionary.el +++ b/lisp/cedet/srecode/dictionary.el @@ -28,7 +28,6 @@ ;;; CLASSES -(eval-when-compile (require 'cl)) (require 'eieio) (require 'cl-generic) (require 'srecode) @@ -612,10 +611,9 @@ STATE is the current compiler state." (srecode-get-mode-table modesym)) (error "No table found for mode %S" modesym))) (dict (srecode-create-dictionary (current-buffer))) - (end (current-time)) ) (message "Creating a dictionary took %.2f seconds." - (semantic-elapsed-time start end)) + (semantic-elapsed-time start nil)) (data-debug-new-buffer "*SRECODE ADEBUG*") (data-debug-insert-object-slots dict "*"))) diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el index 0086eeb6bd1..f4932513bcb 100644 --- a/lisp/cedet/srecode/extract.el +++ b/lisp/cedet/srecode/extract.el @@ -88,7 +88,7 @@ the dictionary entries were for that block of text." (save-restriction (narrow-to-region start end) (let ((dict (srecode-create-dictionary t)) - (state (srecode-extract-state "state")) + (state (srecode-extract-state)) ) (goto-char start) (srecode-extract-method template dict state) diff --git a/lisp/cedet/srecode/map.el b/lisp/cedet/srecode/map.el index 01ed630a66c..fa5d27b8d2e 100644 --- a/lisp/cedet/srecode/map.el +++ b/lisp/cedet/srecode/map.el @@ -224,10 +224,9 @@ Optional argument RESET forces a reset of the current map." (require 'data-debug) (let ((start (current-time)) (p (srecode-get-maps t)) ;; Time the reset. - (end (current-time)) ) (message "Updating the map took %.2f seconds." - (semantic-elapsed-time start end)) + (semantic-elapsed-time start nil)) (data-debug-new-buffer "*SRECODE ADEBUG*") (data-debug-insert-stuff-list p "*"))) @@ -271,7 +270,7 @@ if that file is NEW, otherwise assume the mode has not changed." (if (not srecode-map-save-file) ;; 0) Create a MAP when in no save file mode. (when (not srecode-current-map) - (setq srecode-current-map (srecode-map "SRecode Map")) + (setq srecode-current-map (srecode-map)) (message "SRecode map created in non-save mode.") ) @@ -291,8 +290,7 @@ if that file is NEW, otherwise assume the mode has not changed." (error "Change your SRecode map file")))) ;; Have a dir. Make the object. (setq srecode-current-map - (srecode-map "SRecode Map" - :file srecode-map-save-file))) + (srecode-map :file srecode-map-save-file))) ;; 2) Do we not have a current map? If so load. (when (not srecode-current-map) @@ -302,8 +300,7 @@ if that file is NEW, otherwise assume the mode has not changed." (error ;; There was an error loading the old map. Create a new one. (setq srecode-current-map - (srecode-map "SRecode Map" - :file srecode-map-save-file)))) + (srecode-map :file srecode-map-save-file)))) ) ) diff --git a/lisp/cedet/srecode/mode.el b/lisp/cedet/srecode/mode.el index c78f98bfc04..bf1f64e125a 100644 --- a/lisp/cedet/srecode/mode.el +++ b/lisp/cedet/srecode/mode.el @@ -89,14 +89,14 @@ ]) "---" '( "Insert ..." :filter srecode-minor-mode-templates-menu ) - `( "Generate ..." :filter srecode-minor-mode-generate-menu ) + '( "Generate ..." :filter srecode-minor-mode-generate-menu ) "---" - (semantic-menu-item - ["Customize..." - (customize-group "srecode") - :active t - :help "Customize SRecode options" - ]) + (semantic-menu-item + ["Customize..." + (customize-group "srecode") + :active t + :help "Customize SRecode options" + ]) (list "Debugging Tools..." (semantic-menu-item @@ -148,10 +148,10 @@ ;;;###autoload (define-minor-mode srecode-minor-mode "Toggle srecode minor mode. -With prefix argument ARG, turn on if positive, otherwise off. The -minor mode can be turned on only if semantic feature is available and -the current buffer was set up for parsing. Return non-nil if the -minor mode is enabled. + +The minor mode can be turned on only if semantic feature is +available and the current buffer was set up for parsing. Return +non-nil if the minor mode is enabled. \\{srecode-mode-map}" :keymap srecode-mode-map @@ -176,8 +176,7 @@ minor mode is enabled. ;;;###autoload (define-minor-mode global-srecode-minor-mode - "Toggle global use of srecode minor mode. -If ARG is positive or nil, enable, if it is negative, disable." + "Toggle global use of srecode minor mode." :global t :group 'srecode ;; Not needed because it's autoloaded instead. ;; :require 'srecode/mode diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el index df97d6e55e5..2ad7ffcdb87 100644 --- a/lisp/cedet/srecode/srt-mode.el +++ b/lisp/cedet/srecode/srt-mode.el @@ -494,7 +494,7 @@ section or ? for an ask variable." (let* ((macroend (match-beginning 0)) (raw (buffer-substring-no-properties macrostart macroend)) - (STATE (srecode-compile-state "TMP")) + (STATE (srecode-compile-state)) (inserter (condition-case nil (srecode-compile-parse-inserter raw STATE) @@ -605,7 +605,6 @@ section or ? for an ask variable." (setq context-return (semantic-analyze-context-functionarg - "context-for-srecode" :buffer (current-buffer) :scope scope :bounds bounds diff --git a/lisp/cedet/srecode/srt.el b/lisp/cedet/srecode/srt.el index 0a6c732efda..e6d2bb7c9e0 100644 --- a/lisp/cedet/srecode/srt.el +++ b/lisp/cedet/srecode/srt.el @@ -25,7 +25,6 @@ ;;; Code: -(eval-when-compile (require 'cl)) (require 'eieio) (require 'srecode/dictionary) (require 'srecode/insert) diff --git a/lisp/cedet/srecode/table.el b/lisp/cedet/srecode/table.el index 67e363499f4..3b271f06f71 100644 --- a/lisp/cedet/srecode/table.el +++ b/lisp/cedet/srecode/table.el @@ -187,8 +187,8 @@ INIT are the initialization parameters for the new template table." (new (apply 'srecode-template-table (file-name-nondirectory file) :file file - :filesize (nth 7 attr) - :filedate (nth 5 attr) + :filesize (file-attribute-size attr) + :filedate (file-attribute-modification-time attr) :major-mode mode init ))) |