From a665ecb66647de1caf7890fd1230b958f8239a4b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <n.goaziou@gmail.com>
Date: Thu, 29 Jul 2010 12:38:55 +0200
Subject: [PATCH] Fix bug when `org-list-two-spaces-after-bullet-regexp' would
 be nil.

* org-list.el (org-list-bullet-string): first check if
  `org-list-two-spaces-after-bullet-regexp' isn't nil.
---
 lisp/org-list.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/org-list.el b/lisp/org-list.el
index c287bd51a..6596c516d 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -995,7 +995,9 @@ It determines the number of whitespaces to append by looking at
     (concat
      bullet " "
      ;; Do we need to concat another white space ?
-     (when (string-match org-list-two-spaces-after-bullet-regexp bullet) " "))))
+     (when (and org-list-two-spaces-after-bullet-regexp
+                (string-match org-list-two-spaces-after-bullet-regexp bullet))
+       " "))))
 
 (defun org-list-replace-bullet (new-bullet)
   "Replace current item's bullet with NEW-BULLET.