[elpa] externals/org dc29c7d81f: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit dc29c7d81f88ef62c93e7fd0678f4f9301f82508
Merge: ecb62e2e31 cd967ce006
Author: Ihor Radchenko <yantar92@posteo.net>
Commit: Ihor Radchenko <yantar92@posteo.net>

    Merge branch 'bugfix'
---
 lisp/ox-odt.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index 1c233a266a..949c8f9b5b 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -2935,7 +2935,7 @@ contextual information."
                       (trailing (and (string-match (rx (1+ blank) eos) output)
                                      (match-string 0 output))))
                   ;; Unfill, retaining leading/trailing space.
-                  (let ((fill-column (point-max)))
+                  (let ((fill-column most-positive-fixnum))
                     (fill-region (point-min) (point-max)))
                   (concat leading (buffer-string) trailing))))))
     ;; Return value.