From 8fa239841824d334bf58bdab9bade1ab6107f0a7 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 23 May 2013 00:37:56 -0700 Subject: [PATCH] Silence some js compilation warnings * lisp/progmodes/js.el: No need to load comint when compiling. (ring-insert, comint-send-string, comint-send-input) (comint-last-input-end, ido-chop): Declare. --- lisp/ChangeLog | 4 ++++ lisp/progmodes/js.el | 13 ++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 992c6e9f42c..ddd89f7cae9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2013-05-23 Glenn Morris + * progmodes/js.el: No need to load comint when compiling. + (ring-insert, comint-send-string, comint-send-input) + (comint-last-input-end, ido-chop): Declare. + * vc/ediff-diff.el, vc/ediff-merg.el: Require ediff-util at run-time. * vc/ediff-mult.el: Adjust requires. (ediff-directories-internal, ediff-directory-revisions-internal) diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 2ea78fc321c..4e345b4bfa9 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -55,7 +55,6 @@ (eval-when-compile (require 'cl-lib) - (require 'comint) (require 'ido)) (defvar inferior-moz-buffer) @@ -2217,6 +2216,9 @@ marker." (defvar find-tag-marker-ring) ; etags +;; etags loads ring. +(declare-function ring-insert "ring" (ring item)) + (defun js-find-symbol (&optional arg) "Read a JavaScript symbol and jump to it. With a prefix argument, restrict symbols to those from the @@ -2639,6 +2641,11 @@ with `js--js-encode-value'." ;; order to catch a prompt that's only partially arrived (save-excursion (forward-line 0) (point)))) +;; Presumably "inferior-moz-process" loads comint. +(declare-function comint-send-string "comint" (process string)) +(declare-function comint-send-input "comint" + (&optional no-newline artificial)) + (defun js--js-enter-repl () (inferior-moz-process) ; called for side-effect (with-current-buffer inferior-moz-buffer @@ -2824,6 +2831,8 @@ If nil, the whole Array is treated as a JS symbol.") (`error (signal 'js-js-error (list (cl-second result)))) (x (error "Unmatched case in js--js-decode-retval: %S" x)))) +(defvar comint-last-input-end) + (defun js--js-funcall (function &rest arguments) "Call the Mozilla function FUNCTION with arguments ARGUMENTS. If function is a string, look it up as a property on the global @@ -2996,6 +3005,8 @@ left-to-right." (defvar js-read-tab-history nil) +(declare-function ido-chop "ido" (items elem)) + (defun js--read-tab (prompt) "Read a Mozilla tab with prompt PROMPT. Return a cons of (TYPE . OBJECT). TYPE is either 'window or -- 2.39.2