diff options
author | Glenn Morris <rgm@gnu.org> | 2017-12-22 13:23:16 -0500 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2017-12-22 13:23:16 -0500 |
commit | 3404a87f29b28b449a2e6188f075df2f761caac5 (patch) | |
tree | 56816f744b5c74273803811d62c9b61ba2334aa3 /lisp/mail/footnote.el | |
parent | 5ee4f2fa8792ebaa84184f1a82219fbcd93e8103 (diff) | |
parent | 34fcfc5c049bb99d68945bb24fb9d6a0789a33dd (diff) | |
download | emacs-3404a87f29b28b449a2e6188f075df2f761caac5.tar.gz |
Merge from origin/emacs-26
34fcfc5 (origin/emacs-26, emacs-26) * lisp/emacs-lisp/inline.el (defi...
f7a62c2 Fix doc string of 'footnote-style-alist'
c3b6742 Improve documentation of selecting windows
861d110 Improve documentation of records
22b3075 * etc/NEWS: Mention the removal of pinentry.el. (Bug#27445)
689526b Fix interactive spec of 'semantic-ia-show-variants'
90ca37f Fix documentation of 'mouse-drag-and-drop-region' and friends
d60faf3 Improve detection of speller version in ispell.el
a0e3b06 Document 'mouse-drag-and-drop-region' options and mention the...
164e84c Fix uses of 'nil' and 'non-nil' in manuals and a few more min...
798f07f Document that mode commands should be idempotent.
ad2a47c ; * src/xdisp.c (extend_face_to_end_of_line): Fix last change.
88ddf53 Fontify a CPP construct correctly when a comment follows with...
de7de9c Prevent infloop in redisplay on TTY frames
293720e Fix loss of documentation face in certain CC Mode doc comment...
# Conflicts:
# etc/NEWS
# lisp/mail/footnote.el
Diffstat (limited to 'lisp/mail/footnote.el')
-rw-r--r-- | lisp/mail/footnote.el | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el index d82f7410207..0c39f62f3ee 100644 --- a/lisp/mail/footnote.el +++ b/lisp/mail/footnote.el @@ -366,9 +366,7 @@ Proceeds from `י' to `כ', from `צ' to `ק'. After `ת', rolls over to `א'." "Styles of footnote tags available. By default, Arabic numbers, English letters, Roman Numerals, Latin and Unicode superscript characters, and Hebrew numerals -are available. -See footnote-han.el, footnote-greek.el and footnote-hebrew.el for more -exciting styles.") +are available.") (defcustom footnote-style 'numeric "Default style used for footnoting. |