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 /lisp | |
| parent | 14649c889083ba9cc685846e508864830bdc0c9f (diff) | |
| parent | 604f6568312aef8287d7a3ac1dbeb71577089bec (diff) | |
| download | emacs-5feeead12693cd97c6d77b14ef05d29ba5cf18bb.tar.gz | |
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 'lisp')
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 2 | ||||
| -rw-r--r-- | lisp/mail/footnote.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 4f3af2a7d7f..a277d7a6680 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 57c3be00560..a90f370d736 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}" |