# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1254080264 -3600
# Node ID 684f0ed6cd4f0cc8c3732db2abb1244c060ce5ae
# Parent  ef70ee47d287304d99e41e93f4b50302950f1ead
Behave better when #'variable-at-point gives nil, #'custom-variable-prompt.

lisp/ChangeLog addition:

2009-09-27  Aidan Kehoe  <kehoea@parhasard.net>

	* cus-edit.el (custom-variable-prompt):
	nil is a symbol, check that variable-at-point is non-nil before
	checking if it's a symbol when deciding on the prompt used in this
	function.

diff -r ef70ee47d287 -r 684f0ed6cd4f lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Sep 25 01:10:49 2009 +0900
+++ b/lisp/ChangeLog	Sun Sep 27 20:37:44 2009 +0100
@@ -1,3 +1,10 @@
+2009-09-27  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* cus-edit.el (custom-variable-prompt): 
+	nil is a symbol, check that variable-at-point is non-nil before
+	checking if it's a symbol when deciding on the prompt used in this
+	function. 
+
 2009-09-22  Andreas Roehler  <andreas.roehler@online.de>
 
 	* lisp.el (beginning-of-defun-raw):
diff -r ef70ee47d287 -r 684f0ed6cd4f lisp/cus-edit.el
--- a/lisp/cus-edit.el	Fri Sep 25 01:10:49 2009 +0900
+++ b/lisp/cus-edit.el	Sun Sep 27 20:37:44 2009 +0100
@@ -300,7 +300,7 @@
 	 (enable-recursive-minibuffers t)
 	 val)
      (setq val (completing-read
-		(if (symbolp v)
+		(if (and v (symbolp v))
 		    (format "Customize variable: (default %s) " v)
 		  "Customize variable: ")
 		obarray (lambda (symbol)