From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: master c6f03ed: Fix a problem in url.el without GnuTLS Date: Fri, 12 Dec 2014 11:06:03 -0500 Message-ID: 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1418400401 16185 80.91.229.3 (12 Dec 2014 16:06:41 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 12 Dec 2014 16:06:41 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 12 17:06:31 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 1XzSjf-0004Yx-Ga for ged-emacs-devel@m.gmane.org; Fri, 12 Dec 2014 17:06:31 +0100 Original-Received: from localhost ([::1]:58048 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzSjf-0001SL-1n for ged-emacs-devel@m.gmane.org; Fri, 12 Dec 2014 11:06:31 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60691) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzSjU-0001R4-M7 for emacs-devel@gnu.org; Fri, 12 Dec 2014 11:06:28 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XzSjN-0005zd-21 for emacs-devel@gnu.org; Fri, 12 Dec 2014 11:06:20 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:25695) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzSjE-0005yZ-MY; Fri, 12 Dec 2014 11:06:04 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AjsPAOwQflTO+ILA/2dsb2JhbABbgweDYIVaxR0EAgKBJBcBAQEBAQF8hAMBAQMBViMQCzQSFBgNJIhKCdZZAQEBAQYBAQEBHpBvB4RIBYsBpC6BeIQZIYJ3AQEB X-IPAS-Result: AjsPAOwQflTO+ILA/2dsb2JhbABbgweDYIVaxR0EAgKBJBcBAQEBAQF8hAMBAQMBViMQCzQSFBgNJIhKCdZZAQEBAQYBAQEBHpBvB4RIBYsBpC6BeIQZIYJ3AQEB X-IronPort-AV: E=Sophos;i="5.07,502,1413259200"; d="scan'208";a="100288452" Original-Received: from 206-248-130-192.dsl.teksavvy.com (HELO pastel.home) ([206.248.130.192]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 12 Dec 2014 11:06:04 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 059B32F23; Fri, 12 Dec 2014 11:06:03 -0500 (EST) In-Reply-To: <83a92trlgs.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 12 Dec 2014 16:28:35 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:179930 Archived-At: >> I can attempt another merge of the emacs-24 branch... with fear :) Don't forget to use gitmerge.el. Stefan