ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Nicolas Goaziou 2014-12-16 23:55:56 +01:00
parent c1558d34d7 57b76e2771
commit a949b23aa6
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lisp/org.el
View File

@ -16733,9 +16733,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)
@ -16743,7 +16744,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))
@ -16751,6 +16752,10 @@ 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
@ -16781,7 +16786,10 @@ user."
(when org-read-date-overlay
(delete-overlay org-read-date-overlay)
(setq org-read-date-overlay nil)))))
(bury-buffer "*Calendar*")))))
(bury-buffer "*Calendar*")
(when cal-frame
(delete-frame cal-frame)
(select-frame-set-input-focus cur-frame))))))
(t ; Naked prompt only
(unwind-protect