Tidy up some js.el requires.

* lisp/progmodes/js.el: Doc't require font-lock, etags, or easymenu.
(find-tag-marker-ring): Declare.
(js-find-symbol): Require etags.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9642b36acee16036119ff3f196012944d5f0097f..083b1b0f924e8529a315abb9b7402bdb36f926e8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2010-12-14  Glenn Morris  <rgm@gnu.org>
 
+       * progmodes/js.el: Doc't require font-lock, etags, or easymenu.
+       (find-tag-marker-ring): Declare.
+       (js-find-symbol): Require etags.
+
        * mail/sendmail.el: Don't require rmail or mailalias when compiling.
        Require mail-utils.
        (mail-alias-file): Don't autoload.  Doc fix.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index fdb11aa7d88e6e969117a97baf169e2ed206beea..dffbb7726fe15b2ee071ead4a373d345eea66aa9 100644 (file)
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -47,12 +47,9 @@
 
 
 (require 'cc-mode)
-(require 'font-lock)
 (require 'newcomment)
+(require 'thingatpt)                    ; forward-symbol etc
 (require 'imenu)
-(require 'etags)
-(require 'thingatpt)
-(require 'easymenu)
 (require 'moz nil t)
 (require 'json nil t)
 
@@ -2171,12 +2168,15 @@ marker."
           (setf (car bounds) (point))))
       (buffer-substring (car bounds) (cdr bounds)))))
 
+(defvar find-tag-marker-ring)           ; etags
+
 (defun js-find-symbol (&optional arg)
   "Read a JavaScript symbol and jump to it.
 With a prefix argument, restrict symbols to those from the
 current buffer.  Pushes a mark onto the tag ring just like
 `find-tag'."
   (interactive "P")
+  (require 'etags)
   (let (symbols marker)
     (if (not arg)
         (setq symbols (js--get-all-known-symbols))