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:47:07 +0900 (JST) Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed X-Trace: ger.gmane.org 1466570916 15140 80.91.229.3 (22 Jun 2016 04:48:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 22 Jun 2016 04:48:36 +0000 (UTC) Cc: Tino Calancha , 23820@debbugs.gnu.org To: Noam Postavsky Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jun 22 06:48:17 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 1bFa5I-0006sW-E6 for geb-bug-gnu-emacs@m.gmane.org; Wed, 22 Jun 2016 06:48:16 +0200 Original-Received: from localhost ([::1]:55641 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFa5H-0002Re-I6 for geb-bug-gnu-emacs@m.gmane.org; Wed, 22 Jun 2016 00:48:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55146) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFa59-0002RX-Af for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 00:48:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFa55-0004XI-0j for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 00:48:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:37927) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFa54-0004XE-Tx for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 00:48:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bFa54-00026C-IG for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 00:48: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:48:02 +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.14665708378014 (code B ref 23820); Wed, 22 Jun 2016 04:48:02 +0000 Original-Received: (at 23820) by debbugs.gnu.org; 22 Jun 2016 04:47:17 +0000 Original-Received: from localhost ([127.0.0.1]:50264 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFa4L-00025C-H1 for submit@debbugs.gnu.org; Wed, 22 Jun 2016 00:47:17 -0400 Original-Received: from mail-pf0-f182.google.com ([209.85.192.182]:33943) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFa4K-00024z-9q for 23820@debbugs.gnu.org; Wed, 22 Jun 2016 00:47:16 -0400 Original-Received: by mail-pf0-f182.google.com with SMTP id h14so13620443pfe.1 for <23820@debbugs.gnu.org>; Tue, 21 Jun 2016 21:47:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:date:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=qorIVHHmlhQW3+Dgk9qqTofLAtp237rcRNQBrwijwjI=; b=Ti4V2DhrnJvNsotDzKvND2NNKJ51gwt1HpcRbJDoBTZCGryNR0SxuW4AlF7fCDS2be FpBl9F1XIQLKXcitsESp9dLQN8d9Rs0I8Kz47Hg1kvVzoCZcHrHIZ+y6XjhOw6koWuen R1r6hTCuypgxy7iiTZ4Rih1h1ZmtmcoyF9Q1S5K9ZHyGE9hotXuRsdQFPVp9DYShC8Ya ffZhg7eQCIux017Ar1aSxjcx84YBEZnreVVinqjXaY0q1k7LaPzPY0TEO0k4SH+N04Vz FD8k4Y7p1wqVkwdPgdTuZUfea1H9j1eCMTIOWjblndYYRZVRumdu7+CI5shaE3nwc6yf Fa1w== 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:in-reply-to:message-id :references:user-agent:mime-version; bh=qorIVHHmlhQW3+Dgk9qqTofLAtp237rcRNQBrwijwjI=; b=R3OCyUndvJF3X5vsc56P5JHf/qbmTnsCk/ZpIIZXu+7LqEjZrAUEoSV/LAwD9wapyD wHGRLBz73yyP2W4Q74PB+c8GmMn/ODJ6E4ia93AByiwgGoDlkEEC0IINUx1dGQo8wzn8 WySngRYEgeIG2537kUsZxsXScYoqA8m4bDIs1G4J0LzIKPh45AOfLwY0Ox4KaDvJUFj5 Gui43YUyLyekHNIAEriHFLEP7fcn8/DoGjsvqzVdGgoKJmrWz1BEuvILupqDmf/X2+Qs GFX2QeIdMhIiTKiDU74omtfo7f5ZtmoHr7ta0j24JoVCq+KSvg9KIivt9GAMgZp982XJ ZlmQ== X-Gm-Message-State: ALyK8tKQZOtF6mJQWVL1ow7wOAfeziTL532gBMQrn5cvFk2UYlOgY0viCzZ36emseK/lzw== X-Received: by 10.98.89.147 with SMTP id k19mr32010193pfj.156.1466570830400; Tue, 21 Jun 2016 21:47:10 -0700 (PDT) Original-Received: from calancha-pc (softbank126103144234.bbtec.net. [126.103.144.234]) by smtp.gmail.com with ESMTPSA id e4sm22829959pfe.69.2016.06.21.21.47.08 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 21 Jun 2016 21:47:09 -0700 (PDT) X-Google-Original-From: Tino Calancha X-X-Sender: calancha@calancha-pc In-Reply-To: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) 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:119918 Archived-At: > 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)) Yeah, i tried that first but i thought it could be useful for documentation adding the new var. But if hilit-chg-get-diff-info-hk it is a list of functions then let's go with the '(hilit-chg-get-diff-info-hk) solution. emacs25 branch wasn't affected because ediff-setup calls run-hooks (in master branch use 'mapc).