summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2007-04-28 20:17:17 +0000
committerGlenn Morris <rgm@gnu.org>2007-04-28 20:17:17 +0000
commit5fed56d6dadb851b73943b83ac18cff787a3edc6 (patch)
treeb17e95d37c8749f79a8cfcc028787ac812f4876a
parent11b50d1d69a8f211d67ba2f0fffe8e298e243536 (diff)
downloademacs-5fed56d6dadb851b73943b83ac18cff787a3edc6.tar.gz
Restore python.el pending consideration of legal status.
-rw-r--r--AUTHORS7
-rw-r--r--admin/notes/copyright7
-rw-r--r--etc/ChangeLog9
-rw-r--r--man/ChangeLog7
4 files changed, 25 insertions, 5 deletions
diff --git a/AUTHORS b/AUTHORS
index 8c543964d52..dade68a3d6e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -456,9 +456,10 @@ Dave Lambert: changed sol2-5.h xfns.c xterm.c xterm.h
Dave Love: wrote autoarg.el autoconf.el benchmark.el cfengine.el
code-pages.el elide-head.el georgian.el hl-line.el latin-8.el
- latin-9.el latin1-disp.el refill.el rfc1345.el sgml-input.el smiley.el
- subst-big5.el subst-gb2312.el subst-jis.el subst-ksc.el tool-bar.el
- ucs-tables.el uni-input.el utf-16.el utf-7.el utf-8-lang.el welsh.el
+ latin-9.el latin1-disp.el python.el refill.el rfc1345.el
+ sgml-input.el smiley.el subst-big5.el subst-gb2312.el subst-jis.el
+ subst-ksc.el tool-bar.el ucs-tables.el uni-input.el utf-16.el
+ utf-7.el utf-8-lang.el welsh.el
and changed configure.in Makefile.in help.el fortran.el browse-url.el
mule-cmds.el simple.el xterm.c cus-edit.el files.el info.el mule.el
wid-edit.el fns.c vc.el rfc2047.el bindings.el cus-start.el buffer.c
diff --git a/admin/notes/copyright b/admin/notes/copyright
index d7f12bd8ad4..ce8953993de 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -421,6 +421,9 @@ K Rodgers changes
http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00225.html
http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00257.html
+ But then an assignment arrived before the release of Emacs 22:
+http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01427.html
+
** Issues that are "fixed" for the release of Emacs 22, but we may
wish to revisit later in more detail
@@ -591,8 +594,8 @@ REMOVED src/unexhp9k800.c
*** These are copyright issues still to be addressed:
-Need an assignment from Kevin Rodgers (rms), else several changes to
-deal with.
+python.el potential legal problem
+http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00459.html
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 1c9de0ac3e7..9fb0b3b549b 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,12 @@
+2007-04-28 Glenn Morris <rgm@gnu.org>
+
+ * NEWS: Restore python.el pending consideration of legal status.
+
+2007-04-28 David R. Linn <drl@jekyll.vuse.vanderbilt.edu>
+
+ * PROBLEMS: Add section on Solaris out-of-tree install issues with
+ non-GNU make.
+
2007-04-25 Werner Lemberg <wl@gnu.org>
* emacs.1: Replace -- with \(em.
diff --git a/man/ChangeLog b/man/ChangeLog
index 86682233230..f2fb7c32036 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-28 Glenn Morris <rgm@gnu.org>
+
+ * ack.texi (Acknowledgments):
+ * anti.texi (Antinews):
+ * programs.texi (Program Modes): Restore mention of python.el pending
+ consideration of legal status.
+
2007-04-28 Richard Stallman <rms@gnu.org>
* files.texi (File Names): Fixes to ~ description on MS systems.