[Emacs-diffs] /srv/bzr/emacs/trunk r102659: Tidy up some js.el requires.

[Glenn Morris]

------------------------------------------------------------
revno: 102659
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2010-12-14 00:06:18 -0800
message:
  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.
modified:
  lisp/ChangeLog
  lisp/progmodes/js.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-14 05:01:08 +0000
+++ b/lisp/ChangeLog    2010-12-14 08:06:18 +0000
@@ -1,5 +1,9 @@
 2010-12-14  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'lisp/progmodes/js.el'
--- a/lisp/progmodes/js.el      2010-12-10 20:00:25 +0000
+++ b/lisp/progmodes/js.el      2010-12-14 08:06:18 +0000
@@ -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 @@
           (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))