From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Kaushal Modi Newsgroups: gmane.emacs.bugs Subject: bug#26378: 26.0.50; Hitting 'n' during ediff gives Error Date: Fri, 07 Apr 2017 14:09:33 +0000 Message-ID: References: <87zifuv3q5.fsf@users.sourceforge.net> <87r315vh5a.fsf@users.sourceforge.net> <87fuhlumx9.fsf@users.sourceforge.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=f403043604f8747dda054c942df0 X-Trace: blaine.gmane.org 1491574340 1112 195.159.176.226 (7 Apr 2017 14:12:20 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 7 Apr 2017 14:12:20 +0000 (UTC) Cc: phst@google.com, 26378@debbugs.gnu.org To: npostavs@users.sourceforge.net Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Apr 07 16:12:14 2017 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 1cwUcM-0007FB-WB for geb-bug-gnu-emacs@m.gmane.org; Fri, 07 Apr 2017 16:12:03 +0200 Original-Received: from localhost ([::1]:51113 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwUcR-0000Hw-8w for geb-bug-gnu-emacs@m.gmane.org; Fri, 07 Apr 2017 10:12:07 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54655) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwUaW-0007FB-8R for bug-gnu-emacs@gnu.org; Fri, 07 Apr 2017 10:10:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cwUaQ-0002HG-D3 for bug-gnu-emacs@gnu.org; Fri, 07 Apr 2017 10:10:08 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:38449) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cwUaQ-0002H5-9Y for bug-gnu-emacs@gnu.org; Fri, 07 Apr 2017 10:10:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cwUaP-0008Fh-VD for bug-gnu-emacs@gnu.org; Fri, 07 Apr 2017 10:10:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Kaushal Modi Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 07 Apr 2017 14:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26378 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 26378-submit@debbugs.gnu.org id=B26378.149157419331704 (code B ref 26378); Fri, 07 Apr 2017 14:10:01 +0000 Original-Received: (at 26378) by debbugs.gnu.org; 7 Apr 2017 14:09:53 +0000 Original-Received: from localhost ([127.0.0.1]:36648 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cwUaH-0008FH-G7 for submit@debbugs.gnu.org; Fri, 07 Apr 2017 10:09:53 -0400 Original-Received: from mail-lf0-f49.google.com ([209.85.215.49]:34347) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cwUaF-0008F4-7V for 26378@debbugs.gnu.org; Fri, 07 Apr 2017 10:09:51 -0400 Original-Received: by mail-lf0-f49.google.com with SMTP id z15so42833994lfd.1 for <26378@debbugs.gnu.org>; Fri, 07 Apr 2017 07:09:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=8dLsEZHxsnd1gn5JDIV1+8HHhLepUp17gYDs3McSmAY=; b=Ac2tYiQ5UmmoK51kYEgmdMA51Cj8tRGmqiGfTzcgYbw2j4ZDqhh2oa2vIkUOCE+Fur BD5fRsCZXpEA/jD0uVY917SHhK7Lv2q0wP41lUUegF6AoCeh1qN3zxZQCCiJ+IDyyTQl L1FYxA6K+R4kz/30eUQhSRaftCEeYfR4ezwiKKa6DXaACNpjH698sf6MPTpCekxBm19K XF9Yf0AlbkMCbXkuCyMoFVe2tRWZV7P2Utf5PLfQzwdexXLciITEI7DwwASQoxhkZTlM IbyPQtZbBS5T3scQCcDyX0Jy0xXLrjMQssCZN/SL+vMDHiok+RnZjj+cvmTwYlB8uSA9 +LEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=8dLsEZHxsnd1gn5JDIV1+8HHhLepUp17gYDs3McSmAY=; b=lNGc1ahst488DgZu4ir3fnI/gym3826xivLvRZRrBpKyAppv/23wGiPdP6U1lJg+dY k13BGw+VYaRrrAOOdCeZRLRGy4Ga4+sr7Um/ymaEK3m++7QBkILaQWs7dm+FKaxT3B1x rpFT4v7u8ML4JvQecFfeuAQEaIZeuH3N1MJudTTXn8hEjTXYD+rcWpEsQ45NnlFK5XlL G0c3jvafTJHVi+L74wzJ1d3df7mtXR2Kv6VLryum8806AM9FAk8cTsy/fxIhWogXEcC7 wRNUo/N12EXmZRv00X7FdspmFog1Rsy/eJ2u+nY619r0TFtvgGKgRbGMnk6S17xh2HIV KiLA== X-Gm-Message-State: AFeK/H1qeGzgS+MkA9QOZnzTHdAw2qfQnxhRSyVpWT+MFGCZOQd3Zgl526qUWuYm76dDK8jzIPhYl4PAUwJetg== X-Received: by 10.46.15.17 with SMTP id 17mr12276421ljp.3.1491574185022; Fri, 07 Apr 2017 07:09:45 -0700 (PDT) In-Reply-To: <87fuhlumx9.fsf@users.sourceforge.net> 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:131333 Archived-At: --f403043604f8747dda054c942df0 Content-Type: multipart/alternative; boundary=f403043604f8747dd6054c942dee --f403043604f8747dd6054c942dee Content-Type: text/plain; charset=UTF-8 On Thu, Apr 6, 2017 at 7:37 PM wrote: > Thanks, I think this is ready to go in. Could you resend as an > attachment? It doesn't seem to apply, possibly because of line wrapping > and/or whitespace corruption. > Thanks. The same patch is now attached. -- Kaushal Modi --f403043604f8747dd6054c942dee Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
On Thu, Apr 6,= 2017 at 7:37 PM <npos= tavs@users.sourceforge.net> wrote:
Thanks, I think this is ready to go in.=C2=A0 Could you resend as an
attachment?=C2=A0 It doesn't seem to apply, possibly because of line wr= apping
and/or whitespace corruption.

