mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 21:07:54 +00:00
Code Releases Activity

Merge branch 'bugfix'

Browse source
This commit is contained in:
TEC 2021-09-26 19:00:59 +08:00
parent 5e58af5ddd 6a558fc17b
commit df51e934ae
Signed by: tec
GPG key ID: 779591AFDB81F06C
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lisp/org.el
View file

@ -5335,7 +5335,8 @@ by a #."
(org-remove-flyspell-overlays-in nl-before-endline end-of-endline) (org-remove-flyspell-overlays-in nl-before-endline end-of-endline)
(cond (cond
((and lang (not (string= lang "")) org-src-fontify-natively) ((and lang (not (string= lang "")) org-src-fontify-natively)
(org-src-font-lock-fontify-block lang block-start block-end) (save-match-data
(org-src-font-lock-fontify-block lang block-start block-end))
(add-text-properties bol-after-beginline block-end '(src-block t))) (add-text-properties bol-after-beginline block-end '(src-block t)))
(quoting (quoting
(add-text-properties (add-text-properties
@ -19507,7 +19508,9 @@ a footnote definition, try to fill the first paragraph within."
;; the buffer. In that case, ignore filling. ;; the buffer. In that case, ignore filling.
(cl-case (org-element-type element) (cl-case (org-element-type element)
;; Use major mode filling function is source blocks. ;; Use major mode filling function is source blocks.
(src-block (org-babel-do-key-sequence-in-edit-buffer (kbd "M-q"))) (src-block (org-babel-do-in-edit-buffer
(mark-whole-buffer)
(funcall-interactively #'fill-paragraph justify 'region)))
;; Align Org tables, leave table.el tables as-is. ;; Align Org tables, leave table.el tables as-is.
(table-row (org-table-align) t) (table-row (org-table-align) t)
(table (table
@ -19642,7 +19645,9 @@ filling the current element."
;; previously unmodified), then flip the modification status back ;; previously unmodified), then flip the modification status back
;; to "unchanged". ;; to "unchanged".
(when (and hash (equal hash (org-buffer-hash))) (when (and hash (equal hash (org-buffer-hash)))
(set-buffer-modified-p nil)))) (set-buffer-modified-p nil))
;; Return non-nil.
t))
(defun org-auto-fill-function () (defun org-auto-fill-function ()
"Auto-fill function." "Auto-fill function."