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 /lisp/mail | |
| 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 'lisp/mail')
| -rw-r--r-- | lisp/mail/footnote.el | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 793 | positive, and disable it otherwise. If called from Lisp, enable | 793 | positive, and disable it otherwise. If called from Lisp, enable |
| 794 | the mode if ARG is omitted or nil. | 794 | the mode if ARG is omitted or nil. |
| 795 | 795 | ||
| 796 | Footnode mode is a buffer-local minor mode. If enabled, it | 796 | Footnote mode is a buffer-local minor mode. If enabled, it |
| 797 | provides footnote support for `message-mode'. To get started, | 797 | provides footnote support for `message-mode'. To get started, |
| 798 | play around with the following keys: | 798 | play around with the following keys: |
| 799 | \\{footnote-minor-mode-map}" | 799 | \\{footnote-minor-mode-map}" |