Merge branch 'maint'
This commit is contained in:
commit
68df8bc4fd
|
@ -458,7 +458,7 @@ or subject for the event."
|
||||||
(mapconcat
|
(mapconcat
|
||||||
(lambda (line)
|
(lambda (line)
|
||||||
;; Limit each line to a maximum of 75 characters. If it is
|
;; 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)))
|
(let ((len (length line)))
|
||||||
(if (<= len 75) line
|
(if (<= len 75) line
|
||||||
(let ((folded-line (substring line 0 75))
|
(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.
|
;; line, real contents must be split at 74 chars.
|
||||||
(while (< (setq chunk-end (+ chunk-start 74)) len)
|
(while (< (setq chunk-end (+ chunk-start 74)) len)
|
||||||
(setq folded-line
|
(setq folded-line
|
||||||
(concat folded-line "\n "
|
(concat folded-line "\r\n "
|
||||||
(substring line chunk-start chunk-end))
|
(substring line chunk-start chunk-end))
|
||||||
chunk-start chunk-end))
|
chunk-start chunk-end))
|
||||||
(concat folded-line "\n " (substring line chunk-start))))))
|
(concat folded-line "\r\n " (substring line chunk-start))))))
|
||||||
(org-split-string s "\n") "\n")))
|
(org-split-string s "\n") "\r\n")))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue