diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-06-26 10:24:59 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-06-26 10:24:59 -0400 |
| commit | 0b4e003766f15225dede9bdba4ead33e493856e2 (patch) | |
| tree | 99de57fe8feeca540f398acb232b75e9c802418c /test | |
| parent | 699fce296b13d7db386b1cb5cecf2710e5196691 (diff) | |
| download | emacs-0b4e003766f15225dede9bdba4ead33e493856e2.tar.gz | |
Revert "* lisp/calc/calc-ext.el (math-scalarp): Fix typo"
This reverts commit 698ff554ac2699ec48fefc85a1307cbc4a183b0d.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/electric-tests.el | 9 | ||||
| -rw-r--r-- | test/lisp/minibuffer-tests.el | 2 | ||||
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/test/lisp/electric-tests.el b/test/lisp/electric-tests.el index 0b67fb3f1f1..4f1e5729be1 100644 --- a/test/lisp/electric-tests.el +++ b/test/lisp/electric-tests.el @@ -876,6 +876,15 @@ baz\"\"" (call-interactively (key-binding `[,last-command-event]))) (should (equal (buffer-string) "int main () {\n \n}")))) +(define-derived-mode plainer-c-mode c-mode "pC" + "A plainer/saner C-mode with no internal electric machinery." + (c-toggle-electric-state -1) + (setq-local electric-indent-local-mode-hook nil) + (setq-local electric-indent-mode-hook nil) + (electric-indent-local-mode 1) + (dolist (key '(?\" ?\' ?\{ ?\} ?\( ?\) ?\[ ?\])) + (local-set-key (vector key) 'self-insert-command))) + (ert-deftest electric-modes-int-main-allman-style () (ert-with-test-buffer () (plainer-c-mode) diff --git a/test/lisp/minibuffer-tests.el b/test/lisp/minibuffer-tests.el index 428b19226b4..35df7cc17f1 100644 --- a/test/lisp/minibuffer-tests.el +++ b/test/lisp/minibuffer-tests.el @@ -74,7 +74,7 @@ 'completion-table-with-predicate full-collection no-A nil)))))) -(ert-deftest completion-table-subvert-test () ;bug#34888 +(ert-deftest completion-table-subvert-test () (let* ((origtable '("A-hello" "A-there")) (subvtable (completion-table-subvert origtable "B" "A"))) (should (equal (try-completion "B-hel" subvtable) diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index c8fe00dd393..525f62a3c0b 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'." :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p))) - (defvar tramp-display-escape-sequence-regexp) ;Defined in tramp-sh.el + (dolist (quoted (if (tramp--test-expensive-test) '(nil t) '(nil))) (let* ((tmp-name (tramp--test-make-temp-name nil quoted)) (fnnd (file-name-nondirectory tmp-name)) |