* buff-menu.el (Buffer-menu-buffer+size-width): Fix customize type

and obsoletion message.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7a92aea69f7f9601dfb47e5015463610721998ae..4e7f49b5345871fd170cb64b85a2e5a7e4e002b0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-24  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * buff-menu.el (Buffer-menu-buffer+size-width): Fix customize type
+       and obsoletion message.
+
 2012-11-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/cl-macs.el (cl--transform-lambda): Add back `declare' in

diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 6ab6e548ab5a51169a43eb0a5688c39f3393ac95..01035f8727dd1007b239a169f827dd153b950c7a 100644 (file)
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -55,12 +55,12 @@ If nil, use `Buffer-menu-name-width' and `Buffer-menu-size-width'.
 If non-nil, the value of `Buffer-menu-name-width' is overridden;
 the name column is assigned width `Buffer-menu-buffer+size-width'
 minus `Buffer-menu-size-width'.  This use is deprecated."
-  :type 'number
+  :type '(choice (const nil) number)
   :group 'Buffer-menu
   :version "24.3")
 
 (make-obsolete-variable 'Buffer-menu-buffer+size-width
-                       "`Buffer-menu-name-width' and `Buffer-menu-size-width'"
+                       "use `Buffer-menu-name-width' and `Buffer-menu-size-width' instead."
                        "24.3")
 
 (defcustom Buffer-menu-name-width 19