From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 25 Mar 2010 20:36:41 +0000 (-0400)
Subject: * programs.texi (Program Modes): Mention Javascript mode.
X-Git-Tag: emacs-pretest-23.1.95~38
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=71785b7a63bf1cec45856e1ea15d2397b65e4f13;p=emacs.git

* programs.texi (Program Modes): Mention Javascript mode.
---

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index a15efcea1a2..4ed2ac129e7 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,7 @@
 2010-03-25  Chong Yidong  <cyd@stupidchicken.com>
 
+	* programs.texi (Program Modes): Mention Javascript mode.
+
 	* text.texi (HTML Mode): Note that nXML is now the default XML mode.
 	* emacs.texi: Update node description.
 
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 8ebbcf58ed4..dce6c38692e 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -88,11 +88,12 @@ and you can select it by typing @kbd{M-x @var{l}-mode @key{RET}}.
 @cindex PostScript mode
 @cindex Conf mode
 @cindex DNS mode
+@cindex Javascript mode
   The existing programming language major modes include Lisp, Scheme
 (a variant of Lisp) and the Scheme-based DSSSL expression language,
 Ada, ASM, AWK, C, C++, Delphi (Object Pascal), Fortran, Icon, IDL
-(CORBA), IDLWAVE, Java, Metafont (@TeX{}'s companion for font
-creation), Modula2, Objective-C, Octave, Pascal, Perl, Pike,
+(CORBA), IDLWAVE, Java, Javascript, Metafont (@TeX{}'s companion for
+font creation), Modula2, Objective-C, Octave, Pascal, Perl, Pike,
 PostScript, Prolog, Python, Ruby, Simula, Tcl, and VHDL.  An
 alternative mode for Perl is called CPerl mode.  Modes are available
 for the scripting languages of the common GNU and Unix shells, VMS
diff --git a/etc/NEWS b/etc/NEWS
index c3fc368b314..332cc49e331 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -415,6 +415,7 @@ System (CLOS).  It is used by the other CEDET packages.
 
 ** htmlfontify.el turns a fontified Emacs buffer into an HTML page.
 
++++
 ** js.el is a new major mode for JavaScript files.
 
 ** imap-hash.el is a new library to address IMAP mailboxes as hashtables.