--- a/lisp/ChangeLog	Mon Aug 13 09:06:45 2007 +0200
+++ b/lisp/ChangeLog	Mon Aug 13 09:07:36 2007 +0200
@@ -1,3 +1,91 @@
+Thu Jan  9 13:32:01 1997  Jacques Duthen Prestataire  <duthen@cegelec-red.fr>
+
+	* ps-print.el: Merge patch from [simon] Oct 8, 1996 Simon Marshall
+	<simon@gnu.ai.mit.edu>
+	(ps-print-version): Fix value.
+	(cl lisp-float-type): Require them.
+	(ps-number-of-columns ps-*-font-size): Try to select defaults
+	better suited when `ps-landscape-mode' is non-nil. 
+	(ps-*-faces): Change default for Font Lock mode faces when
+	`ps-print-color-p' is nil. 
+	(ps-right-header): Replace `time-stamp-yy/mm/dd'
+	by `time-stamp-mon-dd-yyyy'. 
+	(ps-end-file ps-begin-page): Fix bug in page count for Ghostview. 
+	(ps-generate-postscript-with-faces): Replace `ps-sorter' by
+	`car-less-than-car'.  
+	(ps-plot ps-generate): Replace `%d' by `%3d'.  
+
+Wed Jan 22 15:32:39 1997  Greg Klanderman  <greg@alphatech.com>
+
+	* modes/rsz-minibuf.el (resize-minibuffer-setup): Resize the
+	minibuffer earlier than the first received event.
+
+Wed Jan 22 15:29:08 1997  Barry A. Warsaw  <bwarsaw@CNRI.Reston.VA.US>
+
+	* modes/imenu.el (imenu-add-to-menubar): Don't attempt anything if
+	menu-bar lookup fails.
+
+Wed Jan 22 01:03:42 1997  Martin Buchholz  <mrb@eng.sun.com>
+
+	* lisp/x11/x-font-menu.el: Make font menus work better in a
+	Japanese environment.
+
+Tue Jan 21 19:56:26 1997  Martin Buchholz  <mrb@eng.sun.com>
+
+	* lisp/mule/mule-init.el (init-mule): Get Japanese man pages working.
+
+Fri Jan 17 17:22:54 1997  Hrvoje Niksic  <hniksic@bjesomar.srce.hr>
+ 
+	* man.el (Manual-mode): Don't mess with scrollbars if they aren't
+	present.
+
+Tue Jan 21 19:52:45 1997  Steven L Baur  <steve@altair.xemacs.org>
+
+	* utils/timezone.el (timezone-parse-date): Fix Y2K bug.
+
+Tue Jan 21 19:32:44 1997  Barry A. Warsaw  <bwarsaw@anthem.cnri.reston.va.us>
+
+	* prim/files.el (hack-local-variables-prop-line): XEmacs should
+	not query to set local variables in the -*- line if there aren't
+	any to set!
+
+Thu Jan 16 18:24:20 1997  Steven L Baur  <steve@miranova.com>
+
+	* psgml/psgml.el: Use newer interface form for nsgmls.
+
+Thu Jan 16 04:06:24 1997  Steven L Baur  <steve@altair.xemacs.org>
+
+	* comint/telnet.el (rsh): (Mostly) correct dealing with detection
+	of password prompt at login.
+
+Thu Jan 16 03:28:25 1997  Martin Buchholz  <mrb@eng.sun.com>
+
+	* modes/view.el (View-scroll-lines-forward): Correct format typo.
+
+Mon Jan 13 22:50:23 1997  David Moore  <dmoore@UCSD.EDU>
+
+	* packages/compile.el: Clean up regexps.
+
+Sun Jan 12 20:50:08 1997  Steven L Baur  <steve@altair.xemacs.org>
+
+	* modes/m4-mode.el: Changed m4-program to point to /usr/bin/m4.
+
+Sun Jan 12 18:49:30 1997   $B<i2,(B $BCNI'(B/MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* mule/mule-misc.el: `-columns' -> `-width' and define `-columns'
+	alias
+	Import definition of `truncate-string-to-width' from Emacs/mule-delta.
+
+Sun Jan 12 13:57:11 1997  Kyle Jones  <kyle_jones@wonderworks.com>
+
+	* prim/window.el (shrink-window-if-larger-than-buffer): Don't let
+	readjusted window change the buffer order stack.
+
+Sat Jan 11 20:12:47 1997  Vinnie Shelton  <shelton@icd.teradyne.com>
+
+	* utils/finder.el (finder-insert-at-column): Correct off-by-one
+	error affecting long file names.
+
 Fri Jan 10 22:27:58 1997  Shane Holder  <holder@rsn.hp.com>
 
 	* utils/bench.el:  New version.
@@ -532,7 +620,7 @@
 
 	* utils/smtpmail.el: New file from Emacs 19.34.
 
-Fri Dec  6 09:28:04 1996  MORIOKA Tomohiko <morioka@jaist.ac.jp>
+Fri Dec  6 09:28:04 1996  $B<i2,(B $BCNI'(B/MORIOKA Tomohiko <morioka@jaist.ac.jp>
 
 	* prim/startup.el (set-default-load-path): Set default-load-path
 	dynamically since file-detect.el is dumped with XEmacs.