# HG changeset patch # User Katsumi Yamaoka # Date 1273823163 0 # Node ID e53bb6f016b343393c21cbc832f2c4a8cb4160ed # Parent 255a042e399d744e12a723834b7a9a94e0d9b17c# Parent dea8b4d40a70a635e439aafc293f936dafa00618 Merge from mainline. diff -r dea8b4d40a70 -r e53bb6f016b3 .hgtags --- a/.hgtags Fri May 14 16:30:39 2010 +0900 +++ b/.hgtags Fri May 14 07:46:03 2010 +0000 @@ -32,7 +32,6 @@ 1290d63e6ab3ab9e82f2fd0a35c436d05b2e0861 ttn-vms-21-2-B4 136de3bfa14feaa22a4f959b4273a6ba46a21f76 libc-960211 14a47b65c288d095f4b98a840ff8671eb8f893fe tmp_pcl_tag_131034C -14f1ff916f19fdbaa1ca42dc9dde418bba829d3e EMACS_PRETEST_23_1_95 1550283d0e53c078b71a91aadadd33ab575ac4ae EMACS_22_1 15c6663e567613de3e6f1a495c12a30402c2c32e zsh-merge-ognus-1 18f3cb26243f96e95636c2c9857f16bdb153dda7 before-miles-orphaned-changes @@ -563,7 +562,6 @@ 72276b334084264b708d0e34ad447735c4ce5e22 libc20x-970319 72276b334084264b708d0e34ad447735c4ce5e22 libc20x-970404 72276b334084264b708d0e34ad447735c4ce5e22 root-libc-2_0_x-branch -72f8f4f82b9d27158cd49fd93249f503a2d29228 EMACS_PRETEST_23_1_94 7361b2115a770c0597610e2c87c0a27de4fa66e0 libc-961121 73b00b4dd2a6a44d3e03aaf764c0c761f35a32e6 EMACS_PRETEST_21_0_93 75519a692473ba53cd5c01b411717dd3043e11cd libc_1_09 diff -r dea8b4d40a70 -r e53bb6f016b3 lisp/dynamic-setting.el diff -r dea8b4d40a70 -r e53bb6f016b3 lisp/obsolete/complete.el