aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2017-10-01 17:15:22 -0400
committerStefan Monnier2017-10-01 17:15:22 -0400
commitee3024c70d2974b59ecdd04b75d18d7258262e70 (patch)
tree5aec6629b95df856f327ef171085b542e52d3f7c
parent66d37175ecac41dfb2f854dbb148dcc7ca87b345 (diff)
downloademacs-ee3024c70d2974b59ecdd04b75d18d7258262e70.tar.gz
emacs-ee3024c70d2974b59ecdd04b75d18d7258262e70.zip
* lisp/electric.el: Break recursive loading loop
(electric-pair-text-pairs): Declare instead of requiring elec-pair.
-rw-r--r--lisp/electric.el4
1 files changed, 2 insertions, 2 deletions
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 @@
39 39
40;;; Code: 40;;; Code:
41 41
42(eval-when-compile (require 'elec-pair))
43
44;; This loop is the guts for non-standard modes which retain control 42;; This loop is the guts for non-standard modes which retain control
45;; until some event occurs. It is a `do-forever', the only way out is 43;; until some event occurs. It is a `do-forever', the only way out is
46;; to throw. It assumes that you have set up the keymap, window, and 44;; 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
471after the inserted character. The functions in this hook should 469after the inserted character. The functions in this hook should
472not move point or change the current buffer.") 470not move point or change the current buffer.")
473 471
472(defvar electric-pair-text-pairs)
473
474(defun electric-quote-post-self-insert-function () 474(defun electric-quote-post-self-insert-function ()
475 "Function that `electric-quote-mode' adds to `post-self-insert-hook'. 475 "Function that `electric-quote-mode' adds to `post-self-insert-hook'.
476This requotes when a quoting key is typed." 476This requotes when a quoting key is typed."