=
Thanks. The same patch is now attached.
--

Kaushal Modi

--f403043604f8747dd6054c942dee-- --f403043604f8747dda054c942df0 Content-Type: text/x-patch; charset=US-ASCII; name="0001-Check-that-file-argument-is-a-string.patch" Content-Disposition: attachment; filename="0001-Check-that-file-argument-is-a-string.patch" Content-Transfer-Encoding: base64 Content-ID: <15b48bf6877480b2fe61> X-Attachment-Id: 15b48bf6877480b2fe61 RnJvbSAwODZhMTFjOTllNzc4MjViZWZjNDY2ZjY1ZjIxM2Q0ODU3NjE4ZjZmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLYXVzaGFsIE1vZGkgPGthdXNoYWwubW9kaUBnbWFpbC5jb20+ CkRhdGU6IFdlZCwgNSBBcHIgMjAxNyAxNzoxNjozMyAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIENo ZWNrIHRoYXQgZmlsZSBhcmd1bWVudCBpcyBhIHN0cmluZwoKKiBsaXNwL3ZjL2VkaWZmLWRpZmYu ZWwgKGVkaWZmLWV4ZWMtcHJvY2Vzcyk6IENoZWNrIHRoYXQgdGhlIGFyZ3VtZW50CiAgcGFzc2Vk IHRvIGBmaWxlLWxvY2FsLWNvcHknIGlzIGEgc3RyaW5nIChCdWcjMjYzNzgpLiAgQWxzbyBmaXgK ICB0aGUgZXhpc3RpbmcgY29tbWVudCBmb3IgdGhpcyBmdW5jdGlvbiwgYW5kIGNvbnZlcnQgaXQg dG8gaXRzCiAgZG9jLXN0cmluZy4KLS0tCiBsaXNwL3ZjL2VkaWZmLWRpZmYuZWwgfCAyMyArKysr KysrKysrKysrKysrLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDcg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC92Yy9lZGlmZi1kaWZmLmVsIGIvbGlzcC92 Yy9lZGlmZi1kaWZmLmVsCmluZGV4IGNmYTA4ZWYzNjAuLmRlZDgyYzQxYzkgMTAwNjQ0Ci0tLSBh L2xpc3AvdmMvZWRpZmYtZGlmZi5lbAorKysgYi9saXNwL3ZjL2VkaWZmLWRpZmYuZWwKQEAgLTEx MzQsMTIgKzExMzQsMjAgQEAgZWRpZmYtc2V0dXAtZGlmZi1yZWdpb25zMwogICAgKSkKIAogCi07 OyBFeGVjdXRlIFBST0dSQU0gYXN5bmNocm9ub3VzbHksIHVubGVzcyBPUy8yLCBXaW5kb3dzLSos IG9yIERPUywgb3IgdW5sZXNzCi07OyBTWU5DSCBpcyBub24tbmlsLiAgQlVGRkVSIG11c3QgYmUg YSBidWZmZXIgb2JqZWN0LCBhbmQgbXVzdCBiZSBhbGl2ZS4gIFRoZQotOzsgT1BUSU9OUyBhcmcg aXMgYSBsaXN0IG9mIG9wdGlvbnMgdG8gcGFzcyB0byBQUk9HUkFNLiBJdCBtYXkgYmUgYSBibGFu awotOzsgc3RyaW5nLiAgQWxsIGVsZW1lbnRzIGluIEZJTEVTIG11c3QgYmUgc3RyaW5ncy4gIFdl IGFsc28gZGVsZXRlIG5pbCBmcm9tCi07OyBhcmdzLgogKGRlZnVuIGVkaWZmLWV4ZWMtcHJvY2Vz cyAocHJvZ3JhbSBidWZmZXIgc3luY2ggb3B0aW9ucyAmcmVzdCBmaWxlcykKKyAgIkV4ZWN1dGUg dGhlIGRpZmYgUFJPR1JBTS4KKworVGhlIFBST0dSQU0gb3V0cHV0IGlzIHNlbnQgdG8gQlVGRkVS LCB3aGljaCBtdXN0IGJlIGEgbGl2ZSBidWZmZXIKK29iamVjdC4KKworVGhlIFBST0dSQU0gaXMg ZXhlY3V0ZWQgYXN5bmNocm9ub3VzbHkgdW5sZXNzIGBzeXN0ZW0tdHlwZScgaXMKK2B3aW5kb3dz LW50JyBvciBgbXMtZG9zJywgb3IgU1lOQ0ggaXMgbm9uLW5pbC4KKworT1BUSU9OUyBpcyBhIHN0 cmluZyBvZiBzcGFjZS1zZXBhcmF0ZWQgb3B0aW9ucyB0byBwYXNzIHRvIFBST0dSQU0uICBJdAor bWF5IGJlIGEgYmxhbmsgc3RyaW5nLgorCitGSUxFUyBpcyBhIGxpc3Qgb2YgZmlsZW5hbWVzIHRv IHBhc3MgdG8gUFJPR1JBTTsgbmlsIGFuZCBcIlwiIGVsZW1lbnRzCithcmUgaWdub3JlZC4iCiAg IChsZXQgKChkYXRhIChtYXRjaC1kYXRhKSkKIAk7OyBJZiB0aGlzIGlzIGEgYnVmZmVyIGpvYiwg d2UgYXJlIGRpZmZpbmcgdGVtcG9yYXJ5IGZpbGVzCiAJOzsgcHJvZHVjZWQgYnkgRW1hY3Mgd2l0 aCBlZGlmZi1jb2Rpbmctc3lzdGVtLWZvci13cml0ZSwgc28KQEAgLTExNTEsOCArMTE1OSw5IEBA IGVkaWZmLWV4ZWMtcHJvY2VzcwogCWFyZ3MpCiAgICAgKHNldHEgYXJncyAoYXBwZW5kIChzcGxp dC1zdHJpbmcgb3B0aW9ucykKICAgICAgICAgICAgICAgICAgICAgICAgKG1hcGNhciAobGFtYmRh IChmaWxlKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGZpbGUtbmFtZS11bnF1 b3RlCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG9yIChmaWxlLWxvY2FsLWNv cHkgZmlsZSkgZmlsZSkpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHdoZW4g KHN0cmluZ3AgZmlsZSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGZpbGUt bmFtZS11bnF1b3RlCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAob3IgKGZp bGUtbG9jYWwtY29weSBmaWxlKSBmaWxlKSkpKQogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGZpbGVzKSkpCiAgICAgKHNldHEgYXJncyAoZGVsZXRlICIiIChkZWxxIG5pbCBhcmdzKSkp IDsgZGVsZXRlIG5pbCBhbmQgIiIgZnJvbSBhcmd1bWVudHMKICAgICA7OyB0aGUgLS1iaW5hcnkg b3B0aW9uLCBpZiBwcmVzZW50LCBzaG91bGQgYmUgdXNlZCBvbmx5IGZvciBidWZmZXIgam9icwot LSAKMi4xMS4wCgo= --f403043604f8747dda054c942df0--