From: Glenn Morris <rgm@gnu.org>
Date: Tue, 18 Jun 2019 22:47:49 +0000 (-0700)
Subject: Disable lexical-binding in ediff
X-Git-Tag: emacs-27.0.90~2412
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ef23c8be70d2cdc51b7f117ab3b4ad2f16b4ecdc;p=emacs.git

Disable lexical-binding in ediff

Since it breaks the thing (bug#36157, bug#36281).
* lisp/vc/ediff-diff.el, lisp/vc/ediff-help.el, lisp/vc/ediff-hook.el:
* lisp/vc/ediff-init.el, lisp/vc/ediff-merg.el, lisp/vc/ediff-mult.el:
* lisp/vc/ediff-ptch.el, lisp/vc/ediff-vers.el, lisp/vc/ediff-wind.el:
* lisp/vc/ediff.el: Set lexical-binding to nil.
---

diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index f6b68bbd7df..b79fde0d662 100644
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -1,4 +1,4 @@
-;;; ediff-diff.el --- diff-related utilities  -*- lexical-binding: t; -*-
+;;; ediff-diff.el --- diff-related utilities  -*- lexical-binding: nil; -*-
 
 ;; Copyright (C) 1994-2019 Free Software Foundation, Inc.
 
diff --git a/lisp/vc/ediff-help.el b/lisp/vc/ediff-help.el
index 74a4068a7f6..d44263b70b0 100644
--- a/lisp/vc/ediff-help.el
+++ b/lisp/vc/ediff-help.el
@@ -1,4 +1,4 @@
-;;; ediff-help.el --- Code related to the contents of Ediff help buffers  -*- lexical-binding: t; -*-
+;;; ediff-help.el --- Code related to the contents of Ediff help buffers  -*- lexical-binding: nil; -*-
 
 ;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
diff --git a/lisp/vc/ediff-hook.el b/lisp/vc/ediff-hook.el
index 6ece7af5e65..0b97120baf1 100644
--- a/lisp/vc/ediff-hook.el
+++ b/lisp/vc/ediff-hook.el
@@ -1,4 +1,4 @@
-;;; ediff-hook.el --- setup for Ediff's menus and autoloads  -*- lexical-binding: t; -*-
+;;; ediff-hook.el --- setup for Ediff's menus and autoloads  -*- lexical-binding: nil; -*-
 
 ;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index 41871d4b7cf..18c396f164c 100644
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -1,4 +1,4 @@
-;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff  -*- lexical-binding: t; -*-
+;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff  -*- lexical-binding: nil; -*-
 
 ;; Copyright (C) 1994-2019 Free Software Foundation, Inc.
 
diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el
index e08d899bd08..cadc15325c7 100644
--- a/lisp/vc/ediff-merg.el
+++ b/lisp/vc/ediff-merg.el
@@ -1,4 +1,4 @@
-;;; ediff-merg.el --- merging utilities  -*- lexical-binding: t; -*-
+;;; ediff-merg.el --- merging utilities  -*- lexical-binding: nil; -*-
 
 ;; Copyright (C) 1994-2019 Free Software Foundation, Inc.
 
diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el
index 8ac8eff986c..f44236c44df 100644
--- a/lisp/vc/ediff-mult.el
+++ b/lisp/vc/ediff-mult.el
@@ -1,4 +1,4 @@
-;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff  -*- lexical-binding: t; -*-
+;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff  -*- lexical-binding: nil; -*-
 
 ;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
index 21e1e2ee161..7b743a8d723 100644
--- a/lisp/vc/ediff-ptch.el
+++ b/lisp/vc/ediff-ptch.el
@@ -1,4 +1,4 @@
-;;; ediff-ptch.el --- Ediff's  patch support  -*- lexical-binding: t; -*-
+;;; ediff-ptch.el --- Ediff's  patch support  -*- lexical-binding: nil; -*-
 
 ;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
diff --git a/lisp/vc/ediff-vers.el b/lisp/vc/ediff-vers.el
index 049fdc880b1..cadb057a9ab 100644
--- a/lisp/vc/ediff-vers.el
+++ b/lisp/vc/ediff-vers.el
@@ -1,4 +1,4 @@
-;;; ediff-vers.el --- version control interface to Ediff  -*- lexical-binding: t; -*-
+;;; ediff-vers.el --- version control interface to Ediff  -*- lexical-binding: nil; -*-
 
 ;; Copyright (C) 1995-1997, 2001-2019 Free Software Foundation, Inc.
 
diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el
index 559a20b0234..5439110160b 100644
--- a/lisp/vc/ediff-wind.el
+++ b/lisp/vc/ediff-wind.el
@@ -1,4 +1,4 @@
-;;; ediff-wind.el --- window manipulation utilities  -*- lexical-binding: t; -*-
+;;; ediff-wind.el --- window manipulation utilities  -*- lexical-binding: nil; -*-
 
 ;; Copyright (C) 1994-1997, 2000-2019 Free Software Foundation, Inc.
 
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index e13c7b93a91..4e2ead4f439 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -1,4 +1,4 @@
-;;; ediff.el --- a comprehensive visual interface to diff & patch  -*- lexical-binding: t; -*-
+;;; ediff.el --- a comprehensive visual interface to diff & patch  -*- lexical-binding: nil; -*-
 
 ;; Copyright (C) 1994-2019 Free Software Foundation, Inc.