From 2a72ae286db1a4cfc4a915c15c82c613012e7434 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 13 Apr 2015 10:39:25 -0400 Subject: [PATCH] * cedet/semantic/fw.el: Use declare. * cedet/semantic/fw.el (semantic-exit-on-input) (semanticdb-without-unloaded-file-searches): Use declare. (semantic-fw-add-edebug-spec): Remove. --- lisp/cedet/semantic/complete.el | 1 + lisp/cedet/semantic/db.el | 1 + lisp/cedet/semantic/fw.el | 16 +++++----------- lisp/cedet/semantic/idle.el | 1 + 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el index 267e292647a..1e121906a04 100644 --- a/lisp/cedet/semantic/complete.el +++ b/lisp/cedet/semantic/complete.el @@ -2217,6 +2217,7 @@ use `semantic-complete-analyze-inline' to complete." ;; input. (when (save-window-excursion (save-excursion + ;; FIXME: Use `while-no-input'? (and (not (semantic-exit-on-input 'csi (semantic-fetch-tags) (semantic-throw-on-input 'csi) diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el index 1dba9b15701..7380bddd2bb 100644 --- a/lisp/cedet/semantic/db.el +++ b/lisp/cedet/semantic/db.el @@ -723,6 +723,7 @@ form." "Save all semantic tag databases from idle time. Exit the save between databases if there is user input." (semantic-safe "Auto-DB Save: %S" + ;; FIXME: Use `while-no-input'? (semantic-exit-on-input 'semanticdb-idle-save (mapc (lambda (db) (semantic-throw-on-input 'semanticdb-idle-save) diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el index e36f3598c0f..0e81b2c0ba5 100644 --- a/lisp/cedet/semantic/fw.el +++ b/lisp/cedet/semantic/fw.el @@ -374,7 +374,7 @@ If FORMS includes a call to `semantic-throw-on-input', then if a user presses any key during execution, this form macro will exit with the value passed to `semantic-throw-on-input'. If FORMS completes, then the return value is the same as `progn'." - (declare (indent 1)) + (declare (indent 1) (debug def-body)) `(let ((semantic-current-input-throw-symbol ,symbol) (semantic--on-input-start-marker (point-marker))) (catch ,symbol @@ -388,10 +388,10 @@ calling this one." `(when (and semantic-current-input-throw-symbol (or (input-pending-p) (with-current-buffer - ;; Timers might run during accept-process-output. - ;; If they redisplay, point must be where the user - ;; expects. (Bug#15045) (marker-buffer semantic--on-input-start-marker) + ;; Timers might run during accept-process-output. + ;; If they redisplay, point must be where the user + ;; expects. (Bug#15045) (save-excursion (goto-char semantic--on-input-start-marker) (accept-process-output))))) @@ -448,12 +448,12 @@ into `mode-local-init-hook'." file filename) ;; (defmacro semanticdb-without-unloaded-file-searches (forms) "Execute FORMS with `unloaded' removed from the current throttle." + (declare (indent 1)) `(let ((semanticdb-find-default-throttle (if (featurep 'semantic/db-find) (remq 'unloaded semanticdb-find-default-throttle) nil))) ,forms)) -(put 'semanticdb-without-unloaded-file-searches 'lisp-indent-function 1) ;; ;;; Editor goodies ;-) @@ -520,12 +520,6 @@ into `mode-local-init-hook'." file filename) ;; (font-lock-add-keywords 'emacs-lisp-mode ;; semantic-fw-font-lock-keywords)) -;;; Interfacing with edebug -;; -(defun semantic-fw-add-edebug-spec () - (def-edebug-spec semantic-exit-on-input 'def-body)) - -(add-hook 'edebug-setup-hook 'semantic-fw-add-edebug-spec) (provide 'semantic/fw) diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el index 790315381c1..225caa599fb 100644 --- a/lisp/cedet/semantic/idle.el +++ b/lisp/cedet/semantic/idle.el @@ -216,6 +216,7 @@ current buffer.") And also manages services that depend on tag values." (when semantic-idle-scheduler-verbose-flag (message "IDLE: Core handler...")) + ;; FIXME: Use `while-no-input'? (semantic-exit-on-input 'idle-timer (let* ((inhibit-quit nil) (buffers (delq (current-buffer) -- 2.39.2