aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAlan Mackenzie2019-01-20 20:34:33 +0000
committerAlan Mackenzie2019-01-22 14:30:30 +0000
commitf97b734ffb2b70f3d94e46453a236b46e0704901 (patch)
tree15ec915608d4917259bb7470db6455c5dbfeb8d4 /test
parent6038fdb2f9eac3225c0651fee18e1e75e63f2409 (diff)
downloademacs-f97b734ffb2b70f3d94e46453a236b46e0704901.tar.gz
emacs-f97b734ffb2b70f3d94e46453a236b46e0704901.zip
Revert "Fix electric-pair-tests by disabling bug#33794's fix with a variable"
This reverts commit be505726b68d407a44fdcd9c7ac1ef722398532d.
Diffstat (limited to 'test')
-rw-r--r--test/lisp/electric-tests.el6
1 files changed, 0 insertions, 6 deletions
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 @@
47 (declare (indent defun) (debug t)) 47 (declare (indent defun) (debug t))
48 `(call-with-saved-electric-modes #'(lambda () ,@body))) 48 `(call-with-saved-electric-modes #'(lambda () ,@body)))
49 49
50;; Defined in lisp/progmodes/cc-cmds.el
51(defvar c--disable-fix-of-bug-33794 t)
52
53(defun electric-pair-test-for (fixture where char expected-string 50(defun electric-pair-test-for (fixture where char expected-string
54 expected-point mode bindings fixture-fn) 51 expected-point mode bindings fixture-fn)
55 (with-temp-buffer 52 (with-temp-buffer
56 (funcall mode) 53 (funcall mode)
57 (setq-local c--disable-fix-of-bug-33794 t)
58 (insert fixture) 54 (insert fixture)
59 (save-electric-modes 55 (save-electric-modes
60 (let ((last-command-event char) 56 (let ((last-command-event char)
@@ -825,7 +821,6 @@ baz\"\""
825 (electric-layout-local-mode 1) 821 (electric-layout-local-mode 1)
826 (electric-pair-local-mode 1) 822 (electric-pair-local-mode 1)
827 (electric-indent-local-mode 1) 823 (electric-indent-local-mode 1)
828 (setq-local c--disable-fix-of-bug-33794 t)
829 (setq-local electric-layout-rules 824 (setq-local electric-layout-rules
830 '((?\{ . (after-stay after)))) 825 '((?\{ . (after-stay after))))
831 (insert "int main () ") 826 (insert "int main () ")
@@ -839,7 +834,6 @@ baz\"\""
839 (electric-layout-local-mode 1) 834 (electric-layout-local-mode 1)
840 (electric-pair-local-mode 1) 835 (electric-pair-local-mode 1)
841 (electric-indent-local-mode 1) 836 (electric-indent-local-mode 1)
842 (setq-local c--disable-fix-of-bug-33794 t)
843 (setq-local electric-layout-rules 837 (setq-local electric-layout-rules
844 '((?\{ . (before after-stay after)))) 838 '((?\{ . (before after-stay after))))
845 (insert "int main () ") 839 (insert "int main () ")