From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#8047: 23.2.94; Auto image mode breaks C-x C-w Date: Fri, 18 Feb 2011 22:38:30 -0500 Message-ID: References: <83tyg5vyvr.fsf@gnu.org> <83sjvowrfd.fsf@gnu.org> <83pqqrx3pc.fsf@gnu.org> <83fwrnwxvp.fsf@gnu.org> <83d3mrwuv9.fsf@gnu.org> <838vxfwbqc.fsf@gnu.org> <83y65dvfqh.fsf@gnu.org> <83ei75ust0.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1298088416 29265 80.91.229.12 (19 Feb 2011 04:06:56 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 19 Feb 2011 04:06:56 +0000 (UTC) Cc: cyd@stupidchicken.com, Stefan Monnier , 8047@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Feb 19 05:06:51 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Pqe5p-00038a-H6 for geb-bug-gnu-emacs@m.gmane.org; Sat, 19 Feb 2011 05:06:49 +0100 Original-Received: from localhost ([127.0.0.1]:45767 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pqe5n-0003Tc-6P for geb-bug-gnu-emacs@m.gmane.org; Fri, 18 Feb 2011 23:06:47 -0500 Original-Received: from [140.186.70.92] (port=47818 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pqe5h-0003TR-Ua for bug-gnu-emacs@gnu.org; Fri, 18 Feb 2011 23:06:42 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pqe5f-00075i-KL for bug-gnu-emacs@gnu.org; Fri, 18 Feb 2011 23:06:42 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:51655) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pqe5f-00075e-In for bug-gnu-emacs@gnu.org; Fri, 18 Feb 2011 23:06:39 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1Pqdew-0008OT-F5; Fri, 18 Feb 2011 22:39:02 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: <83tyg5vyvr.fsf@gnu.org> Resent-From: Glenn Morris Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 19 Feb 2011 03:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 8047 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 8047-submit@debbugs.gnu.org id=B8047.129808671832235 (code B ref 8047); Sat, 19 Feb 2011 03:39:02 +0000 Original-Received: (at 8047) by debbugs.gnu.org; 19 Feb 2011 03:38:38 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PqdeX-0008Ns-Kv for submit@debbugs.gnu.org; Fri, 18 Feb 2011 22:38:37 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PqdeW-0008Nh-2T for 8047@debbugs.gnu.org; Fri, 18 Feb 2011 22:38:36 -0500 Original-Received: from localhost ([127.0.0.1]:47121) by fencepost.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PqdeQ-00062j-FG; Fri, 18 Feb 2011 22:38:30 -0500 X-Spook: basement Kh-11 rail gun Ruby Ridge secure Yukon Roswell X-Ran: l3l/24GqMR~#PEf(ZN$9CC=n?G{`Cq~^6"iOhw(p)eaQL0=({lEr/4R\=_h%Sa$EreMEDp X-Hue: blue X-Attribution: GM User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Fri, 18 Feb 2011 22:39:02 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) 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: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:44256 Archived-At: Eli Zaretskii wrote: >> I think find-file-literally is more right, but require-final-newline is >> safer, so I suggest to use require-final-newline in the emacs-23 branch >> and find-file-literally in the trunk. > > Done. If you fix the same thing two different ways at the same time in trunk and branch, please try to mark the branch commit with "do not merge to trunk". It can be confusing if someone tries to merge branch to trunk several days later and is not familiar with the code in question.