From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.devel Subject: Re: master c6f03ed: Fix a problem in url.el without GnuTLS Date: Fri, 12 Dec 2014 19:25:38 -0500 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <87oar81jlp.fsf@lifelogs.com> References: <20141211155740.11916.1584@vcs.savannah.gnu.org> <87ppbquo97.fsf@gmail.com> <83zjaurreb.fsf@gnu.org> <874mt14wrc.fsf@lifelogs.com> <83egs5rzlr.fsf@gnu.org> <877fxx2e6t.fsf@lifelogs.com> <83a92trlgs.fsf@gnu.org> Reply-To: emacs-devel@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1418430323 3896 80.91.229.3 (13 Dec 2014 00:25:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 13 Dec 2014 00:25:23 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 13 01:25:16 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XzaWJ-0000LM-Oj for ged-emacs-devel@m.gmane.org; Sat, 13 Dec 2014 01:25:15 +0100 Original-Received: from localhost ([::1]:59878 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzaWJ-0006JK-AQ for ged-emacs-devel@m.gmane.org; Fri, 12 Dec 2014 19:25:15 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58158) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzaW6-0005zw-EN for emacs-devel@gnu.org; Fri, 12 Dec 2014 19:25:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XzaW1-0003zZ-6e for emacs-devel@gnu.org; Fri, 12 Dec 2014 19:25:02 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:45658) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzaW0-0003wx-Vw for emacs-devel@gnu.org; Fri, 12 Dec 2014 19:24:57 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XzaVz-0008Dt-JF for emacs-devel@gnu.org; Sat, 13 Dec 2014 01:24:55 +0100 Original-Received: from c-98-229-61-72.hsd1.ma.comcast.net ([98.229.61.72]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 13 Dec 2014 01:24:55 +0100 Original-Received: from tzz by c-98-229-61-72.hsd1.ma.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 13 Dec 2014 01:24:55 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 33 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-98-229-61-72.hsd1.ma.comcast.net X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6; d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:C7OERVPv0CA/xM7VwTpnY+qv4ZE= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:179966 Archived-At: On Fri, 12 Dec 2014 16:28:35 +0200 Eli Zaretskii 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 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 wrote: LMI> Ted Zlatanov 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