summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2000-01-30 21:22:55 +0000
committerGerd Moellmann <gerd@gnu.org>2000-01-30 21:22:55 +0000
commit994c5afe744c6c1a79c62997d3a6f459c0a934dc (patch)
tree29232ab0866cb68a1c1a9378af57ba0cee9e6889
parent9eebfc46916f274715aa20edfe7f1a2d7e21c480 (diff)
downloademacs-994c5afe744c6c1a79c62997d3a6f459c0a934dc.tar.gz
*** empty log message ***
-rw-r--r--lisp/ChangeLog12
-rw-r--r--lisp/term-nasty.el12
-rw-r--r--src/ChangeLog6
3 files changed, 18 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 71d9db96689..d5bf7537622 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2000-01-30 Gerd Moellmann <gerd@gnu.org>
+
+ * emacs-lisp/cl-specs.el (cl-lambda-list, cl-macro-list)
+ (cl-macro-list1): Recognize `&allow-other-keys' instead of
+ `&allow-other-keywords'.
+
+ * mail/mh-utils.el (mh-find-progs): Add directory `etc' to
+ the list of directories scanned heuristically.
+
+ * Makefile (DONTCOMPILE): Remove term-nasty.el; doesn't seem to
+ exist.
+
2000-01-30 Jason Rumney <jasonr@gnu.org>
* w32-fns.el: Define w32-tty-standard-colors.
diff --git a/lisp/term-nasty.el b/lisp/term-nasty.el
deleted file mode 100644
index 77a801e2889..00000000000
--- a/lisp/term-nasty.el
+++ /dev/null
@@ -1,12 +0,0 @@
-;;; term-nasty.el --- Damned Things from terminfo.el
-
-;;; This text is no longer included in Emacs, because it was censored
-;;; by the Communications Decency Act. The law was promoted as a ban
-;;; on pornography, but it bans far more than that. This file did not
-;;; contain pornography, but it was prohibited nonetheless.
-
-;;; For information on US government censorship of the Internet, and
-;;; what you can do to bring back freedom of the press, see the web
-;;; site http://www.vtw.org/
-
-;;; term-nasty.el ends here
diff --git a/src/ChangeLog b/src/ChangeLog
index ef2c2692772..64060d773fc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2000-01-30 Gerd Moellmann <gerd@gnu.org>
+
+ * xterm.c (x_delete_display): Update next_noop_dpyinfo to ensure
+ that XTread_socket does not crash by trying to call XNoOp on a
+ closed display.
+
2000-01-30 Jason Rumney <jasonr@gnu.org>
* w32inevt.c (get_frame, w32_console_mouse_position, mouse_moved_to):