A blank headline (e.g. with just a TODO keyword) caused a crash when building colview. Patch attached.

>From 6bb1413821a7cbf94b3abbfc6e985e187dd8d6d9 Mon Sep 17 00:00:00 2001
From: Ilya Shlyakhter <ilya_...@alum.mit.edu>
Date: Sat, 24 Mar 2012 12:25:59 -0400
Subject: [PATCH] Colview bugfix: A headline with just a TODO keyword and
 blank headline content would crash

* lisp/org-colview.el (org-columns-cleanup-item): Handle case of empty
headline

* lisp/org-colview-xemacs.el (org-columns-cleanup-item): Handle case of empty
headline

TINYCHANGE
---
 lisp/org-colview-xemacs.el |    2 +-
 lisp/org-colview.el        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/org-colview-xemacs.el b/lisp/org-colview-xemacs.el
index ec892fe..b65aa18 100644
--- a/lisp/org-colview-xemacs.el
+++ b/lisp/org-colview-xemacs.el
@@ -516,7 +516,7 @@ This is the compiled version of the format.")
               'org-whitespace (* 2 (1- (org-reduced-level (- (match-end 1) 
(match-beginning 1))))))
             (and (match-end 2) (not (assoc "TODO" fmt)) (concat " " 
(match-string 2 item)))
             (and (match-end 3) (not (assoc "PRIORITY" fmt)) (concat " " 
(match-string 3 item)))
-            " " (save-match-data (org-columns-compact-links (match-string 4 
item)))
+            " " (save-match-data (org-columns-compact-links (or (match-string 
4 item) "")))
             (and (match-end 5) (not (assoc "TAGS" fmt)) (concat " " 
(match-string 5 item)))))
       (add-text-properties
        0 (1+ (match-end 1))
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index 95def1c..fb15880 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -357,7 +357,7 @@ CPHR is the complex heading regexp to use for parsing ITEM."
                   'org-whitespace (* 2 (1- (org-reduced-level (- (match-end 1) 
(match-beginning 1))))))
                 (and (match-end 2) (not (assoc "TODO" fmt)) (concat " " 
(match-string 2 item)))
                 (and (match-end 3) (not (assoc "PRIORITY" fmt)) (concat " " 
(match-string 3 item)))
-                " " (save-match-data (org-columns-compact-links (match-string 
4 item)))
+                " " (save-match-data (org-columns-compact-links (or 
(match-string 4 item) "")))
                 (and (match-end 5) (not (assoc "TAGS" fmt)) (concat " " 
(match-string 5 item)))))
        (add-text-properties
         0 (1+ (match-end 1))
-- 
1.7.9.3

Reply via email to