From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.bugs Subject: bug#23820: 25.1.50; Fix caller to ediff-setup Date: Wed, 22 Jun 2016 13:15:09 +0900 (JST) Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; format=flowed; charset=US-ASCII X-Trace: ger.gmane.org 1466568989 21579 80.91.229.3 (22 Jun 2016 04:16:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 22 Jun 2016 04:16:29 +0000 (UTC) Cc: f92capac@gmail.com To: 23820@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jun 22 06:16:18 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1bFZaI-0001xh-Co for geb-bug-gnu-emacs@m.gmane.org; Wed, 22 Jun 2016 06:16:14 +0200 Original-Received: from localhost ([::1]:55580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFZaG-0004nc-W8 for geb-bug-gnu-emacs@m.gmane.org; Wed, 22 Jun 2016 00:16:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFZaB-0004nX-Do for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 00:16:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFZa6-0006nW-8D for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 00:16:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:37908) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFZa6-0006nS-5E for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 00:16:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bFZa6-0001LQ-01 for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 00:16: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: Wed, 22 Jun 2016 04:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 23820 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.14665689315124 (code B ref -1); Wed, 22 Jun 2016 04:16:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 22 Jun 2016 04:15:31 +0000 Original-Received: from localhost ([127.0.0.1]:50245 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFZZb-0001KZ-Ac for submit@debbugs.gnu.org; Wed, 22 Jun 2016 00:15:31 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:59091) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFZZZ-0001KM-Pz for submit@debbugs.gnu.org; Wed, 22 Jun 2016 00:15:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFZZS-0006hU-KF for submit@debbugs.gnu.org; Wed, 22 Jun 2016 00:15:24 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:42216) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFZZS-0006hL-H1 for submit@debbugs.gnu.org; Wed, 22 Jun 2016 00:15:22 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50054) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFZZQ-0004ll-Dg for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 00:15:21 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFZZK-0006gL-8B for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 00:15:19 -0400 Original-Received: from mail-pa0-x242.google.com ([2607:f8b0:400e:c03::242]:35333) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFZZK-0006gG-06 for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 00:15:14 -0400 Original-Received: by mail-pa0-x242.google.com with SMTP id hf6so2830501pac.2 for ; Tue, 21 Jun 2016 21:15:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:date:to:cc:subject:message-id:user-agent:mime-version; bh=2BYKV9ogZNQ+7YSYNRTbFehDdcUd4S4woYtLD6SaY88=; b=Pp+Pxzn5obN8pTDQYLNi0WLyWnYYQVMwbflnJ/f90v80ZzmzuCKYR3Humm8oG1g5+o /mk+zN6FnzA25dVFB7kKPJyM3w0S+Vb1x20Rtzrbu3mBuMttW6M4C2hEMDi1apeVJz9d VnOONu78JQSNYIoUBCcoV6ssMV1qIpajRYHLDhIFrA66EY+FPKKheTNhyLOh2ER0nYaM IPgdThiLrXbx3pJjUXM/nhPdzz4gvr4BAlY+NLh9LgyYe3peGyCPmpv8EciYk2ZCV2HU kpft0b18kNtaNI9M4d9SpY+tS6lshy5E64thshYwN2LCUPfFxJ31zklT7Q3BU88EHuM8 Nv4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:date:to:cc:subject:message-id:user-agent :mime-version; bh=2BYKV9ogZNQ+7YSYNRTbFehDdcUd4S4woYtLD6SaY88=; b=IK31EsHrSKDxWC7QB9kShTnP0RisP85OEDgKfHS40oHp8Q/U9fQeuBv+sZYGIzg8W0 GKwLylmJYUwt3bH6crnj2puZdNgXwPmw6cYSqPK6tLw2Brrw1hae7ZAQoaOLc1EvW5sq XjVII7y55CBmKd2j+5hc0AS2L80T2M2F5EvpegHwfRLYoJQK/oLpZvuaUcJSjVUymv7E pLpLgb7BPchT2vouSezwH2uCP7JRElBAXtpKp/I2Gl/4DUAVQWddpHH+6+TfehjM5CmK g6jjjyktDXBFnHWOJixtbhKEfvPdq/cpvQm6r61LVFY85dehbE2hZ52A9sZahNeSSIhR WHfg== X-Gm-Message-State: ALyK8tKr5JfCCxwE7WO3N8oqYv+Lwbk25s1hZ6Wooch0Thaqo0sIpqtISGT8S3Xug6ymLA== X-Received: by 10.67.7.199 with SMTP id de7mr32284389pad.94.1466568912951; Tue, 21 Jun 2016 21:15:12 -0700 (PDT) Original-Received: from calancha-pc (softbank126103144234.bbtec.net. [126.103.144.234]) by smtp.gmail.com with ESMTPSA id xn3sm99585194pab.32.2016.06.21.21.15.11 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 21 Jun 2016 21:15:12 -0700 (PDT) X-Google-Original-From: Tino Calancha X-X-Sender: calancha@calancha-pc User-Agent: Alpine 2.20 (DEB 67 2015-01-07) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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:119916 Archived-At: Hello, Seventh argument of ediff-setup is a hook: hilit-chg-get-diff-info is passing a function. emacs -Q -eval '(progn (with-temp-file "/tmp/foo" (insert "foo")) (switch-to-buffer "bar") (insert "bar"))' M-: (highlight-compare-with-file "/tmp/foo") ;; error: (wrong-type-argument sequencep hilit-chg-get-diff-list-hk) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; >From d80c1fba56cecd245b90be8f3bddd159e1a9cbdd Mon Sep 17 00:00:00 2001 From: Tino Calancha Date: Wed, 22 Jun 2016 13:04:03 +0900 Subject: [PATCH] Fix caller to ediff-setup * lisp/hilit-chg.el (hilit-chg-get-diff-info-hook): New variable. (hilit-chg-get-diff-info): Use it. (#Bug23820). --- lisp/hilit-chg.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index 8f042b6..1573b2e 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el @@ -313,6 +313,9 @@ highlight-changes-global-changes-existing-buffers :type 'boolean :group 'highlight-changes) +(defvar hilit-chg-get-diff-info-hook nil + "Hook argument to `ediff-setup' in `hilit-chg-get-diff-info'.") + ;; These are for internal use. (defvar hilit-chg-list nil) @@ -913,7 +916,7 @@ hilit-chg-get-diff-info (let (hilit-e hilit-x hilit-y) (ediff-setup buf-a file-a buf-b file-b nil nil ; buf-c file-C - 'hilit-chg-get-diff-list-hk + hilit-chg-get-diff-info-hook (list (cons 'ediff-job-name 'something)) ) (ediff-with-current-buffer hilit-e (ediff-really-quit nil)) @@ -965,6 +968,8 @@ hilit-chg-get-diff-list-hk ;; No point in returning a value, since this is a hook function. )) +(add-hook 'hilit-chg-get-diff-info-hook #'hilit-chg-get-diff-list-hk) + ;; ======================= global-highlight-changes-mode ============== ;;;###autoload -- 2.8.1 In GNU Emacs 25.1.50.2 (x86_64-pc-linux-gnu, GTK+ Version 3.20.6) Repository revision: 1c0199050bfa594287f3975aca56fc2a57ba0f66