Commit 5feeead1 authored by Paul Eggert's avatar Paul Eggert
Browse files

Merge from origin/emacs-25

604f6568 * test/automated/viper-tests.el (viper-test-undo-kmacro): Del...
20eb5318 * lisp/mail/footnote.el (footnote-mode): Fix doc typo.
a7a22442 * doc/misc/smtpmail.texi (Encryption): Fix 2012-12-22 typo.
07bd9721 * lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): Fix...
parents 14649c88 604f6568
...@@ -285,7 +285,7 @@ connection the SMTP library uses. The default value is @code{nil}, ...@@ -285,7 +285,7 @@ connection the SMTP library uses. The default value is @code{nil},
which means to use a plain connection, but try to switch to a STARTTLS which means to use a plain connection, but try to switch to a STARTTLS
encrypted connection if the server supports it. Other possible values encrypted connection if the server supports it. Other possible values
are: @code{starttls} to insist on STARTTLS; @code{ssl} to use TLS/SSL; are: @code{starttls} to insist on STARTTLS; @code{ssl} to use TLS/SSL;
and @code{plain} for encryption. and @code{plain} for no encryption.
Use of any form of TLS/SSL requires support in Emacs. You can either Use of any form of TLS/SSL requires support in Emacs. You can either
use the built-in support (in Emacs 24.1 and later), or the use the built-in support (in Emacs 24.1 and later), or the
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
(setq i (1+ i))) (setq i (1+ i)))
(modify-syntax-entry ?\s " " table) (modify-syntax-entry ?\s " " table)
;; Non-break space acts as whitespace. ;; Non-break space acts as whitespace.
(modify-syntax-entry ?\x8a0 " " table) (modify-syntax-entry ?\xa0 " " table)
(modify-syntax-entry ?\t " " table) (modify-syntax-entry ?\t " " table)
(modify-syntax-entry ?\f " " table) (modify-syntax-entry ?\f " " table)
(modify-syntax-entry ?\n "> " table) (modify-syntax-entry ?\n "> " table)
......
...@@ -793,7 +793,7 @@ With a prefix argument ARG, enable Footnote mode if ARG is ...@@ -793,7 +793,7 @@ With a prefix argument ARG, enable Footnote mode if ARG is
positive, and disable it otherwise. If called from Lisp, enable positive, and disable it otherwise. If called from Lisp, enable
the mode if ARG is omitted or nil. the mode if ARG is omitted or nil.
Footnode mode is a buffer-local minor mode. If enabled, it Footnote mode is a buffer-local minor mode. If enabled, it
provides footnote support for `message-mode'. To get started, provides footnote support for `message-mode'. To get started,
play around with the following keys: play around with the following keys:
\\{footnote-minor-mode-map}" \\{footnote-minor-mode-map}"
......
...@@ -65,6 +65,7 @@ after itself, although it will leave a buffer called ...@@ -65,6 +65,7 @@ after itself, although it will leave a buffer called
rtn)) rtn))
;; Switch everything off and restore the buffer. ;; Switch everything off and restore the buffer.
(toggle-viper-mode) (toggle-viper-mode)
(delete-file viper-custom-file-name)
(switch-to-buffer before-buffer)))) (switch-to-buffer before-buffer))))
(ert-deftest viper-test-go () (ert-deftest viper-test-go ()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment