aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2007-04-28 20:18:40 +0000
committerGlenn Morris2007-04-28 20:18:40 +0000
commit7b7034149e76c10c55bc1aa2c8731d5b78637325 (patch)
tree998b8c55ec6755ab107835571a5dfdfcc645c427
parent5fed56d6dadb851b73943b83ac18cff787a3edc6 (diff)
downloademacs-7b7034149e76c10c55bc1aa2c8731d5b78637325.tar.gz
emacs-7b7034149e76c10c55bc1aa2c8731d5b78637325.zip
Restore mention of python.el pending consideration of legal status.
-rw-r--r--man/ack.texi2
-rw-r--r--man/anti.texi4
-rw-r--r--man/faq.texi2
-rw-r--r--man/programs.texi3
4 files changed, 7 insertions, 4 deletions
diff --git a/man/ack.texi b/man/ack.texi
index bcf3479681d..d5dbf1ae8ca 100644
--- a/man/ack.texi
+++ b/man/ack.texi
@@ -682,6 +682,8 @@ character sets,
682@file{latin1-disp.el}, a package that lets you display ISO 8859 682@file{latin1-disp.el}, a package that lets you display ISO 8859
683characters on Latin-1 terminals by setting up appropriate display 683characters on Latin-1 terminals by setting up appropriate display
684tables, 684tables,
685@item
686@file{python.el}, a major mode for the Python programming language.
685@item 687@item
686@file{refill.el}, a mode for automatic paragraph refilling, akin to 688@file{refill.el}, a mode for automatic paragraph refilling, akin to
687typical word processors, 689typical word processors,
diff --git a/man/anti.texi b/man/anti.texi
index 48c587d78e9..ebff1c7677f 100644
--- a/man/anti.texi
+++ b/man/anti.texi
@@ -278,8 +278,8 @@ tries to demonstrate this in the GUD buffer.
278@item 278@item
279The Calc, CUA, Ibuffer, Ido, Password, Printing, Reveal, 279The Calc, CUA, Ibuffer, Ido, Password, Printing, Reveal,
280Ruler-mode, SES, Table, Tramp, and URL packages have been removed. 280Ruler-mode, SES, Table, Tramp, and URL packages have been removed.
281The Benchmark, Cfengine, Conf, Dns, Flymake, Thumbs, and Wdired modes 281The Benchmark, Cfengine, Conf, Dns, Flymake, Python, Thumbs, and
282have also been removed. 282Wdired modes have also been removed.
283 283
284@item 284@item
285The Emacs Lisp Reference Manual and the Introduction to Programming in 285The Emacs Lisp Reference Manual and the Introduction to Programming in
diff --git a/man/faq.texi b/man/faq.texi
index feef74c719e..787a85443fc 100644
--- a/man/faq.texi
+++ b/man/faq.texi
@@ -1213,7 +1213,7 @@ indicated in the source buffer.
1213Many new modes and packages have been included in Emacs, such as Calc, 1213Many new modes and packages have been included in Emacs, such as Calc,
1214TRAMP, URL, IDO, CUA, ERC, rcirc, Table, Image-Dired, SES, Ruler, Org, 1214TRAMP, URL, IDO, CUA, ERC, rcirc, Table, Image-Dired, SES, Ruler, Org,
1215PGG, Flymake, Password, Printing, Reveal, wdired, t-mouse, longlines, 1215PGG, Flymake, Password, Printing, Reveal, wdired, t-mouse, longlines,
1216savehist, Conf mode, DNS mode, etc. 1216savehist, Conf mode, Python mode, DNS mode, etc.
1217 1217
1218@cindex Multilingual Environment 1218@cindex Multilingual Environment
1219@item 1219@item
diff --git a/man/programs.texi b/man/programs.texi
index a9aca835617..2472d7daabe 100644
--- a/man/programs.texi
+++ b/man/programs.texi
@@ -76,6 +76,7 @@ and you can select it by typing @kbd{M-x @var{l}-mode @key{RET}}.
76@cindex Metafont mode 76@cindex Metafont mode
77@cindex Modula2 mode 77@cindex Modula2 mode
78@cindex Prolog mode 78@cindex Prolog mode
79@cindex Python mode
79@cindex Simula mode 80@cindex Simula mode
80@cindex VHDL mode 81@cindex VHDL mode
81@cindex M4 mode 82@cindex M4 mode
@@ -89,7 +90,7 @@ variant of Lisp) and the Scheme-based DSSSL expression language, Ada,
89ASM, AWK, C, C++, Delphi (Object Pascal), Fortran (free format and fixed 90ASM, AWK, C, C++, Delphi (Object Pascal), Fortran (free format and fixed
90format), Icon, IDL (CORBA), IDLWAVE, Java, Metafont (@TeX{}'s 91format), Icon, IDL (CORBA), IDLWAVE, Java, Metafont (@TeX{}'s
91companion for font creation), Modula2, Objective-C, Octave, Pascal, 92companion for font creation), Modula2, Objective-C, Octave, Pascal,
92Perl, Pike, PostScript, Prolog, Simula, Tcl, and VHDL. An 93Perl, Pike, PostScript, Prolog, Python, Simula, Tcl, and VHDL. An
93alternative mode for Perl is called CPerl mode. Modes are available for 94alternative mode for Perl is called CPerl mode. Modes are available for
94the scripting languages of the common GNU and Unix shells, VMS DCL, and 95the scripting languages of the common GNU and Unix shells, VMS DCL, and
95MS-DOS/MS-Windows @samp{BAT} files. There are also major modes for 96MS-DOS/MS-Windows @samp{BAT} files. There are also major modes for