aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorStefan Monnier2019-06-26 10:03:48 -0400
committerStefan Monnier2019-06-26 10:03:48 -0400
commit698ff554ac2699ec48fefc85a1307cbc4a183b0d (patch)
treea7b7592f7973f81cad4410366d313e790616907e /test
parent9233865b7005831e63755eb84ae7da060f878a55 (diff)
downloademacs-698ff554ac2699ec48fefc85a1307cbc4a183b0d.tar.gz
emacs-698ff554ac2699ec48fefc85a1307cbc4a183b0d.zip
* lisp/calc/calc-ext.el (math-scalarp): Fix typo
Diffstat (limited to 'test')
-rw-r--r--test/lisp/electric-tests.el9
-rw-r--r--test/lisp/minibuffer-tests.el2
-rw-r--r--test/lisp/net/tramp-tests.el2
3 files changed, 2 insertions, 11 deletions
diff --git a/test/lisp/electric-tests.el b/test/lisp/electric-tests.el
index 4f1e5729be1..0b67fb3f1f1 100644
--- a/test/lisp/electric-tests.el
+++ b/test/lisp/electric-tests.el
@@ -876,15 +876,6 @@ baz\"\""
876 (call-interactively (key-binding `[,last-command-event]))) 876 (call-interactively (key-binding `[,last-command-event])))
877 (should (equal (buffer-string) "int main () {\n \n}")))) 877 (should (equal (buffer-string) "int main () {\n \n}"))))
878 878
879(define-derived-mode plainer-c-mode c-mode "pC"
880 "A plainer/saner C-mode with no internal electric machinery."
881 (c-toggle-electric-state -1)
882 (setq-local electric-indent-local-mode-hook nil)
883 (setq-local electric-indent-mode-hook nil)
884 (electric-indent-local-mode 1)
885 (dolist (key '(?\" ?\' ?\{ ?\} ?\( ?\) ?\[ ?\]))
886 (local-set-key (vector key) 'self-insert-command)))
887
888(ert-deftest electric-modes-int-main-allman-style () 879(ert-deftest electric-modes-int-main-allman-style ()
889 (ert-with-test-buffer () 880 (ert-with-test-buffer ()
890 (plainer-c-mode) 881 (plainer-c-mode)
diff --git a/test/lisp/minibuffer-tests.el b/test/lisp/minibuffer-tests.el
index 35df7cc17f1..428b19226b4 100644
--- a/test/lisp/minibuffer-tests.el
+++ b/test/lisp/minibuffer-tests.el
@@ -74,7 +74,7 @@
74 'completion-table-with-predicate 74 'completion-table-with-predicate
75 full-collection no-A nil)))))) 75 full-collection no-A nil))))))
76 76
77(ert-deftest completion-table-subvert-test () 77(ert-deftest completion-table-subvert-test () ;bug#34888
78 (let* ((origtable '("A-hello" "A-there")) 78 (let* ((origtable '("A-hello" "A-there"))
79 (subvtable (completion-table-subvert origtable "B" "A"))) 79 (subvtable (completion-table-subvert origtable "B" "A")))
80 (should (equal (try-completion "B-hel" subvtable) 80 (should (equal (try-completion "B-hel" subvtable)
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 525f62a3c0b..c8fe00dd393 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -3885,7 +3885,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
3885 :tags '(:expensive-test) 3885 :tags '(:expensive-test)
3886 (skip-unless (tramp--test-enabled)) 3886 (skip-unless (tramp--test-enabled))
3887 (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p))) 3887 (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p)))
3888 3888 (defvar tramp-display-escape-sequence-regexp) ;Defined in tramp-sh.el
3889 (dolist (quoted (if (tramp--test-expensive-test) '(nil t) '(nil))) 3889 (dolist (quoted (if (tramp--test-expensive-test) '(nil t) '(nil)))
3890 (let* ((tmp-name (tramp--test-make-temp-name nil quoted)) 3890 (let* ((tmp-name (tramp--test-make-temp-name nil quoted))
3891 (fnnd (file-name-nondirectory tmp-name)) 3891 (fnnd (file-name-nondirectory tmp-name))