Hello, Here is a patch that honors the setting for `calendar-setup' when it's 'calendar-only: is now correctly creates a new frame for the calendar, and removes is and restores the focus when the date is selected. As a side effect, is also fixes the bug I reported in this thread.
I have signed the FSF papers.
From 40c1905f77d706c52cc964449c88c16b64b5a449 Mon Sep 17 00:00:00 2001
From: Alan Schmitt <alan.schm...@polytechnique.org>
Date: Thu, 11 Dec 2014 19:01:45 +0100
Subject: [PATCH] org.el: Allow calendars to be in their own frame
* lisp/org.el (org-read-date): Create and delete frames if
`calendar-setup' is set to 'calendar-only.
---
lisp/org.el | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index bed5cb9..144d038 100755
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -16728,9 +16728,10 @@ user."
(setcar (nthcdr 1 org-defdecode) 59)
(setq org-def (apply 'encode-time org-defdecode)
org-defdecode (decode-time org-def)))))
+ (cur-frame (selected-frame))
(mouse-autoselect-window nil) ; Don't let the mouse jump
(calendar-frame-setup nil)
- (calendar-setup nil)
+ (calendar-setup (when (eq calendar-setup 'calendar-only) 'calendar-only))
(calendar-move-hook nil)
(calendar-view-diary-initially-flag nil)
(calendar-view-holidays-initially-flag nil)
@@ -16738,7 +16739,7 @@ user."
(if org-with-time "%Y-%m-%d %H:%M" "%Y-%m-%d") org-def))
(prompt (concat (if prompt (concat prompt " ") "")
(format "Date+time [%s]: " timestr)))
- ans (org-ans0 "") org-ans1 org-ans2 final)
+ ans (org-ans0 "") org-ans1 org-ans2 final cal-frame)
(cond
(from-string (setq ans from-string))
@@ -16746,9 +16747,13 @@ user."
(save-excursion
(save-window-excursion
(calendar)
+ (when (eq calendar-setup 'calendar-only)
+ (setq cal-frame
+ (window-frame (get-buffer-window "*Calendar*" 'visible)))
+ (select-frame cal-frame))
(org-eval-in-calendar '(setq cursor-type nil) t)
- (unwind-protect
- (progn
+ (unwind-protect
+ (progn
(calendar-forward-day (- (time-to-days org-def)
(calendar-absolute-from-gregorian
(calendar-current-date))))
@@ -16775,8 +16780,11 @@ user."
(use-local-map old-map)
(when org-read-date-overlay
(delete-overlay org-read-date-overlay)
- (setq org-read-date-overlay nil)))))
- (bury-buffer "*Calendar*")))))
+ (setq org-read-date-overlay nil)))))
+ (bury-buffer "*Calendar*")
+ (when cal-frame
+ (delete-frame cal-frame)
+ (select-frame-set-input-focus cur-frame))))))
(t ; Naked prompt only
(unwind-protect
--
2.2.0
Best, Alan -- OpenPGP Key ID : 040D0A3B4ED2E5C7
signature.asc
Description: PGP signature
