From 45a0fe531c5cb9cf095ae2d1e55de59d590bd333 Mon Sep 17 00:00:00 2001
From: Marco Wahl <marcowahlsoft@gmail.com>
Date: Tue, 28 Jan 2020 00:00:05 +0100
Subject: [PATCH] agenda: C-c C-c deactivates columns

* lisp/org-agenda.el (org-agenda-ctrl-c-ctrl-c):  New function.

This is to unify and thereby harmonize the behavior of C-c C-c with
regard to Org files and columns.
---
 etc/ORG-NEWS       | 2 ++
 lisp/org-agenda.el | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 1b7848e8e..62e103028 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -50,6 +50,8 @@ buffers are displayed by modifying ~display-buffer-alist~ or
 recent ~org-columns-set-tags-or-toggle~.  Tag setting is still
 possible via column view value edit or with =<C-c C-q>=.
 *** ~org-datetree-find-month-create~
+*** ~org-agenda-ctrl-c-ctrl-c~
+=<C-c C-c>= for agenda.  Up to now just deactivate columns.
 ** Removed functions and variables
 
 *** ~org-columns-set-tags-or-toggle~
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index ac785c399..1fcaa8ae5 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -2422,6 +2422,8 @@ The following commands are available:
 (define-key org-agenda-mode-map [remap forward-paragraph] 'org-agenda-forward-block)
 (define-key org-agenda-mode-map [remap backward-paragraph] 'org-agenda-backward-block)
 
+(org-defkey org-agenda-mode-map "\C-c\C-c" 'org-agenda-ctrl-c-ctrl-c)
+
 (when org-agenda-mouse-1-follows-link
   (org-defkey org-agenda-mode-map [follow-link] 'mouse-face))
 (easy-menu-define org-agenda-menu org-agenda-mode-map "Agenda menu"
@@ -10548,6 +10550,11 @@ when defining today."
          (org-extend-today-until (1+ hour)))
     (org-agenda-todo arg)))
 
+(defun org-agenda-ctrl-c-ctrl-c ()
+  "If columns are active, deactivate them."
+  (interactive)
+  (when org-agenda-columns-active (org-columns-quit)))
+
 (provide 'org-agenda)
 
 ;;; org-agenda.el ends here