* lisp/minibuffer.el (completions-format): Change default from nil to

`horizontal'.  Remove `nil' value from :type.  Doc fix.  (Bug#6459)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6e19fb7b650281c535022339a65475b4f8e2cb24..4e2b7028dd7b29626a1fafb4b7d2595afeb15ed2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-24  Juri Linkov  <juri@jurta.org>
+
+       * minibuffer.el (completions-format): Change default from nil to
+       `horizontal'.  Remove `nil' value from :type.  Doc fix.  (Bug#6459)
+
 2010-06-24  Juri Linkov  <juri@jurta.org>
 
        * vc/vc.el (vc-diff-internal): Set `revert-buffer-function'

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 646b773caf268c3674114491196c629cc45ccc24..3f22099bfd11a076d0385c7d3d748f175693f2f5 100644 (file)
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -891,13 +891,13 @@ Return nil if there is no valid completion, else t."
 (defface completions-annotations '((t :inherit italic))
   "Face to use for annotations in the *Completions* buffer.")
 
-(defcustom completions-format nil
+(defcustom completions-format 'horizontal
   "Define the appearance and sorting of completions.
 If the value is `vertical', display completions sorted vertically
 in columns in the *Completions* buffer.
-If the value is `horizontal' or nil, display completions sorted
+If the value is `horizontal', display completions sorted
 horizontally in alphabetical order, rather than down the screen."
-  :type '(choice (const nil) (const horizontal) (const vertical))
+  :type '(choice (const horizontal) (const vertical))
   :group 'minibuffer
   :version "23.2")