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

[ELPA Syncer]

branch: externals/org
commit c59d6d82e6146a076b14ae2b394eb8e5ea8a34c2
Merge: 0ccf1da3dd 97a780f0be
Author: Ihor Radchenko <yantar92@posteo.net>
Commit: Ihor Radchenko <yantar92@posteo.net>

    Merge branch 'bugfix'
---
 lisp/org-table.el | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lisp/org-table.el b/lisp/org-table.el
index 8e0e8e6cf8..70ebde205f 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -4448,6 +4448,13 @@ FIELD is a string.  WIDTH is a number.  ALIGN is either 
\"c\",
 (defun org-table-justify-field-maybe (&optional new)
   "Justify the current field, text to left, number to right.
 Optional argument NEW may specify text to replace the current field content."
+  ;; FIXME: Prevent newlines inside field.  They are currently not
+  ;; supported.
+  (when (and (stringp new) (string-match-p "\n" new))
+    (message "Removing newlines from formula result: %S" new)
+    (setq new (replace-regexp-in-string
+               "\n" " "
+               (replace-regexp-in-string "\\(^\n+\\)\\|\\(\n+$\\)" "" new))))
   (cond
    ((and (not new) org-table-may-need-update)) ; Realignment will happen anyway
    ((org-at-table-hline-p))