Bugfix about using the calendar on a separate frame.
`org-read-date' was loosing the focus when the calendar was displayed on a separate frame. This patch by Robert Goldman solves it by introducing a new macro `org-save-frame-excursion' which preserve the frame focus. See this thread: http://article.gmane.org/gmane.emacs.orgmode/15528 (This fixes the issue I was trying to fix in a previous commit.)
This commit is contained in:
Bastien Guerry
parent
4df0d4cc34
commit
898049066a
158
lisp/org.el
158
lisp/org.el
|
|
@ -12031,6 +12031,14 @@ So these are more for recording a certain time/date."
|
||||||
(defvar org-read-date-history nil)
|
(defvar org-read-date-history nil)
|
||||||
(defvar org-read-date-final-answer nil)
|
(defvar org-read-date-final-answer nil)
|
||||||
|
|
||||||
|
(defmacro org-save-frame-excursion (&rest body)
|
||||||
|
"Eval BODY and return to the currently selected frame."
|
||||||
|
(let ((frame-var (gensym "FRAME")))
|
||||||
|
`(let ((,frame-var (selected-frame)))
|
||||||
|
(unwind-protect
|
||||||
|
(progn ,@body)
|
||||||
|
(select-frame-set-input-focus ,frame-var)))))
|
||||||
|
|
||||||
(defun org-read-date (&optional with-time to-time from-string prompt
|
(defun org-read-date (&optional with-time to-time from-string prompt
|
||||||
default-time default-input)
|
default-time default-input)
|
||||||
"Read a date, possibly a time, and make things smooth for the user.
|
"Read a date, possibly a time, and make things smooth for the user.
|
||||||
|
|
@ -12109,78 +12117,79 @@ user."
|
||||||
(org-read-date-popup-calendar
|
(org-read-date-popup-calendar
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(save-window-excursion
|
(save-window-excursion
|
||||||
(calendar)
|
(org-save-frame-excursion
|
||||||
(calendar-forward-day (- (time-to-days def)
|
(calendar)
|
||||||
(calendar-absolute-from-gregorian
|
(calendar-forward-day (- (time-to-days def)
|
||||||
(calendar-current-date))))
|
(calendar-absolute-from-gregorian
|
||||||
(org-eval-in-calendar nil t)
|
(calendar-current-date))))
|
||||||
(let* ((old-map (current-local-map))
|
(org-eval-in-calendar nil t)
|
||||||
(map (copy-keymap calendar-mode-map))
|
(let* ((old-map (current-local-map))
|
||||||
(minibuffer-local-map (copy-keymap minibuffer-local-map)))
|
(map (copy-keymap calendar-mode-map))
|
||||||
(org-defkey map (kbd "RET") 'org-calendar-select)
|
(minibuffer-local-map (copy-keymap minibuffer-local-map)))
|
||||||
(org-defkey map (if (featurep 'xemacs) [button1] [mouse-1])
|
(org-defkey map (kbd "RET") 'org-calendar-select)
|
||||||
'org-calendar-select-mouse)
|
(org-defkey map (if (featurep 'xemacs) [button1] [mouse-1])
|
||||||
(org-defkey map (if (featurep 'xemacs) [button2] [mouse-2])
|
'org-calendar-select-mouse)
|
||||||
'org-calendar-select-mouse)
|
(org-defkey map (if (featurep 'xemacs) [button2] [mouse-2])
|
||||||
(org-defkey minibuffer-local-map [(meta shift left)]
|
'org-calendar-select-mouse)
|
||||||
(lambda () (interactive)
|
(org-defkey minibuffer-local-map [(meta shift left)]
|
||||||
(org-eval-in-calendar '(calendar-backward-month 1))))
|
(lambda () (interactive)
|
||||||
(org-defkey minibuffer-local-map [(meta shift right)]
|
(org-eval-in-calendar '(calendar-backward-month 1))))
|
||||||
(lambda () (interactive)
|
(org-defkey minibuffer-local-map [(meta shift right)]
|
||||||
(org-eval-in-calendar '(calendar-forward-month 1))))
|
(lambda () (interactive)
|
||||||
(org-defkey minibuffer-local-map [(meta shift up)]
|
(org-eval-in-calendar '(calendar-forward-month 1))))
|
||||||
(lambda () (interactive)
|
(org-defkey minibuffer-local-map [(meta shift up)]
|
||||||
(org-eval-in-calendar '(calendar-backward-year 1))))
|
(lambda () (interactive)
|
||||||
(org-defkey minibuffer-local-map [(meta shift down)]
|
(org-eval-in-calendar '(calendar-backward-year 1))))
|
||||||
(lambda () (interactive)
|
(org-defkey minibuffer-local-map [(meta shift down)]
|
||||||
(org-eval-in-calendar '(calendar-forward-year 1))))
|
(lambda () (interactive)
|
||||||
(org-defkey minibuffer-local-map [?\e (shift left)]
|
(org-eval-in-calendar '(calendar-forward-year 1))))
|
||||||
(lambda () (interactive)
|
(org-defkey minibuffer-local-map [?\e (shift left)]
|
||||||
(org-eval-in-calendar '(calendar-backward-month 1))))
|
(lambda () (interactive)
|
||||||
(org-defkey minibuffer-local-map [?\e (shift right)]
|
(org-eval-in-calendar '(calendar-backward-month 1))))
|
||||||
(lambda () (interactive)
|
(org-defkey minibuffer-local-map [?\e (shift right)]
|
||||||
(org-eval-in-calendar '(calendar-forward-month 1))))
|
(lambda () (interactive)
|
||||||
(org-defkey minibuffer-local-map [?\e (shift up)]
|
(org-eval-in-calendar '(calendar-forward-month 1))))
|
||||||
(lambda () (interactive)
|
(org-defkey minibuffer-local-map [?\e (shift up)]
|
||||||
(org-eval-in-calendar '(calendar-backward-year 1))))
|
(lambda () (interactive)
|
||||||
(org-defkey minibuffer-local-map [?\e (shift down)]
|
(org-eval-in-calendar '(calendar-backward-year 1))))
|
||||||
(lambda () (interactive)
|
(org-defkey minibuffer-local-map [?\e (shift down)]
|
||||||
(org-eval-in-calendar '(calendar-forward-year 1))))
|
(lambda () (interactive)
|
||||||
(org-defkey minibuffer-local-map [(shift up)]
|
(org-eval-in-calendar '(calendar-forward-year 1))))
|
||||||
(lambda () (interactive)
|
(org-defkey minibuffer-local-map [(shift up)]
|
||||||
(org-eval-in-calendar '(calendar-backward-week 1))))
|
(lambda () (interactive)
|
||||||
(org-defkey minibuffer-local-map [(shift down)]
|
(org-eval-in-calendar '(calendar-backward-week 1))))
|
||||||
(lambda () (interactive)
|
(org-defkey minibuffer-local-map [(shift down)]
|
||||||
(org-eval-in-calendar '(calendar-forward-week 1))))
|
(lambda () (interactive)
|
||||||
(org-defkey minibuffer-local-map [(shift left)]
|
(org-eval-in-calendar '(calendar-forward-week 1))))
|
||||||
(lambda () (interactive)
|
(org-defkey minibuffer-local-map [(shift left)]
|
||||||
(org-eval-in-calendar '(calendar-backward-day 1))))
|
(lambda () (interactive)
|
||||||
(org-defkey minibuffer-local-map [(shift right)]
|
(org-eval-in-calendar '(calendar-backward-day 1))))
|
||||||
(lambda () (interactive)
|
(org-defkey minibuffer-local-map [(shift right)]
|
||||||
(org-eval-in-calendar '(calendar-forward-day 1))))
|
(lambda () (interactive)
|
||||||
(org-defkey minibuffer-local-map ">"
|
(org-eval-in-calendar '(calendar-forward-day 1))))
|
||||||
(lambda () (interactive)
|
(org-defkey minibuffer-local-map ">"
|
||||||
(org-eval-in-calendar '(scroll-calendar-left 1))))
|
(lambda () (interactive)
|
||||||
(org-defkey minibuffer-local-map "<"
|
(org-eval-in-calendar '(scroll-calendar-left 1))))
|
||||||
(lambda () (interactive)
|
(org-defkey minibuffer-local-map "<"
|
||||||
(org-eval-in-calendar '(scroll-calendar-right 1))))
|
(lambda () (interactive)
|
||||||
(run-hooks 'org-read-date-minibuffer-setup-hook)
|
(org-eval-in-calendar '(scroll-calendar-right 1))))
|
||||||
(unwind-protect
|
(run-hooks 'org-read-date-minibuffer-setup-hook)
|
||||||
(progn
|
(unwind-protect
|
||||||
(use-local-map map)
|
(progn
|
||||||
(add-hook 'post-command-hook 'org-read-date-display)
|
(use-local-map map)
|
||||||
(setq org-ans0 (read-string prompt default-input
|
(add-hook 'post-command-hook 'org-read-date-display)
|
||||||
'org-read-date-history nil))
|
(setq org-ans0 (read-string prompt default-input
|
||||||
;; org-ans0: from prompt
|
'org-read-date-history nil))
|
||||||
;; org-ans1: from mouse click
|
;; org-ans0: from prompt
|
||||||
;; org-ans2: from calendar motion
|
;; org-ans1: from mouse click
|
||||||
(setq ans (concat org-ans0 " " (or org-ans1 org-ans2))))
|
;; org-ans2: from calendar motion
|
||||||
(remove-hook 'post-command-hook 'org-read-date-display)
|
(setq ans (concat org-ans0 " " (or org-ans1 org-ans2))))
|
||||||
(use-local-map old-map)
|
(remove-hook 'post-command-hook 'org-read-date-display)
|
||||||
(when org-read-date-overlay
|
(use-local-map old-map)
|
||||||
(org-delete-overlay org-read-date-overlay)
|
(when org-read-date-overlay
|
||||||
(setq org-read-date-overlay nil)))))))
|
(org-delete-overlay org-read-date-overlay)
|
||||||
|
(setq org-read-date-overlay nil))))))))
|
||||||
|
|
||||||
(t ; Naked prompt only
|
(t ; Naked prompt only
|
||||||
(unwind-protect
|
(unwind-protect
|
||||||
(setq ans (read-string prompt default-input
|
(setq ans (read-string prompt default-input
|
||||||
|
|
@ -12188,10 +12197,10 @@ user."
|
||||||
(when org-read-date-overlay
|
(when org-read-date-overlay
|
||||||
(org-delete-overlay org-read-date-overlay)
|
(org-delete-overlay org-read-date-overlay)
|
||||||
(setq org-read-date-overlay nil)))))
|
(setq org-read-date-overlay nil)))))
|
||||||
|
|
||||||
(setq final (org-read-date-analyze ans def defdecode))
|
(setq final (org-read-date-analyze ans def defdecode))
|
||||||
(setq org-read-date-final-answer ans)
|
(setq org-read-date-final-answer ans)
|
||||||
|
|
||||||
(if to-time
|
(if to-time
|
||||||
(apply 'encode-time final)
|
(apply 'encode-time final)
|
||||||
(if (and (boundp 'org-time-was-given) org-time-was-given)
|
(if (and (boundp 'org-time-was-given) org-time-was-given)
|
||||||
|
|
@ -12199,6 +12208,7 @@ user."
|
||||||
(nth 5 final) (nth 4 final) (nth 3 final)
|
(nth 5 final) (nth 4 final) (nth 3 final)
|
||||||
(nth 2 final) (nth 1 final))
|
(nth 2 final) (nth 1 final))
|
||||||
(format "%04d-%02d-%02d" (nth 5 final) (nth 4 final) (nth 3 final))))))
|
(format "%04d-%02d-%02d" (nth 5 final) (nth 4 final) (nth 3 final))))))
|
||||||
|
|
||||||
(defvar def)
|
(defvar def)
|
||||||
(defvar defdecode)
|
(defvar defdecode)
|
||||||
(defvar with-time)
|
(defvar with-time)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue