# HG changeset patch # User Glenn Morris # Date 1292313978 28800 # Node ID d53efc3630ba37ca2efbc7929383c2afcac373ff # Parent 0604fca5939a7fa5d6a8845b5826850f9b478174 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 -r 0604fca5939a -r d53efc3630ba lisp/ChangeLog --- a/lisp/ChangeLog Mon Dec 13 21:01:08 2010 -0800 +++ b/lisp/ChangeLog Tue Dec 14 00:06:18 2010 -0800 @@ -1,5 +1,9 @@ 2010-12-14 Glenn Morris + * 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 -r 0604fca5939a -r d53efc3630ba lisp/progmodes/js.el --- a/lisp/progmodes/js.el Mon Dec 13 21:01:08 2010 -0800 +++ b/lisp/progmodes/js.el Tue Dec 14 00:06:18 2010 -0800 @@ -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))