mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 22:37:47 +00:00
Merge branch 'maint'
This commit is contained in:
commit
344ed4c278
|
@ -2598,7 +2598,7 @@ from the dynamic block definition."
|
|||
(when multifile
|
||||
;; Summarize the time collected from this file.
|
||||
(insert-before-markers
|
||||
(format (concat "| %s %s | %s%s"
|
||||
(format (concat "| %s %s | %s%s%s"
|
||||
(format org-clock-file-time-cell-format
|
||||
(org-clock--translate "File time" lang))
|
||||
" | *%s*|\n")
|
||||
|
|
|
@ -6052,8 +6052,11 @@ by a #."
|
|||
Also refresh fontification if needed."
|
||||
(interactive)
|
||||
(let ((old-regexp org-target-link-regexp)
|
||||
(before-re "\\(?:^\\|[^[:alnum:]]\\)\\(")
|
||||
(after-re "\\)\\(?:$\\|[^[:alnum:]]\\)")
|
||||
;; Some languages, e.g., Chinese, do not use spaces to
|
||||
;; separate words. Also allow to surround radio targets with
|
||||
;; line-breakable characters.
|
||||
(before-re "\\(?:^\\|[^[:alnum:]]\\|\\c|\\)\\(")
|
||||
(after-re "\\)\\(?:$\\|[^[:alnum:]]\\|\\c|\\)")
|
||||
(targets
|
||||
(org-with-wide-buffer
|
||||
(goto-char (point-min))
|
||||
|
|
Loading…
Reference in a new issue