diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2019-02-28 14:39:54 +0100 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2019-02-28 14:39:54 +0100 |
| commit | 344ed4c278d6a1ef6a8dfaa95e3464729289f13a (patch) | |
| tree | 15544b9e76c82d5951b5d7b32ae80220942ba42f | |
| parent | c2c91f05898b88997e4cabad92c0bbad0e7ff760 (diff) | |
| parent | 69c211d154003773eb3aa45e7aaaf96de200cd1c (diff) | |
| download | org-mode-344ed4c278d6a1ef6a8dfaa95e3464729289f13a.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-clock.el | 2 | ||||
| -rw-r--r-- | lisp/org.el | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/org-clock.el b/lisp/org-clock.el index b20158d..ea80a35 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -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") diff --git a/lisp/org.el b/lisp/org.el index 9bd3249..9ca6f2d 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -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)) |