[Emacs-diffs] /srv/bzr/emacs/trunk r110224: * lisp/linum.el (linum-format): Don't autoload it. Improve :type.

[Glenn Morris]

------------------------------------------------------------
revno: 110224
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-09-27 00:26:22 -0700
message:
  * lisp/linum.el (linum-format): Don't autoload it.  Improve :type.
modified:
  lisp/ChangeLog
  lisp/linum.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-27 07:23:10 +0000
+++ b/lisp/ChangeLog    2012-09-27 07:26:22 +0000
@@ -1,5 +1,7 @@
 2012-09-27  Glenn Morris  <address@hidden>
 
+       * linum.el (linum-format): Don't autoload it.  Improve :type.
+
        * progmodes/tcl.el: Don't require outline when compiling.
        (outline-regexp, outline-level): Declare.
        * textmodes/sgml-mode.el: Don't require outline when compiling.

=== modified file 'lisp/linum.el'
--- a/lisp/linum.el     2012-01-19 07:21:25 +0000
+++ b/lisp/linum.el     2012-09-27 07:26:22 +0000
@@ -44,7 +44,6 @@
   "Show line numbers in the left margin."
   :group 'convenience)
 
-;;;###autoload
 (defcustom linum-format 'dynamic
   "Format used to display line numbers.
 Either a format string like \"%7d\", `dynamic' to adapt the width
@@ -52,7 +51,9 @@
 argument and should evaluate to a string to be shown on that line.
 See also `linum-before-numbering-hook'."
   :group 'linum
-  :type 'sexp)
+  :type '(choice (string :tag "Format string")
+                 (const :tag "Dynamic width" dynamic)
+                 (function :tag "Function")))
 
 (defface linum
   '((t :inherit (shadow default)))