From 7c9ebec557b8ec4f52d08a425b25e4ac6884639c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 20 Mar 2011 17:12:47 -0400
Subject: [PATCH] Feature

- Enhanced diagnostics command.
---
 AUTHORS      |  1 +
 ChangeLog    |  7 +++++++
 src/diag.cpp | 14 +++++++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 3ca7b7e08..c26804e28 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -72,6 +72,7 @@ suggestions:
   Seneca Cunningham
   Dirk Deimeke
   Michelle Crane
+  Alexander Schremmer
   Elizabeth Maxson
   Peter De Poorter
   Max Muller
diff --git a/ChangeLog b/ChangeLog
index b7203fd2a..7b216978f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 ------ current release ---------------------------
 
 2.0.0 ()
+
+# Untracked Features, biggest first.
  + autoconf eliminated.
  + New 'ids' command that returns a filtered set of task ID numbers, instead
    of the actual tasks.  For advanced pipeline use.
@@ -9,15 +11,20 @@
    allows commands like:  echo 'add Pay the bills' | task
  + Corrected sorting to use std::stable_sort instead of std::sort, which is not
    guaranteed stable (thanks to Stefan Hacker).
+ + Enhanced diagnostics command.
 
+# Tracked Features, sorted by ID.
  + Added feature #700, which adds tab-completion of built-in tags.
  + Added feature #710, which adds an attribute modifier prefix to return the
    complement of a filtered set (thanks to Dan White).
 
+# Tracked Bugs, sorted by ID.
  + Fixed Bug #713, which fixes typos in the holidays-UK.rc file (thanks to
    Alexei Romanoff).
  + Added feature #714, including Belarus holidays (thanks to Alexei Romanoff).
 
+# Untracked Bugs, biggest first.
+
 ------ old releases ------------------------------
 
 1.9.4 (03/03/2011) b9bae255f4fa03970eced3ac0876935271d1d7a1
diff --git a/src/diag.cpp b/src/diag.cpp
index 7b1e15122..20714b773 100644
--- a/src/diag.cpp
+++ b/src/diag.cpp
@@ -194,7 +194,18 @@ void handleDiagnostics (std::string& outs)
 
   std::cout << "     Regex: "
             << (context.config.getBoolean ("regex") ? "Enabled" : "Disabled")
-            << "\n\n";
+            << "\n";
+
+  // Determine rc.editor/$EDITOR/$VISUAL.
+  char* peditor;
+  if (context.config.get ("editor") != "")
+    std::cout << " rc.editor: " << context.config.get ("editor") << "\n";
+  else if ((peditor = getenv ("VISUAL")) != NULL)
+    std::cout << "   $VISUAL: " << peditor << "\n";
+  else if ((peditor = getenv ("EDITOR")) != NULL)
+    std::cout << "   $EDITOR: " << peditor << "\n";
+
+  std::cout << "\n";
 
   // External commands.
   std::cout << "External Utilities\n";
@@ -279,6 +290,7 @@ void handleDiagnostics (std::string& outs)
               << context.getHeight ()
               << ")\n";
   }
+
   std::cout << "\n";
 }