mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-12 05:39:55 +00:00
Merge branch 'master' of orgmode.org:org-mode
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
This commit is contained in:
commit
de015ad055
|
@ -334,7 +334,7 @@ a communication channel."
|
|||
(let ((first-object (car (org-element-contents paragraph))))
|
||||
;; If paragraph starts with a #, protect it.
|
||||
(if (and (stringp first-object) (string-match "\\`#" first-object))
|
||||
(replace-match "\\#" nil t first-object)
|
||||
(replace-regexp-in-string "\\`#" "\\#" contents nil t)
|
||||
contents)))
|
||||
|
||||
|
||||
|
|
|
@ -21078,7 +21078,7 @@ a footnote definition, try to fill the first paragraph within."
|
|||
;; in current paragraph nor text before message
|
||||
;; body.
|
||||
((derived-mode-p 'message-mode)
|
||||
(let ((body-start (message-goto-body)))
|
||||
(let ((body-start (save-excursion (message-goto-body))))
|
||||
(when body-start (setq beg (max body-start beg))))
|
||||
(when (save-excursion
|
||||
(re-search-forward
|
||||
|
|
Loading…
Reference in a new issue