From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#18840: 24.4; nt/README.W32: obsolete snippet Date: Sun, 26 Oct 2014 20:24:38 +0200 Message-ID: <83d29e4rkp.fsf@gnu.org> References: <83lho24y28.fsf@gnu.org> <83egtu4up5.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1414347990 16713 80.91.229.3 (26 Oct 2014 18:26:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 26 Oct 2014 18:26:30 +0000 (UTC) Cc: 18840@debbugs.gnu.org To: Dani Moncayo Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Oct 26 19:26:23 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1XiSWD-0004gH-43 for geb-bug-gnu-emacs@m.gmane.org; Sun, 26 Oct 2014 19:26:21 +0100 Original-Received: from localhost ([::1]:57954 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XiSWC-0002nT-NR for geb-bug-gnu-emacs@m.gmane.org; Sun, 26 Oct 2014 14:26:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35751) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XiSW2-0002eC-9P for bug-gnu-emacs@gnu.org; Sun, 26 Oct 2014 14:26:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XiSVu-0002Om-JN for bug-gnu-emacs@gnu.org; Sun, 26 Oct 2014 14:26:10 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:44096) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XiSVu-0002Og-GC for bug-gnu-emacs@gnu.org; Sun, 26 Oct 2014 14:26:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XiSVt-0001Hu-TJ for bug-gnu-emacs@gnu.org; Sun, 26 Oct 2014 14:26:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 26 Oct 2014 18:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18840 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 18840-submit@debbugs.gnu.org id=B18840.14143479014853 (code B ref 18840); Sun, 26 Oct 2014 18:26:01 +0000 Original-Received: (at 18840) by debbugs.gnu.org; 26 Oct 2014 18:25:01 +0000 Original-Received: from localhost ([127.0.0.1]:36194 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XiSUu-0001G7-N3 for submit@debbugs.gnu.org; Sun, 26 Oct 2014 14:25:00 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:35951) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XiSUr-0001Fn-9T for 18840@debbugs.gnu.org; Sun, 26 Oct 2014 14:24:58 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NE200K00DLPCJ00@a-mtaout20.012.net.il> for 18840@debbugs.gnu.org; Sun, 26 Oct 2014 20:24:50 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NE200J7LDTER690@a-mtaout20.012.net.il>; Sun, 26 Oct 2014 20:24:50 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:95124 > Date: Sun, 26 Oct 2014 19:05:32 +0100 > From: Dani Moncayo > > > Committed & closing this bug. > > I've just realized that this should have gone to emacs-24, not the > trunk. Sorry. > > (I could back port this to emacs-24 is someone tell me how, or what > doc to read). You could simply apply the diffs, it's no big deal in this case. If you want bzr to do the job for you, then the following will do it: cd emacs-24 && bzr merge -r 118218..118219 ../trunk Then "bzr ci" as usual, but please be sure to say in the commit message that this was "backported from trunk", so that the next merge from emacs-24 to the trunk will skip this commit. Thanks.