Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2016-11-18 23:04:15 +01:00
commit 68df8bc4fd
1 changed files with 4 additions and 4 deletions

View File

@ -458,7 +458,7 @@ or subject for the event."
(mapconcat
(lambda (line)
;; Limit each line to a maximum of 75 characters. If it is
;; longer, fold it by using "\n " as a continuation marker.
;; longer, fold it by using "\r\n " as a continuation marker.
(let ((len (length line)))
(if (<= len 75) line
(let ((folded-line (substring line 0 75))
@ -468,11 +468,11 @@ or subject for the event."
;; line, real contents must be split at 74 chars.
(while (< (setq chunk-end (+ chunk-start 74)) len)
(setq folded-line
(concat folded-line "\n "
(concat folded-line "\r\n "
(substring line chunk-start chunk-end))
chunk-start chunk-end))
(concat folded-line "\n " (substring line chunk-start))))))
(org-split-string s "\n") "\n")))
(concat folded-line "\r\n " (substring line chunk-start))))))
(org-split-string s "\n") "\r\n")))