summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sexton <psexton@xnet.co.nz>2011-05-25 20:04:12 +1200
committerPaul Sexton <psexton@xnet.co.nz>2011-05-25 20:04:12 +1200
commitbd91803d0d1d88e94a059f28b5cccb7e969d0042 (patch)
tree898ca0372fa9e27342bc2bf6ef4f90995157f399
parent69ba863ca0668caa38133280dbf7e6f959b8618d (diff)
parent33bae13aeba921218b614a5a0c0b12bf7d911c4f (diff)
downloadorg-mode-bd91803d0d1d88e94a059f28b5cccb7e969d0042.tar.gz
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r--lisp/org-exp.el11
1 files changed, 11 insertions, 0 deletions
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index e188d49..5812c34 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -2446,6 +2446,15 @@ in the list) and remove property and value from the list in LISTVAR."
(defvar org-export-latex-listings-options) ;; defined in org-latex.el
(defvar org-export-latex-minted-options) ;; defined in org-latex.el
+(defun org-remove-formatting-on-newlines-in-region (beg end)
+ "Remove formatting on newline characters"
+ (interactive "r")
+ (save-excursion
+ (goto-char beg)
+ (while (progn (end-of-line) (< (point) end))
+ (put-text-property (point) (1+ (point)) 'face nil)
+ (forward-char 1))))
+
(defun org-export-format-source-code-or-example
(lang code &optional opts indent caption)
"Format CODE from language LANG and return it formatted for export.
@@ -2532,6 +2541,8 @@ INDENT was the original indentation of the block."
(funcall mode)
(fundamental-mode))
(font-lock-fontify-buffer)
+ ;; markup each line separately
+ (org-remove-formatting-on-newlines-in-region (point-min) (point-max))
(org-src-mode)
(set-buffer-modified-p nil)
(org-export-htmlize-region-for-paste