From patchwork Sat Oct 5 19:19:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 15658 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2CC3217520; Sat, 5 Oct 2019 20:21:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id DB05617446 for ; Sat, 5 Oct 2019 20:21:14 +0100 (BST) Received: from localhost ([::1]:58510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGpcA-0003zk-39 for patchwork@mira.cbaines.net; Sat, 05 Oct 2019 15:21:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35482) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGpc0-0003xh-FX for guix-patches@gnu.org; Sat, 05 Oct 2019 15:21:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iGpbz-0007MX-5r for guix-patches@gnu.org; Sat, 05 Oct 2019 15:21:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36449) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iGpbz-0007MQ-2K for guix-patches@gnu.org; Sat, 05 Oct 2019 15:21:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iGpby-0006aL-Sl for guix-patches@gnu.org; Sat, 05 Oct 2019 15:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36999] [PATCH 1/4] gnu: emacs-magit: Update to 2.90.1-1.c761d28. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Oct 2019 19:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36999 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36999@debbugs.gnu.org Cc: Oleg Pykhalov Received: via spool by 36999-submit@debbugs.gnu.org id=B36999.157030324725232 (code B ref 36999); Sat, 05 Oct 2019 19:21:02 +0000 Received: (at 36999) by debbugs.gnu.org; 5 Oct 2019 19:20:47 +0000 Received: from localhost ([127.0.0.1]:45261 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iGpbj-0006Yo-AZ for submit@debbugs.gnu.org; Sat, 05 Oct 2019 15:20:47 -0400 Received: from mail-lj1-f178.google.com ([209.85.208.178]:36316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iGpbh-0006YN-Gd for 36999@debbugs.gnu.org; Sat, 05 Oct 2019 15:20:45 -0400 Received: by mail-lj1-f178.google.com with SMTP id v24so9748978ljj.3 for <36999@debbugs.gnu.org>; Sat, 05 Oct 2019 12:20:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9p6Cus5ZH8AUH1wpaIhuaCCqHSjYMzkAPKLsiia+vYg=; b=mm9oR25+WxXrR/JJAad9zATX+8oZ/Dxc0QS3vGLb9t1Dt5soDCcET5qdnIX/mtBsBA 477ISCny9QcANFFtyT9dr3JdIR2BevVUQ6WdoymaMmx+qCZzjCkFbn+w2ePw9pd0UVfg bcRuH1NI1v+dRzx++6zhbK7dS8T3N64Rv+EXNmLXHT588ALTcCqRKKTY2cb/YgPbx7mh bOlTX6TRarIm1h7IzUzLxIefy7AL+iG5/Fx2Q+hObgopVAvXXMGJYamLN4Gq79+AD65Q PP9RHu3y3JZnEsjeACWjAkNlJ29AjbIP+NAjQN1ITPxSPKocSkGKMommwlUDftoeuPix 7vhw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=9p6Cus5ZH8AUH1wpaIhuaCCqHSjYMzkAPKLsiia+vYg=; b=pCanXocEOKJ+gIgD9DlUObSjIWgICXr7i9nX/2hLF2wqJZZHMV5YVJ1ClbnjZQ+c4w ZNf+II4losRtVVZDabiQtIx8j0kB9XKup2kKC0/lJQeVBwZfXYLiNjHqgPVT2EY2nlim uO1AD2Sq3LQYSfylp3JND230L4CLPv9TDTyXC20k9eVJbvnYEJ+Hg2s6MpjfUF6hPjEk D+Q+J7/BdkvPghpuqvPr3grZnl8IabGCaOReatWoD8IOub4HNAX7yTk6ouuHTJ5ooWRF JudQ+9V+eCPzuZJzIXbB5RK0SEfWy9WNU77cYmSLHTrnc2usghQe8ItIAnrr1otf3hs3 5DIA== X-Gm-Message-State: APjAAAUIVS2gyae41jsjuNjr7Mtuqmg47Ov7NUdtF5j9zECWJGaVVlSp ZfKiiIvTPzCGyeiitKTBkhKG1yzl X-Google-Smtp-Source: APXvYqwAPvuQcj/tdwaHItHUuHvfuU/Sm9an42oVOm0eZXAy1ZFDkajQmOrtwHT6c6o+GzFyyWfXGQ== X-Received: by 2002:a2e:7211:: with SMTP id n17mr13374876ljc.9.1570303239444; Sat, 05 Oct 2019 12:20:39 -0700 (PDT) Received: from localhost.localdomain (95-55-14-61.dynamic.avangarddsl.ru. [95.55.14.61]) by smtp.gmail.com with ESMTPSA id n5sm2599907ljh.54.2019.10.05.12.20.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Oct 2019 12:20:38 -0700 (PDT) From: Oleg Pykhalov Date: Sat, 5 Oct 2019 22:19:26 +0300 Message-Id: <20191005191929.7356-2-go.wigust@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191005191929.7356-1-go.wigust@gmail.com> References: <20191005191929.7356-1-go.wigust@gmail.com> MIME-Version: 1.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: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-magit): Update to 2.90.1-1.c761d28. [arguments]: Add patch phase. --- gnu/packages/emacs-xyz.scm | 50 ++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index afa21ee19e..7044b92240 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -265,21 +265,28 @@ on stdout instead of using a socket as the Emacsclient does.") (license license:gpl3+))) (define-public emacs-magit - ;; Version 2.90.1 has trouble loading the transient library, - ;; so we use a more recent commit that fixes it. - (let ((commit "b4aec016b5577afa8d889f258b499814d1bb1d94")) + ;; `magit-setup-buffer' macro introduced in c761d28d and required in + ;; `emacs-forge'. + (let ((commit "c761d28d49e5238037512b898db0ec9b40d85770")) (package (name "emacs-magit") (version (git-version "2.90.1" "1" commit)) (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/magit/magit") + (url "https://github.com/magit/magit.git") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "0zl7v6z0y50pcgqsf2r8c1k3r5nwjad9ba7r6sgrnf4rc62br7jv")))) + "16qx0404l05q1m6w7y5j8ck1z5nfmpinm00w0p2yh1hn5zzwy6dd")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix syntax error + (substitute* "lisp/magit-extras.el" + (("rev\\)\\)\\)\\)\\)\\)") "rev)))))")) + #t)))) (build-system gnu-build-system) (native-inputs `(("texinfo" ,texinfo) ("emacs" ,emacs-minimal))) @@ -318,6 +325,39 @@ on stdout instead of using a socket as the Emacsclient does.") #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (chmod "lisp/magit-extras.el" #o644) + (emacs-batch-edit-file "lisp/magit-extras.el" + `(progn (progn + (goto-char (point-min)) + (re-search-forward "(defun magit-copy-buffer-revision ()") + (forward-sexp 2) + (kill-sexp) + (insert ,(format #f "~S" + '(if (use-region-p) + (copy-region-as-kill nil nil 'region) + (when-let ((rev (cl-case major-mode + ((magit-cherry-mode + magit-log-select-mode + magit-reflog-mode + magit-refs-mode + magit-revision-mode + magit-stash-mode + magit-stashes-mode) + (car magit-refresh-args)) + ((magit-diff-mode magit-log-mode) + (let ((r (caar magit-refresh-args))) + (if (string-match "\\.\\.\\.?\\(.+\\)" r) + (match-string 1 r) + r))) + (magit-status-mode "HEAD")))) + (when (magit-commit-p rev) + (setq rev (magit-rev-parse rev)) + (push (list rev default-directory) magit-revision-stack) + (kill-new (message "%s" rev)))))))) + (basic-save-buffer))) + #t)) (delete 'configure) (add-before 'build 'patch-exec-paths