diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-03-25 16:36:41 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-03-25 16:36:41 -0400 |
| commit | 71785b7a63bf1cec45856e1ea15d2397b65e4f13 (patch) | |
| tree | 024718da02ce7ad367f00ebb0abd7329669d787e /doc | |
| parent | f67c5dd0dd1560f1272d692818aebf82ab6c26b1 (diff) | |
| download | emacs-71785b7a63bf1cec45856e1ea15d2397b65e4f13.tar.gz | |
* programs.texi (Program Modes): Mention Javascript mode.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/ChangeLog | 2 | ||||
| -rw-r--r-- | doc/emacs/programs.texi | 5 |
2 files changed, 5 insertions, 2 deletions
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 |