Mercurial > emacs

diff lisp/ChangeLog @ 111890:ba688f8ab22c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Small ps-print fixes. * lisp/ps-print.el (ps-line-lengths-internal, ps-nb-pages): Ensure ps-footer-font-size-internal is initialized. Call ps-get-page-dimensions before trying to use ps-font-for-text.
author Glenn Morris <rgm@gnu.org>
date Wed, 01 Dec 2010 20:06:52 -0800
parents aa074c12a65c
children 2adb902abf49
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Dec 02 09:44:55 2010 +0900
+++ b/lisp/ChangeLog	Wed Dec 01 20:06:52 2010 -0800
@@ -1,3 +1,9 @@
+2010-12-02  Glenn Morris  <rgm@gnu.org>
+
+	* ps-print.el (ps-line-lengths-internal, ps-nb-pages):
+	Ensure ps-footer-font-size-internal is initialized.
+	Call ps-get-page-dimensions before trying to use ps-font-for-text.
+
 2010-12-01  Kenichi Handa  <handa@m17n.org>
 
 	* mail/rmailmm.el (rmail-mime-parse): Call rmail-mime-process
@@ -35,7 +41,6 @@
 	(smie-next-sexp): Make it accept a "start token" as argument.
 	(smie-indent-keyword): Be careful not to misidentify tokens that span
 	more than one line, as empty lines.  Add argument `token'.
->>>>>>> MERGE-SOURCE
 
 2010-11-26  Kenichi Handa  <handa@m17n.org>