mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-25 05:02:52 +00:00
Merge branch 'maint'
This commit is contained in:
commit
0276cf0975
|
@ -159,12 +159,15 @@ the clock can be resumed from that point."
|
||||||
The clock is resumed when Emacs restarts.
|
The clock is resumed when Emacs restarts.
|
||||||
When this is t, both the running clock, and the entire clock
|
When this is t, both the running clock, and the entire clock
|
||||||
history are saved. When this is the symbol `clock', only the
|
history are saved. When this is the symbol `clock', only the
|
||||||
running clock is saved.
|
running clock is saved. When this is the symbol `history', only
|
||||||
|
the clock history is saved.
|
||||||
|
|
||||||
When Emacs restarts with saved clock information, the file containing the
|
When Emacs restarts with saved clock information, the file containing
|
||||||
running clock as well as all files mentioned in the clock history will
|
the running clock as well as all files mentioned in the clock history
|
||||||
be visited.
|
will be visited.
|
||||||
All this depends on running `org-clock-persistence-insinuate' in .emacs"
|
|
||||||
|
All this depends on running `org-clock-persistence-insinuate' in your
|
||||||
|
Emacs initialization file."
|
||||||
:group 'org-clock
|
:group 'org-clock
|
||||||
:type '(choice
|
:type '(choice
|
||||||
(const :tag "Just the running clock" clock)
|
(const :tag "Just the running clock" clock)
|
||||||
|
|
|
@ -3050,7 +3050,7 @@ to the value of `temporary-file-directory'."
|
||||||
(eval ;; convert to fmt -- mimicking `org-run-like-in-org-mode'
|
(eval ;; convert to fmt -- mimicking `org-run-like-in-org-mode'
|
||||||
(list 'let org-local-vars
|
(list 'let org-local-vars
|
||||||
(list (intern (format "org-export-as-%s" fmt))
|
(list (intern (format "org-export-as-%s" fmt))
|
||||||
nil nil nil ''string t))))
|
nil nil nil ''string t dir))))
|
||||||
(delete-file tmp-file))))
|
(delete-file tmp-file))))
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
|
|
13
lisp/org.el
13
lisp/org.el
|
@ -6396,11 +6396,7 @@ in special contexts.
|
||||||
(setq has-children (org-list-has-child-p (point) struct)))
|
(setq has-children (org-list-has-child-p (point) struct)))
|
||||||
(org-back-to-heading)
|
(org-back-to-heading)
|
||||||
(setq eoh (save-excursion (outline-end-of-heading) (point)))
|
(setq eoh (save-excursion (outline-end-of-heading) (point)))
|
||||||
(setq eos (save-excursion
|
(setq eos (save-excursion (1- (org-end-of-subtree t t))))
|
||||||
(org-end-of-subtree t)
|
|
||||||
(unless (eobp)
|
|
||||||
(skip-chars-forward " \t\n"))
|
|
||||||
(if (eobp) (point) (1- (point)))))
|
|
||||||
(setq has-children
|
(setq has-children
|
||||||
(or (save-excursion
|
(or (save-excursion
|
||||||
(let ((level (funcall outline-level)))
|
(let ((level (funcall outline-level)))
|
||||||
|
@ -9476,10 +9472,11 @@ Use TAB to complete link prefixes, then RET for type-specific completion support
|
||||||
;; URL-like link, normalize the use of angular brackets.
|
;; URL-like link, normalize the use of angular brackets.
|
||||||
(setq link (org-remove-angle-brackets link)))
|
(setq link (org-remove-angle-brackets link)))
|
||||||
|
|
||||||
;; Check if we are linking to the current file with a search option
|
;; Check if we are linking to the current file with a search
|
||||||
;; If yes, simplify the link by using only the search option.
|
;; option If yes, simplify the link by using only the search
|
||||||
|
;; option.
|
||||||
(when (and buffer-file-name
|
(when (and buffer-file-name
|
||||||
(string-match "^file:\\(.+?\\)::\\([^>]+\\)" link))
|
(string-match "^file:\\(.+?\\)::\\(.+\\)" link))
|
||||||
(let* ((path (match-string 1 link))
|
(let* ((path (match-string 1 link))
|
||||||
(case-fold-search nil)
|
(case-fold-search nil)
|
||||||
(search (match-string 2 link)))
|
(search (match-string 2 link)))
|
||||||
|
|
Loading…
Reference in a new issue