Re: master c6f03ed: Fix a problem in url.el without GnuTLS

[Ted Zlatanov]

On Fri, 12 Dec 2014 16:28:35 +0200 Eli Zaretskii <address@hidden> wrote: 

EZ> No need to fear, just remember to review what "git show" displays,
EZ> after the merge and before you push.  If it doesn't look OK to you,
EZ> you can always reset to cancel the merge.

Yup.  I did it, carefully.

On Fri, 12 Dec 2014 11:06:03 -0500 Stefan Monnier <address@hidden> wrote: 

>>> I can attempt another merge of the emacs-24 branch... with fear :)

SM> Don't forget to use gitmerge.el.

Right, thanks.  It works well.

On Fri, 12 Dec 2014 21:46:05 +0100 Lars Magne Ingebrigtsen <address@hidden> 
wrote: 

LMI> Ted Zlatanov <address@hidden> writes:

>> It should get merged into master soon.  I can attempt another merge of
>> the emacs-24 branch... with fear :)

LMI> Oops.  I didn't notice that this fix went into the emacs-24 branch, so I
LMI> removed the `fboundp' checks from the trunk.  Which means that trunk
LMI> doesn't work for people without gnutls support.

LMI> So if you could do the merge, that would be nice, otherwise I'll have to
LMI> re-revert those `fboundp' changes again.

It's merged.  Sorry for the delay.

Ted