summaryrefslogtreecommitdiff
path: root/lisp/mail/feedmail.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2020-02-13 07:50:24 -0800
committerGlenn Morris <rgm@gnu.org>2020-02-13 07:50:24 -0800
commit56ce263f506fede328888a321a12b1f85f46d0d5 (patch)
tree1d881d6ca6c46b62cffaa93e25ff4b88f3bcc2c7 /lisp/mail/feedmail.el
parent5b160b39c43b7e3d4e377832c306e2e48b53e7e1 (diff)
parentad5e350ab764f3a420d29f24ab3222f671b2e8c0 (diff)
downloademacs-56ce263f506fede328888a321a12b1f85f46d0d5.tar.gz
Merge from origin/emacs-27
ad5e350ab7 c-end-of-macro: Handle block coment lines with unescaped N... 06c302d425 Fix set-fontset-font with ADD arg non-nil 530067463b Correct "different than" to "different from" where appropr... 56b8768b32 More accurate documentation of 'package-menu-hide-package'
Diffstat (limited to 'lisp/mail/feedmail.el')
-rw-r--r--lisp/mail/feedmail.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 7b7cefa4055..0d7193c1be0 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -1552,7 +1552,7 @@ in a buffer, try /bin/rmail instead of /bin/mail. If /bin/rmail
exists, this can be accomplished by keeping the default nil setting of
`mail-interactive'. You might also like to consult local mail experts
for any other interesting command line possibilities. Some versions
-of UNIX have an rmail program which behaves differently than
+of UNIX have an rmail program which behaves differently from
/bin/rmail and complains if feedmail gives it a message on stdin. If
you don't know about such things and if there is no local expert to
consult, stick with /bin/mail or use one of the other buffer eating