mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-20 22:48:38 +00:00
org.el (org-read-date-display): Fix bug when displaying the overlay.
* org.el (org-read-date-display): Fix bug when displaying the overlay. TINYCHANGE
This commit is contained in:
parent
ec56dc8ead
commit
963f5968d3
58
lisp/org.el
58
lisp/org.el
|
@ -15131,35 +15131,35 @@ user."
|
|||
(when org-read-date-display-live
|
||||
(when org-read-date-overlay
|
||||
(delete-overlay org-read-date-overlay))
|
||||
(let ((p (point)))
|
||||
(end-of-line 1)
|
||||
(while (not (equal (buffer-substring
|
||||
(max (point-min) (- (point) 4)) (point))
|
||||
" "))
|
||||
(insert " "))
|
||||
(goto-char p))
|
||||
(let* ((ans (concat (buffer-substring (point-at-bol) (point-max))
|
||||
" " (or org-ans1 org-ans2)))
|
||||
(org-end-time-was-given nil)
|
||||
(f (org-read-date-analyze ans org-def org-defdecode))
|
||||
(fmts (if org-dcst
|
||||
org-time-stamp-custom-formats
|
||||
org-time-stamp-formats))
|
||||
(fmt (if (or org-with-time
|
||||
(and (boundp 'org-time-was-given) org-time-was-given))
|
||||
(cdr fmts)
|
||||
(car fmts)))
|
||||
(txt (concat "=> " (format-time-string fmt (apply 'encode-time f)))))
|
||||
(when (and org-end-time-was-given
|
||||
(string-match org-plain-time-of-day-regexp txt))
|
||||
(setq txt (concat (substring txt 0 (match-end 0)) "-"
|
||||
org-end-time-was-given
|
||||
(substring txt (match-end 0)))))
|
||||
(when org-read-date-analyze-futurep
|
||||
(setq txt (concat txt " (=>F)")))
|
||||
(setq org-read-date-overlay
|
||||
(make-overlay (1- (point-at-eol)) (point-at-eol)))
|
||||
(org-overlay-display org-read-date-overlay txt 'secondary-selection))))
|
||||
(when (minibufferp (current-buffer))
|
||||
(save-excursion
|
||||
(end-of-line 1)
|
||||
(while (not (equal (buffer-substring
|
||||
(max (point-min) (- (point) 4)) (point))
|
||||
" "))
|
||||
(insert " ")))
|
||||
(let* ((ans (concat (buffer-substring (point-at-bol) (point-max))
|
||||
" " (or org-ans1 org-ans2)))
|
||||
(org-end-time-was-given nil)
|
||||
(f (org-read-date-analyze ans org-def org-defdecode))
|
||||
(fmts (if org-dcst
|
||||
org-time-stamp-custom-formats
|
||||
org-time-stamp-formats))
|
||||
(fmt (if (or org-with-time
|
||||
(and (boundp 'org-time-was-given) org-time-was-given))
|
||||
(cdr fmts)
|
||||
(car fmts)))
|
||||
(txt (concat "=> " (format-time-string fmt (apply 'encode-time f)))))
|
||||
(when (and org-end-time-was-given
|
||||
(string-match org-plain-time-of-day-regexp txt))
|
||||
(setq txt (concat (substring txt 0 (match-end 0)) "-"
|
||||
org-end-time-was-given
|
||||
(substring txt (match-end 0)))))
|
||||
(when org-read-date-analyze-futurep
|
||||
(setq txt (concat txt " (=>F)")))
|
||||
(setq org-read-date-overlay
|
||||
(make-overlay (1- (point-at-eol)) (point-at-eol)))
|
||||
(org-overlay-display org-read-date-overlay txt 'secondary-selection)))))
|
||||
|
||||
(defun org-read-date-analyze (ans org-def org-defdecode)
|
||||
"Analyze the combined answer of the date prompt."
|
||||
|
|
Loading…
Reference in a new issue