summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2009-09-03 13:53:03 +0200
committerCarsten Dominik <carsten.dominik@gmail.com>2009-09-03 13:53:03 +0200
commitc7c2ec4bc7797b7c4ae8973606fd5039b34b3412 (patch)
treeb2e2f6105684568eaf821d2758fec772ee8e6d8b
parent79839719bfdf3b199657b22a4592691f6bfbb6db (diff)
downloadorg-mode-c7c2ec4bc7797b7c4ae8973606fd5039b34b3412.tar.gz
Fix Emacs 22 bug in `org-agenda-quit'
-rwxr-xr-xlisp/ChangeLog3
-rw-r--r--lisp/org-agenda.el2
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 39ea0f0..2c32b94 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2009-09-03 Carsten Dominik <carsten.dominik@gmail.com>
+ * org-agenda.el (org-agenda-quit): Provide the window argument for
+ `window-dedicated-p', Emacs 22 needs it.
+
* org-exp.el (org-export-cleanup-toc-line): Remove footnote
references from TOC lines.
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 1a5abba..3216d8a 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4802,7 +4802,7 @@ If ERROR is non-nil, throw an error, otherwise just return nil."
(interactive)
(if org-agenda-columns-active
(org-columns-quit)
- (if (window-dedicated-p) (delete-other-windows))
+ (if (window-dedicated-p (selected-window)) (delete-other-windows))
(let ((buf (current-buffer)))
(and (not (eq org-agenda-window-setup 'current-window))
(not (one-window-p))