diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e79791a78..975337180 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2010-02-02 Carsten Dominik + * org-exp.el (org-export-concatenate-multiline-links): The for + protectedness at beginning of match. + * org-latex.el (org-export-latex-fix-inputenc): Never leave the AUTO as a coding system, instead default to utf8. diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 3b56c3e02..cba502bed 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -2035,7 +2035,7 @@ This is to make sure that the line-processing export backends can work correctly." (goto-char (point-min)) (while (re-search-forward "\\(\\(\\[\\|\\]\\)\\[[^]]*?\\)[ \t]*\n[ \t]*\\([^]]*\\]\\(\\[\\|\\]\\)\\)" nil t) - (org-if-unprotected + (org-if-unprotected-at (match-beginning 1) (replace-match "\\1 \\3") (goto-char (match-beginning 0)))))