From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411) Date: Sun, 01 May 2016 21:25:34 +0200 Message-ID: <87twih1sy9.fsf@engster.org> References: <20160501152515.31964.66193@vcs.savannah.gnu.org> <87shy1pz0l.fsf@gnus.org> <83twihn5mx.fsf@gnu.org> <87eg9lpw80.fsf@gnus.org> <87a8k9pvtb.fsf@gnus.org> <8737q13dli.fsf@engster.org> <874mahpuh6.fsf@gnus.org> <87y47t1yor.fsf@engster.org> <87oa8poelk.fsf@gnus.org> <83mvo9mz9z.fsf@gnu.org> <87fuu1zmbd.fsf@gnus.org> <83inyxmyq9.fsf@gnu.org> <87bn4pzlni.fsf@gnus.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1462130787 12459 80.91.229.3 (1 May 2016 19:26:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 1 May 2016 19:26:27 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org To: Lars Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun May 01 21:26:18 2016 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 1awx0T-00069D-PF for ged-emacs-devel@m.gmane.org; Sun, 01 May 2016 21:26:17 +0200 Original-Received: from localhost ([::1]:34068 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awx0P-0006U1-U7 for ged-emacs-devel@m.gmane.org; Sun, 01 May 2016 15:26:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awx0H-0006Gg-HM for emacs-devel@gnu.org; Sun, 01 May 2016 15:26:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1awx06-0004qu-0n for emacs-devel@gnu.org; Sun, 01 May 2016 15:26:00 -0400 Original-Received: from randomsample.de ([5.45.97.173]:55451) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awx04-0004oo-NO; Sun, 01 May 2016 15:25:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=eaJfztTJImHpqJwB4crW2llCGnv+w7bjG2UXKcmhbUo=; b=n+1mixN4JXdfhrYrN6g7p+fEYlegt10ql4wwBAWCrXYHJeCdbD3n0lrf57WOTLqUWR0qnoAHniCmyrZzVOqEw7g+9LV4jllhTu9PeI6b64QmwKVn1EfOOTf8G42tnZtS; Original-Received: from ip4d168166.dynamic.kabel-deutschland.de ([77.22.129.102] helo=isaac) by randomsample.de with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1awwzr-0007Bf-2F; Sun, 01 May 2016 21:25:39 +0200 In-Reply-To: <87bn4pzlni.fsf@gnus.org> (Lars Ingebrigtsen's message of "Sun, 01 May 2016 20:19:13 +0200") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:203505 Archived-At: Lars Ingebrigtsen writes: > Eli Zaretskii writes: > >> Yes. > > Ok; here goes... Looks good. git detects all the picks except one (4a2f33d1a11). I forgot that git of course does resolve things automatically when possible, so I've now added "cherry picked from commit" to gitmerge-skip-regexp. -David