diff options
| author | Paul Eggert | 2016-06-07 09:34:27 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-06-07 09:34:27 -0700 |
| commit | 5feeead12693cd97c6d77b14ef05d29ba5cf18bb (patch) | |
| tree | 94d4e8ab4586c3a247a95cf43d2eec482dfc0b04 /test/lisp/emulation | |
| parent | 14649c889083ba9cc685846e508864830bdc0c9f (diff) | |
| parent | 604f6568312aef8287d7a3ac1dbeb71577089bec (diff) | |
| download | emacs-5feeead12693cd97c6d77b14ef05d29ba5cf18bb.tar.gz emacs-5feeead12693cd97c6d77b14ef05d29ba5cf18bb.zip | |
Merge from origin/emacs-25
604f656 * test/automated/viper-tests.el (viper-test-undo-kmacro): Del...
20eb531 * lisp/mail/footnote.el (footnote-mode): Fix doc typo.
a7a2244 * doc/misc/smtpmail.texi (Encryption): Fix 2012-12-22 typo.
07bd972 * lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): Fix...
Diffstat (limited to 'test/lisp/emulation')
| -rw-r--r-- | test/lisp/emulation/viper-tests.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/lisp/emulation/viper-tests.el b/test/lisp/emulation/viper-tests.el index e2c39b3c3de..074dd637538 100644 --- a/test/lisp/emulation/viper-tests.el +++ b/test/lisp/emulation/viper-tests.el | |||
| @@ -65,6 +65,7 @@ after itself, although it will leave a buffer called | |||
| 65 | rtn)) | 65 | rtn)) |
| 66 | ;; Switch everything off and restore the buffer. | 66 | ;; Switch everything off and restore the buffer. |
| 67 | (toggle-viper-mode) | 67 | (toggle-viper-mode) |
| 68 | (delete-file viper-custom-file-name) | ||
| 68 | (switch-to-buffer before-buffer)))) | 69 | (switch-to-buffer before-buffer)))) |
| 69 | 70 | ||
| 70 | (ert-deftest viper-test-go () | 71 | (ert-deftest viper-test-go () |