From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Richard Copley Newsgroups: gmane.emacs.bugs Subject: bug#29916: 26.0.90; CRLF in diff-command output breaks smerge hunk header parsing Date: Mon, 1 Jan 2018 11:51:51 +0000 Message-ID: References: <83y3lid8eg.fsf@gnu.org> <83wp12chyf.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Trace: blaine.gmane.org 1514807480 9472 195.159.176.226 (1 Jan 2018 11:51:20 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 1 Jan 2018 11:51:20 +0000 (UTC) Cc: Stefan Monnier , 29916@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Jan 01 12:51:16 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eVycX-0001mb-31 for geb-bug-gnu-emacs@m.gmane.org; Mon, 01 Jan 2018 12:51:09 +0100 Original-Received: from localhost ([::1]:55160 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eVyeW-00076E-9A for geb-bug-gnu-emacs@m.gmane.org; Mon, 01 Jan 2018 06:53:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eVyeR-000768-8Z for bug-gnu-emacs@gnu.org; Mon, 01 Jan 2018 06:53:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eVyeM-0005HM-Dp for bug-gnu-emacs@gnu.org; Mon, 01 Jan 2018 06:53:07 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:50611) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eVyeM-0005H8-AZ for bug-gnu-emacs@gnu.org; Mon, 01 Jan 2018 06:53:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eVyeL-0002tj-Up for bug-gnu-emacs@gnu.org; Mon, 01 Jan 2018 06:53:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Richard Copley Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 01 Jan 2018 11:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 29916 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 29916-submit@debbugs.gnu.org id=B29916.151480755011091 (code B ref 29916); Mon, 01 Jan 2018 11:53:01 +0000 Original-Received: (at 29916) by debbugs.gnu.org; 1 Jan 2018 11:52:30 +0000 Original-Received: from localhost ([127.0.0.1]:59292 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eVydp-0002sp-Rw for submit@debbugs.gnu.org; Mon, 01 Jan 2018 06:52:30 -0500 Original-Received: from mail-oi0-f42.google.com ([209.85.218.42]:45956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eVydn-0002sY-KI for 29916@debbugs.gnu.org; Mon, 01 Jan 2018 06:52:27 -0500 Original-Received: by mail-oi0-f42.google.com with SMTP id x20so31927232oix.12 for <29916@debbugs.gnu.org>; Mon, 01 Jan 2018 03:52:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=xq+7gjjAfMJ5fUKNBdTJ7bcS1o+vQQmoA88NuVbo2Io=; b=BEmqYLZGpXRb6Fh9Oa6rfbAcFjS4SRUJH835Sf+THZbbxavfCBwIFzReiL7udfXx73 NIP2bto+MYnuv62uy71wWBObNEC5Wezqs9cWI7A0t2+33NDDtxAymfi+jMMCz7QSMfZE C8YauDYQtPX6aFPRYSkzR9cVeGYArYVC5BTIZkhT0f5O5Ktw+oleyIkAq5ZpTnGbywTD HNP74ZCGWjcwP4ozo5tiYc7MUVsE7MLWYXAmUMNkRa3B5MFSrZYa3kEAzDEHmxL0w7HX K4KDSoUZWj0yVak+3LuTDGh7cJBZIBOcxtYhCK8nAQYXwQ/b9YIorEsbgFBFkBB3oKzs fBrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=xq+7gjjAfMJ5fUKNBdTJ7bcS1o+vQQmoA88NuVbo2Io=; b=WpuQ3mNbhWKwuMZpb1vgW9+uxW5gYQPS9dQuCg/5FWgXrzjYa51nRUatZrnnHGAhAu +Lx7P53J9j934opdif+kG5aX+gWok93DkbRTWRF1ebLMIk0mheiG1ZjBGMnW5tuSO37P St+9KzhDqGQzoIjdZAAz1mmFTFWRyUqofa2h3N4nR8e/wAc5pd+1JwTINZgYjPeh9ykD uAyeckuB5XdJ/4/MpzKi1b8at9rWdczE1nDwqwr8N7xNU1XLPFHiOycg1k/I/ffaGYfu tOSKhXQetKhKltvSEb1c/4hUcOLr46B0hD0UXKFdvVzBWQVVNKL+2IAGW2nWljfro5Kj vR0A== X-Gm-Message-State: AKGB3mLuHl4aP8inV90I/EhTyqDsQM2XaPfBCJwC4eG0+g1CCvOu7uUb 57btfRLpcmitQqwuCIX8w6V/7oE5MnVhl1jW+F0= X-Google-Smtp-Source: ACJfBovajRHlPUlGP2ygUXrOmSJWofbF6opi90YBNxVqNq8CooSUEgB6WmuCiZonLhvtFfpN3w8Qxl59nB/H5UzPnto= X-Received: by 10.202.4.142 with SMTP id 136mr29276180oie.212.1514807541854; Mon, 01 Jan 2018 03:52:21 -0800 (PST) Original-Received: by 10.157.6.136 with HTTP; Mon, 1 Jan 2018 03:51:51 -0800 (PST) In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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" Xref: news.gmane.org gmane.emacs.bugs:141679 Archived-At: On 1 January 2018 at 11:02, Richard Copley wrote: >> What am I missing? Why do we get different results both for the >> command binding and for the recipe? > > Read-only mode. For some reason, my copy of the patch file has > the read-only attribute set. Sorry, I hadn't noticed that. (But that doesn't explain why we're getting different results from diff-goto-source.) By the way, I can also trigger the error at the top level (i.e., not inside a timer callback) by doing "diff-refine-hunk" interactively instead of "diff-goto-source".