Mercurial > emacs

changeset 110370:a5feb0659965

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge changes made in Gnus trunk. imap.el: Revert back to version cb950ed8ff3e0f40dac437a51b269166f9ffb60d, since some of the changes seem problematic. Fix up the w3m/curl dependencies. mm-decode.el (mm-text-html-renderer): Don't have gnus-article-html depend on curl, which isn't essential. gnus-html.el (gnus-html-schedule-image-fetching, gnus-html-prefetch-images): Check for curl before using it.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Tue, 14 Sep 2010 23:15:56 +0000
parents 4d54e23aa31e (diff) fb6801a4089a (current diff)
children a5f5fbc86364
files
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Sep 14 23:14:44 2010 +0000
+++ b/.hgtags	Tue Sep 14 23:15:56 2010 +0000
@@ -32,6 +32,7 @@
 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
@@ -562,6 +563,7 @@
 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
@@ -885,6 +887,7 @@
 b9483b592728f369b212714efb929c5f9a2fcbb2 libc-960321
 bfc0a609e15a1240a53e580cca2d37ca049e7399 libc-951206
 bfc852aa5b34546929e12d73d920518010fd12bc EMACS_PRETEST_22_1_91
+bfc8980754ed5b8ba76061deadab49dc41e7d7dd EMACS_23_2
 c17fd465ea95fc615961c63088385865705ca8a3 libc-970911
 c17fd465ea95fc615961c63088385865705ca8a3 libc-970912
 c17fd465ea95fc615961c63088385865705ca8a3 libc-970913
@@ -1003,6 +1006,7 @@
 c17fd465ea95fc615961c63088385865705ca8a3 libc-980127
 c17fd465ea95fc615961c63088385865705ca8a3 libc-980128
 c296bfdefcc3e065cdbfe4820fad8bc45e8c824d EMACS_PRETEST_21_0_105
+c3a1d1b47790cdd266fa8dd5b560f94a981266de EMACS_PRETEST_23_1_96
 c47ea87f3bd75650205a60bd22a77ac5c594ce15 libc-970715
 c4bf2875d07244697fba32d82fda761b6d3c296d libc-970506
 c4bf2875d07244697fba32d82fda761b6d3c296d libc-970507
@@ -1019,6 +1023,7 @@
 d0e3ea40717c5b4a2d6c98104885828d69d1793f EMACS_23_1_BASE
 d1641e2dfc5bf66c0747230159fec66f382d8c47 Boehm-GC-base
 d2548396ceddd157578a78683d41a83f25b7c0f3 EMACS_PRETEST_23_0_92
+d4caa51ddfe29f3c5db72f3cf9ced08bf53b12cd EMACS_PRETEST_23_1_97
 d5cbb3a06adcf5683a55d3aebcda44ed39699264 libc-970325
 d5cbb3a06adcf5683a55d3aebcda44ed39699264 libc-970326
 d5cbb3a06adcf5683a55d3aebcda44ed39699264 libc-970327