diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-07 09:34:27 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-07 09:34:27 -0700 |
| commit | 5feeead12693cd97c6d77b14ef05d29ba5cf18bb (patch) | |
| tree | 94d4e8ab4586c3a247a95cf43d2eec482dfc0b04 | |
| parent | 14649c889083ba9cc685846e508864830bdc0c9f (diff) | |
| parent | 604f6568312aef8287d7a3ac1dbeb71577089bec (diff) | |
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...
| -rw-r--r-- | doc/misc/smtpmail.texi | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 2 | ||||
| -rw-r--r-- | lisp/mail/footnote.el | 2 | ||||
| -rw-r--r-- | test/lisp/emulation/viper-tests.el | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi index 2647331167..d9a68c4598 100644 --- a/doc/misc/smtpmail.texi +++ b/doc/misc/smtpmail.texi @@ -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 encrypted connection if the server supports it. Other possible values 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 the built-in support (in Emacs 24.1 and later), or the diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 4f3af2a7d7..a277d7a668 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -58,7 +58,7 @@ (setq i (1+ i))) (modify-syntax-entry ?\s " " table) ;; Non-break space acts as whitespace. - (modify-syntax-entry ?\x8a0 " " table) + (modify-syntax-entry ?\xa0 " " table) (modify-syntax-entry ?\t " " table) (modify-syntax-entry ?\f " " table) (modify-syntax-entry ?\n "> " table) diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el index 57c3be0056..a90f370d73 100644 --- a/lisp/mail/footnote.el +++ b/lisp/mail/footnote.el @@ -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 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, play around with the following keys: \\{footnote-minor-mode-map}" diff --git a/test/lisp/emulation/viper-tests.el b/test/lisp/emulation/viper-tests.el index e2c39b3c3d..074dd63753 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 rtn)) ;; Switch everything off and restore the buffer. (toggle-viper-mode) + (delete-file viper-custom-file-name) (switch-to-buffer before-buffer)))) (ert-deftest viper-test-go () |