# HG changeset patch # User Paul Eggert # Date 1295325701 28800 # Node ID 176503f61eb10966ed4fea2098ff5d349022b779 # Parent aee2f052ef1704417079c86b6106920ef86291ad# Parent d89c2a0d1b1256e6aea977fc24e14dded2b63962 Merge from mainline. diff -r d89c2a0d1b12 -r 176503f61eb1 .hgtags --- a/.hgtags Mon Jan 17 23:07:36 2011 -0500 +++ b/.hgtags Mon Jan 17 20:41:41 2011 -0800 @@ -1,6 +1,5 @@ 00e54fde074a6a0bdb7ba0e6923fbb28f0f8dfe7 font-backend-base 02a6c15defdbca2a31c4f00ed75fa880457134c0 mh-e-7_85 -0534ddfdceeb2a664034367efc0872e318da9a6b EMACS_PRETEST_23_2_92 06552ba973ce8cd074ae30fb5e48ed2c955e0b1f libc-970827 06552ba973ce8cd074ae30fb5e48ed2c955e0b1f libc-970828 06552ba973ce8cd074ae30fb5e48ed2c955e0b1f libc-970829 @@ -329,7 +328,6 @@ 4d5237dec736125edb335336c2a78c48e193c57b libc-970728 4e108e81543a2cbc43dafbf21c40fc76d2a37587 EMACS_21_1_BASE 4f9e6148ce6a22d21cc97f05b7bd942902e5fb56 libc-961120 -5032326a2135c454179635e25edd646e4e06c48a EMACS_PRETEST_23_2_91 528ba99a1dd3868cc06e80e995af1506d8c80f7a EMACS_PRETEST_23_1_93 53eebdb81828714d3f61701fb32781516fbd9d16 zsh-sync-ognus-3 5479380913c9e36c2dd41acff09c421aa3a5de6e EMACS_PRETEST_22_0_96 diff -r d89c2a0d1b12 -r 176503f61eb1 doc/misc/texinfo.tex diff -r d89c2a0d1b12 -r 176503f61eb1 lisp/dired.el diff -r d89c2a0d1b12 -r 176503f61eb1 lisp/emacs-lisp/cl-loaddefs.el diff -r d89c2a0d1b12 -r 176503f61eb1 lisp/htmlfontify.el diff -r d89c2a0d1b12 -r 176503f61eb1 lisp/mail/rmail.el diff -r d89c2a0d1b12 -r 176503f61eb1 lisp/ps-print.el diff -r d89c2a0d1b12 -r 176503f61eb1 m4/getopt.m4