From: Gerd Moellmann <gerd@gnu.org>
Date: Thu, 13 Apr 2000 19:17:06 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~4261
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=198e3c7ad97a1734502275783f597f606e087257;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index be10bcc1bd2..612ca2c99e6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2000-04-13  Edward M. Reingold  <reingold@emr.cs.uiuc.edu>
+
+	* diary-lib.el (include-other-diary-files): Fix the fix of
+	2000-02-18 by doing a save-excursion.
+
+2000-04-13  Vinicius Jose Latorre  <vinicius@cpqd.com.br>
+
+	* ps-print.el: Customization fix, doc fix.
+	(ps-print-version): New version number (5.1.4).
+	(ps-article-author, ps-article-subject, ps-info-file, ps-info-node)
+	(ps-print-preprint): Adjust code.
+	(ps-printer-name, ps-lpr-switches, ps-user-defined-prologue)
+	(ps-print-prologue-header, ps-print-control-characters)
+	(ps-spool-config): Customization fix.
+	
 2000-04-13  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* textmodes/ispell.el (ispell-menu-map): Menu items rearranged and
diff --git a/src/ChangeLog b/src/ChangeLog
index a1f51e3818b..16b361d4fbe 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2000-04-13  Gerd Moellmann  <gerd@gnu.org>
+
+	* tparam.c (tparam1): Abort when encountering an unknown
+	`%'-specifier.
+
+	* s/freebsd.h (TERMCAP_OBJ) [__FreeBSD__ >= 4]: Define as
+	terminfo.o.
+
+	* Makefile.in (termcapobj) [LIBS_TERMCAP && TERMCAP_OBJ]: Define
+	as TERMCAP_OBJ.
+
 2000-04-13  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* fileio.c (a_write): Remove redundant semi-colons.