diff options
| author | Glenn Morris | 2013-05-23 00:37:56 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-05-23 00:37:56 -0700 |
| commit | 8fa239841824d334bf58bdab9bade1ab6107f0a7 (patch) | |
| tree | aafb50859dd97843cc87b6f17a61eaab8bad6e26 | |
| parent | a5c7df1a4bb8cf7efe5acc7313667a63d7f660c5 (diff) | |
| download | emacs-8fa239841824d334bf58bdab9bade1ab6107f0a7.tar.gz emacs-8fa239841824d334bf58bdab9bade1ab6107f0a7.zip | |
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.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/progmodes/js.el | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 992c6e9f42c..ddd89f7cae9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2013-05-23 Glenn Morris <rgm@gnu.org> | 1 | 2013-05-23 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * progmodes/js.el: No need to load comint when compiling. | ||
| 4 | (ring-insert, comint-send-string, comint-send-input) | ||
| 5 | (comint-last-input-end, ido-chop): Declare. | ||
| 6 | |||
| 3 | * vc/ediff-diff.el, vc/ediff-merg.el: Require ediff-util at run-time. | 7 | * vc/ediff-diff.el, vc/ediff-merg.el: Require ediff-util at run-time. |
| 4 | * vc/ediff-mult.el: Adjust requires. | 8 | * vc/ediff-mult.el: Adjust requires. |
| 5 | (ediff-directories-internal, ediff-directory-revisions-internal) | 9 | (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 @@ | |||
| 55 | 55 | ||
| 56 | (eval-when-compile | 56 | (eval-when-compile |
| 57 | (require 'cl-lib) | 57 | (require 'cl-lib) |
| 58 | (require 'comint) | ||
| 59 | (require 'ido)) | 58 | (require 'ido)) |
| 60 | 59 | ||
| 61 | (defvar inferior-moz-buffer) | 60 | (defvar inferior-moz-buffer) |
| @@ -2217,6 +2216,9 @@ marker." | |||
| 2217 | 2216 | ||
| 2218 | (defvar find-tag-marker-ring) ; etags | 2217 | (defvar find-tag-marker-ring) ; etags |
| 2219 | 2218 | ||
| 2219 | ;; etags loads ring. | ||
| 2220 | (declare-function ring-insert "ring" (ring item)) | ||
| 2221 | |||
| 2220 | (defun js-find-symbol (&optional arg) | 2222 | (defun js-find-symbol (&optional arg) |
| 2221 | "Read a JavaScript symbol and jump to it. | 2223 | "Read a JavaScript symbol and jump to it. |
| 2222 | With a prefix argument, restrict symbols to those from the | 2224 | With a prefix argument, restrict symbols to those from the |
| @@ -2639,6 +2641,11 @@ with `js--js-encode-value'." | |||
| 2639 | ;; order to catch a prompt that's only partially arrived | 2641 | ;; order to catch a prompt that's only partially arrived |
| 2640 | (save-excursion (forward-line 0) (point)))) | 2642 | (save-excursion (forward-line 0) (point)))) |
| 2641 | 2643 | ||
| 2644 | ;; Presumably "inferior-moz-process" loads comint. | ||
| 2645 | (declare-function comint-send-string "comint" (process string)) | ||
| 2646 | (declare-function comint-send-input "comint" | ||
| 2647 | (&optional no-newline artificial)) | ||
| 2648 | |||
| 2642 | (defun js--js-enter-repl () | 2649 | (defun js--js-enter-repl () |
| 2643 | (inferior-moz-process) ; called for side-effect | 2650 | (inferior-moz-process) ; called for side-effect |
| 2644 | (with-current-buffer inferior-moz-buffer | 2651 | (with-current-buffer inferior-moz-buffer |
| @@ -2824,6 +2831,8 @@ If nil, the whole Array is treated as a JS symbol.") | |||
| 2824 | (`error (signal 'js-js-error (list (cl-second result)))) | 2831 | (`error (signal 'js-js-error (list (cl-second result)))) |
| 2825 | (x (error "Unmatched case in js--js-decode-retval: %S" x)))) | 2832 | (x (error "Unmatched case in js--js-decode-retval: %S" x)))) |
| 2826 | 2833 | ||
| 2834 | (defvar comint-last-input-end) | ||
| 2835 | |||
| 2827 | (defun js--js-funcall (function &rest arguments) | 2836 | (defun js--js-funcall (function &rest arguments) |
| 2828 | "Call the Mozilla function FUNCTION with arguments ARGUMENTS. | 2837 | "Call the Mozilla function FUNCTION with arguments ARGUMENTS. |
| 2829 | If function is a string, look it up as a property on the global | 2838 | If function is a string, look it up as a property on the global |
| @@ -2996,6 +3005,8 @@ left-to-right." | |||
| 2996 | 3005 | ||
| 2997 | (defvar js-read-tab-history nil) | 3006 | (defvar js-read-tab-history nil) |
| 2998 | 3007 | ||
| 3008 | (declare-function ido-chop "ido" (items elem)) | ||
| 3009 | |||
| 2999 | (defun js--read-tab (prompt) | 3010 | (defun js--read-tab (prompt) |
| 3000 | "Read a Mozilla tab with prompt PROMPT. | 3011 | "Read a Mozilla tab with prompt PROMPT. |
| 3001 | Return a cons of (TYPE . OBJECT). TYPE is either 'window or | 3012 | Return a cons of (TYPE . OBJECT). TYPE is either 'window or |