From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.bugs Subject: bug#23820: 25.1.50; Fix caller to ediff-setup Date: Wed, 22 Jun 2016 00:33:20 -0400 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1466570065 3813 80.91.229.3 (22 Jun 2016 04:34:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 22 Jun 2016 04:34:25 +0000 (UTC) Cc: 23820@debbugs.gnu.org To: Tino Calancha Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jun 22 06:34:14 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 1bFZrh-00075t-Cv for geb-bug-gnu-emacs@m.gmane.org; Wed, 22 Jun 2016 06:34:13 +0200 Original-Received: from localhost ([::1]:55613 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFZrg-0004dj-HO for geb-bug-gnu-emacs@m.gmane.org; Wed, 22 Jun 2016 00:34:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53359) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFZra-0004dd-EX for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 00:34:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFZrW-0002kr-5I for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 00:34:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:37923) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFZrW-0002kn-1o for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 00:34:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bFZrV-0001n4-SG for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 00:34:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Noam Postavsky Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 22 Jun 2016 04:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 23820 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 23820-submit@debbugs.gnu.org id=B23820.14665700086843 (code B ref 23820); Wed, 22 Jun 2016 04:34:01 +0000 Original-Received: (at 23820) by debbugs.gnu.org; 22 Jun 2016 04:33:28 +0000 Original-Received: from localhost ([127.0.0.1]:50260 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFZqy-0001mI-8y for submit@debbugs.gnu.org; Wed, 22 Jun 2016 00:33:28 -0400 Original-Received: from mail-oi0-f41.google.com ([209.85.218.41]:35956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFZqw-0001m6-GE for 23820@debbugs.gnu.org; Wed, 22 Jun 2016 00:33:26 -0400 Original-Received: by mail-oi0-f41.google.com with SMTP id f189so5341794oig.3 for <23820@debbugs.gnu.org>; Tue, 21 Jun 2016 21:33:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=1tslXq4NCKn9WCYNvdCxJXOWDXSWI4u5Dz4gAw+WP5c=; b=HAiEZ5zJlujO7KIvjmWgAel8C8xC3ud3eQN6KTLe2MvPcSruTy+dcL1HHpTTijLbje B1bs+7LHgnBiJlLBaxi1hc9c6NdBJnNEB/TZOIaftnN86ZWruE0heE7UgCOzWRTXIp23 8kJAp6NgDZq/I3Jz0SG6vbQKwIRuaZPdhOkSw6aerF71OljnYdWoxSNkTS/FWsyQd/oL 6nQMuOuDqQkMEzp9UXjz3HADP1CKEw5hb14R3MhVi58SDzz5zTdvGJFcPY3LfiUyk3p3 nL638NXxAOj7ZB3un9DKufmvYeuRYhRKFmJLjwLBLD+RjB0c0QaKnjL54qOGr2CKgUgz CklA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=1tslXq4NCKn9WCYNvdCxJXOWDXSWI4u5Dz4gAw+WP5c=; b=iXwcHEKpSkJDGPiAU/TnlyXZkpMUG24iGozt2qoLUPROKLSm3A6/hfLIdqWri1nmX4 S7iRxzucYShmUEPaI28f50AoxQ/3JI3uUkVQ9IBBTtmowwSjN8eJ97VPTRq8ZsQzabW8 ujGsqYi54kBxqvqV6PHDTm+kiIxEi9z8k16wSN3KcMcWE+EEAkhI8MvkZfVbNlqHVp2o JfB+wl64BIS1dXCqskgS8Qhgk02aBJ4ZUJRw3U5+mTO8cYxJrdnzedw1HNTDhhbYnx6r mouLuJu7+i8txsguadn6uEdUqPIg+9t2eMJfLCkSvmcJ0CG7MVNDwe69jdFvc2+VYcXF snlg== X-Gm-Message-State: ALyK8tIwVsniLW9MNlUPyUb0VKkSdwgE8Dmm0ndV+drNWNPUTKO80Kmdo4hSb9b2UkTttWJjx7zTWlrIqyZGxA== X-Received: by 10.157.1.107 with SMTP id 98mr545166otu.17.1466570000784; Tue, 21 Jun 2016 21:33:20 -0700 (PDT) Original-Received: by 10.157.52.238 with HTTP; Tue, 21 Jun 2016 21:33:20 -0700 (PDT) In-Reply-To: X-Google-Sender-Auth: vTwoplMlkxv1bUd6WoI9oG2a5hc 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:119917 Archived-At: On Wed, Jun 22, 2016 at 12:15 AM, Tino Calancha wrote: > > Hello, > > Seventh argument of ediff-setup is a hook: hilit-chg-get-diff-info > is passing a function. I think that argument is not a hook but just a list of functions, so it should suffice to do @@ -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-hk) (list (cons 'ediff-job-name 'something)) ) (ediff-with-current-buffer hilit-e (ediff-really-quit nil))