From f97b734ffb2b70f3d94e46453a236b46e0704901 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Sun, 20 Jan 2019 20:34:33 +0000 Subject: Revert "Fix electric-pair-tests by disabling bug#33794's fix with a variable" This reverts commit be505726b68d407a44fdcd9c7ac1ef722398532d. --- test/lisp/electric-tests.el | 6 ------ 1 file changed, 6 deletions(-) (limited to 'test/lisp/electric-tests.el') diff --git a/test/lisp/electric-tests.el b/test/lisp/electric-tests.el index b55d889f0b5..5a4b20ed04e 100644 --- a/test/lisp/electric-tests.el +++ b/test/lisp/electric-tests.el @@ -47,14 +47,10 @@ (declare (indent defun) (debug t)) `(call-with-saved-electric-modes #'(lambda () ,@body))) -;; Defined in lisp/progmodes/cc-cmds.el -(defvar c--disable-fix-of-bug-33794 t) - (defun electric-pair-test-for (fixture where char expected-string expected-point mode bindings fixture-fn) (with-temp-buffer (funcall mode) - (setq-local c--disable-fix-of-bug-33794 t) (insert fixture) (save-electric-modes (let ((last-command-event char) @@ -825,7 +821,6 @@ baz\"\"" (electric-layout-local-mode 1) (electric-pair-local-mode 1) (electric-indent-local-mode 1) - (setq-local c--disable-fix-of-bug-33794 t) (setq-local electric-layout-rules '((?\{ . (after-stay after)))) (insert "int main () ") @@ -839,7 +834,6 @@ baz\"\"" (electric-layout-local-mode 1) (electric-pair-local-mode 1) (electric-indent-local-mode 1) - (setq-local c--disable-fix-of-bug-33794 t) (setq-local electric-layout-rules '((?\{ . (before after-stay after)))) (insert "int main () ") -- cgit v1.2.3