From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.bugs Subject: bug#28039: 26.0.50; Ses copy-region-as-kill advice assumes non-nil beg end arguments Date: Sat, 12 Aug 2017 13:25:33 +0900 Message-ID: <87y3qp1kg2.fsf@calancha-pc> References: <87r2wjl6gy.fsf@galago> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1502511983 28315 195.159.176.226 (12 Aug 2017 04:26:23 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 12 Aug 2017 04:26:23 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) Cc: 28039@debbugs.gnu.org, npostavs@users.sourceforge.net To: Vitalie Spinu Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Aug 12 06:26:16 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 1dgO01-0006Mo-Uc for geb-bug-gnu-emacs@m.gmane.org; Sat, 12 Aug 2017 06:26:10 +0200 Original-Received: from localhost ([::1]:53292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dgO04-0008Gz-Ve for geb-bug-gnu-emacs@m.gmane.org; Sat, 12 Aug 2017 00:26:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dgNzy-0008Fr-59 for bug-gnu-emacs@gnu.org; Sat, 12 Aug 2017 00:26:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dgNzu-0007MF-Vz for bug-gnu-emacs@gnu.org; Sat, 12 Aug 2017 00:26:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:47517) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dgNzu-0007Ll-RR for bug-gnu-emacs@gnu.org; Sat, 12 Aug 2017 00:26:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dgNzu-00007C-GK for bug-gnu-emacs@gnu.org; Sat, 12 Aug 2017 00:26:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 12 Aug 2017 04:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 28039 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: easy Original-Received: via spool by 28039-submit@debbugs.gnu.org id=B28039.1502511945434 (code B ref 28039); Sat, 12 Aug 2017 04:26:02 +0000 Original-Received: (at 28039) by debbugs.gnu.org; 12 Aug 2017 04:25:45 +0000 Original-Received: from localhost ([127.0.0.1]:56198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dgNzd-00006w-1u for submit@debbugs.gnu.org; Sat, 12 Aug 2017 00:25:45 -0400 Original-Received: from mail-pf0-f196.google.com ([209.85.192.196]:34956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dgNzb-00006q-Eu for 28039@debbugs.gnu.org; Sat, 12 Aug 2017 00:25:44 -0400 Original-Received: by mail-pf0-f196.google.com with SMTP id j68so5014495pfc.2 for <28039@debbugs.gnu.org>; Fri, 11 Aug 2017 21:25:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=8+wpLXS2eg+PXtab9wpzNZCBuA5/YYUDGAoy5cVSGaU=; b=r30i0ApmW5muU8bBAbkCQlap3GtTJi2sjIMX8cHkjd4gsD/C1Q2SflGI83F1OipVbT KSUuHhs7km1mEstnL9gkaXMWxjAiEJILcGSwy10NGnCGH7q/E/9gUd+hKhqBM9He5wc+ p2hZOPIW9hUssgJaBWGH4lzp7ewfyeC2qCX3+H8b0eQGSAC2NtJF3hP6PJ5i6gW0It1m tMhaGintr6O0ol1yktgvOsqjwyPrzc41BYdQ46FXt0iaHCYgMhjtVj0nM8VRZqnLneiU b2wqxyfScbSDPFuCmtkFwYXs06SDCcrYM1o+7AOjX0/OlIPAe4IEtdxBGc1+y8liGKRw 1xgw== 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:references:date:in-reply-to :message-id:user-agent:mime-version; bh=8+wpLXS2eg+PXtab9wpzNZCBuA5/YYUDGAoy5cVSGaU=; b=IxzpHgd2hjgZM8qTWUcSH7TO6FnbH/dCcQrGdIZ0PZdPZFYE3Ocuz/EpD2htXzR9jH vcNFf9Qy+RF0f3k3lthKh70HIQ7wl+DfEqLoSnnRmnEwCci/H50nMLntfXldITm6tmup CiBvsU9cF5WCQPcBcSosHrVeDx1tkTx54jkZhAAZkIz6AKKWfHe2rOuWsIuuM5VXDkN7 tQkNTEhc+hSB0Q8QEdBZ/ycDaaWodzWl07eLwOct+s/vwicS56NDZs34vudoc22jlvUM 9nubEfNcVgDlNCBOqjrSZ0cUEzok/Jq/vsDjoXw8tMaqGorIB7Fc7Wb9hP2gZ9nBX1TG 9lcQ== X-Gm-Message-State: AHYfb5hbSZ+aViUvF7ycbjqcgR++o0qHFBZKqguk61R8YhrXP/CvEe4m Dr086NQzfaQB6g== X-Received: by 10.84.225.4 with SMTP id t4mr19827466plj.428.1502511937490; Fri, 11 Aug 2017 21:25:37 -0700 (PDT) Original-Received: from calancha-pc (170.224.128.101.dy.bbexcite.jp. [101.128.224.170]) by smtp.gmail.com with ESMTPSA id q3sm4580189pgf.69.2017.08.11.21.25.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Aug 2017 21:25:36 -0700 (PDT) In-Reply-To: <87r2wjl6gy.fsf@galago> (Vitalie Spinu's message of "Thu, 10 Aug 2017 18:42:37 +0200") 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:135670 Archived-At: Vitalie Spinu writes: > Once ses is loaded I am getting the following error on kill in magit buffers: > > Debugger entered--Lisp error: (wrong-type-argument number-or-marker-p nil) > ses--advice-copy-region-as-kill(#[770 "\ > apply(ses--advice-copy-region-as-kill #[770 > copy-region-as-kill(nil nil region) > magit-copy-buffer-revision() > funcall-interactively(magit-copy-buffer-revision) > #(magit-copy-buffer-revision nil nil) > apply(# magit-copy-buffer-revision (nil nil)) > call-interactively@ido-cr+-record-current-command(# magit-copy-buffer-revision nil nil) > apply(call-interactively@ido-cr+-record-current-command # (magit-copy-buffer-revision nil nil)) > call-interactively(magit-copy-buffer-revision nil nil) > command-execute(magit-copy-buffer-revision) > > > Magit calls (copy-region-as-kill nil nil 'region). According to the doc first > two args should be ignored when 'region is passed. So I would assume it's the > bug in `ses--advice-copy-region-as-kill` then. Thank you for the report. I've noticed that `copy-region-as-kill' also needs `natnump' checks for BEG, END. How about th following patch? --8<-----------------------------cut here---------------start------------->8--- commit 019b5ebf09e69593b0e50ba2ce53501b83331ecc Author: Tino Calancha Date: Sat Aug 12 13:24:35 2017 +0900 copy-region-as-kill: Check types of BEG, END * lisp/ses.el (ses--advice-copy-region-as-kill): Check that BEG, END are non-negative integers (Bug#28039). (copy-region-as-kill): Same. * test/lisp/simple-tests.el (simple-test-bug28039): Add test. diff --git a/lisp/ses.el b/lisp/ses.el index 8c5ff2136f..676c36a5b7 100644 --- a/lisp/ses.el +++ b/lisp/ses.el @@ -3052,14 +3052,12 @@ ses--advice-copy-region-as-kill This advice also includes some SES-specific code because otherwise it's too hard to override how mouse-1 works." - (when (> beg end) - (let ((temp beg)) - (setq beg end - end temp))) - (if (not (and (derived-mode-p 'ses-mode) - (eq (get-text-property beg 'read-only) 'ses) - (eq (get-text-property (1- end) 'read-only) 'ses))) + (if (or (not (or (natnump beg) (natnump end))) + (not (and (derived-mode-p 'ses-mode) + (eq (get-text-property beg 'read-only) 'ses) + (eq (get-text-property (1- end) 'read-only) 'ses)))) (apply crak-fun beg end args) ; Normal copy-region-as-kill. + (when (> beg end) (cl-rotatef beg end)) (kill-new (ses-copy-region beg end)) (if transient-mark-mode (setq deactivate-mark t)) diff --git a/lisp/simple.el b/lisp/simple.el index 933ffc55a6..170e612918 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -4552,7 +4552,7 @@ copy-region-as-kill (funcall region-extract-function nil) (filter-buffer-substring beg end)))) (if (eq last-command 'kill-region) - (kill-append str (< end beg)) + (kill-append str (and (natnump beg) (natnump end) (< end beg))) (kill-new str))) (setq deactivate-mark t) nil) diff --git a/test/lisp/simple-tests.el b/test/lisp/simple-tests.el index ad7aee1db1..27e607ec13 100644 --- a/test/lisp/simple-tests.el +++ b/test/lisp/simple-tests.el @@ -497,5 +497,16 @@ simple-test-undo-with-switched-buffer (should (equal (line-number-at-pos 5) 3)) (should (equal (line-number-at-pos 7) 4))))) +(ert-deftest simple-test-bug28039 () + "Test for http://debbugs.gnu.org/28039 ." + (with-temp-buffer + (insert "123456789abc") + (kill-region 1 10) + (set-mark (point)) + (goto-char 1) + (copy-region-as-kill nil nil t) + (should (equal "abc" (current-kill 0))))) + + (provide 'simple-test) ;;; simple-test.el ends here --8<-----------------------------cut here---------------end--------------->8--- In GNU Emacs 26.0.50 (build 4, x86_64-pc-linux-gnu, GTK+ Version 3.22.11) of 2017-08-12 built on calancha-pc Repository revision: e3ed43f4ac667d39fffcc48cfbe97b074f9aa5c7