From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Kyle Hubert Newsgroups: gmane.emacs.bugs Subject: bug#39353: [PATCH] Ediff fix for ediff-scroll-horizontally Date: Fri, 31 Jan 2020 09:29:43 -0500 Message-ID: <20200131142943.70625-1-khubert@gmail.com> References: <20200130033504.64697-1-khubert@gmail.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="97288"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Kyle Hubert To: 39353@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jan 31 15:30:13 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ixXJE-000PGO-Et for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 31 Jan 2020 15:30:12 +0100 Original-Received: from localhost ([::1]:53826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixXJD-0003wU-DK for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 31 Jan 2020 09:30:11 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:47906) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixXJ6-0003wN-CP for bug-gnu-emacs@gnu.org; Fri, 31 Jan 2020 09:30:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ixXJ5-00053S-Fn for bug-gnu-emacs@gnu.org; Fri, 31 Jan 2020 09:30:04 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:59046) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ixXJ5-00053C-An for bug-gnu-emacs@gnu.org; Fri, 31 Jan 2020 09:30:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ixXJ5-000286-3h for bug-gnu-emacs@gnu.org; Fri, 31 Jan 2020 09:30:03 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: <20200130033504.64697-1-khubert@gmail.com> Resent-From: Kyle Hubert Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 31 Jan 2020 14:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39353 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 39353-submit@debbugs.gnu.org id=B39353.15804810018157 (code B ref 39353); Fri, 31 Jan 2020 14:30:02 +0000 Original-Received: (at 39353) by debbugs.gnu.org; 31 Jan 2020 14:30:01 +0000 Original-Received: from localhost ([127.0.0.1]:36786 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ixXJ3-00027V-9b for submit@debbugs.gnu.org; Fri, 31 Jan 2020 09:30:01 -0500 Original-Received: from mail-qt1-f169.google.com ([209.85.160.169]:41525) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ixXJ1-00027C-SR for 39353@debbugs.gnu.org; Fri, 31 Jan 2020 09:30:00 -0500 Original-Received: by mail-qt1-f169.google.com with SMTP id l19so5495033qtq.8 for <39353@debbugs.gnu.org>; Fri, 31 Jan 2020 06:29:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Hzr1X9ibrW49DChT5IoMZDrG5ETVTyuhivc3uAlqDOY=; b=DpKxnfh2rDvBKpFGXdVIXROrSTsQc9S6gORs9cfHiyFEbOL7dFjvN9CN3Kq8+/nYtx PHTtvCsfhXLElbT5k/Al8UdKL+q05quI0wFYeG9mjbazg013D3pjwgoleVs4BUGz3yf/ oynn2WD2n3tJB6h0nfmJetKhIU8WTnoHRrQQgTRi2MGAN25tN4j9Ql84Gk3a/GMRPnsi tNsf542O6iZMkYYIeyCLQ/SW4t7BtPxTWY/P9gt/+w9l5XEIYwmAGYipwemSi1hxVO20 5cjUqeMVRzSdafrFZg1TmafptOx1+TnndncjIfJ+3fl+T0kp7yPbjJDCyEPNfhGD29ZP ezUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Hzr1X9ibrW49DChT5IoMZDrG5ETVTyuhivc3uAlqDOY=; b=BeRIKKfvOc54F5cX8gnlA1qLBhm/ZE7ZxzfKpmQPYWJioZcSySfJY9nzARo5FcLcKK 1Fg+gqmGtoySOxy4m5YxEPb7VrX3BKu6X0vSE8YgFRd62F25w0H05JafwsjK5s1Q0QmO 0SEeyLx8Xxg0cPBoO8/2tDiHIhgQoItOtiB61K4FjEk200XQBG1CCZLZVE5i2YfFtC2c N8/yu7/aWPZWN8Zrv3GPIZdYO5LMDcouopMc/wn9oXXTOFXMTy3dK53B2gIHS6uhoNVM wthopfBAwJSAteOpjXOWuRzxWlRD59I/p5NlPIrSDfzMSM1HYs7yzjsGg+JJ5GaEmJRq mNTA== X-Gm-Message-State: APjAAAXBIM9LJLZ7DUSnZrIJranX2pNMn2CBOrh/nfS4Rl/URTETRm0s FcqimoyXJN89uQuBYrAeoonwmW3O X-Google-Smtp-Source: APXvYqzsNR3WudVCiLTOqZqvysYqnHXeoa8kHWFixO+NUkiqnu9Mgcn9JangSmdRGmC94qt3ZmvAgg== X-Received: by 2002:ac8:4890:: with SMTP id i16mr10385942qtq.211.1580480993999; Fri, 31 Jan 2020 06:29:53 -0800 (PST) Original-Received: from dean.sm.tld (simulmedia03.s.subnet.rcn.com. [208.59.126.98]) by smtp.gmail.com with ESMTPSA id d22sm4953079qtp.37.2020.01.31.06.29.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jan 2020 06:29:53 -0800 (PST) X-Mailer: git-send-email 2.25.0 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: 209.51.188.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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:175496 Archived-At: When ediff-scroll-horizontally interactively calls scroll-left and scroll-right, current-prefix-arg should be used. This allows for the case that when no args or '-' are passed to ediff-scroll-horizontally, it will determine the default amount (half the window width or half-again, respectively). --- lisp/vc/ediff-util.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index a8af9ba37a..5f8a4a86b1 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -1540,10 +1540,10 @@ the width of the A/B/C windows." ;; hscrolling. (if (= last-command-event ?<) (lambda (arg) - (let ((prefix-arg arg)) + (let ((current-prefix-arg arg)) (call-interactively #'scroll-left))) (lambda (arg) - (let ((prefix-arg arg)) + (let ((current-prefix-arg arg)) (call-interactively #'scroll-right)))) ;; calculate argument to scroll-left/right ;; if there is an explicit argument -- 2.25.0