From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 1 Oct 2017 21:15:22 +0000 (-0400)
Subject: * lisp/electric.el: Break recursive loading loop
X-Git-Tag: emacs-27.0.90~6271
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ee3024c70d2974b59ecdd04b75d18d7258262e70;p=emacs.git

* lisp/electric.el: Break recursive loading loop

(electric-pair-text-pairs): Declare instead of requiring elec-pair.
---

diff --git a/lisp/electric.el b/lisp/electric.el
index 599b584c146..5f4304462dd 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -39,8 +39,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'elec-pair))
-
 ;; This loop is the guts for non-standard modes which retain control
 ;; until some event occurs.  It is a `do-forever', the only way out is
 ;; to throw.  It assumes that you have set up the keymap, window, and
@@ -471,6 +469,8 @@ substitution is inhibited.  The functions are called after the
 after the inserted character.  The functions in this hook should
 not move point or change the current buffer.")
 
+(defvar electric-pair-text-pairs)
+
 (defun electric-quote-post-self-insert-function ()
   "Function that `electric-quote-mode' adds to `post-self-insert-hook'.
 This requotes when a quoting key is typed."