* loadup.el: Preload newcomment.el.

* newcomment.el: Move autoload-only code to toplevel.

3 files changed, 14 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 33138c34809..b0a042f0664 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * loadup.el: Preload newcomment.el.
+        * newcomment.el: Move autoload-only code to toplevel.
+
         * buff-menu.el (list-buffers--refresh): Mark `size' as right-align.
         * emacs-lisp/tabulated-list.el (tabulated-list-init-header):
         Handle new :right-align column property.
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 5f005a4e709..ab3b107e56c 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -186,6 +186,7 @@
 (load "emacs-lisp/lisp-mode")
 (load "textmodes/text-mode")
 (load "textmodes/fill")
+(load "newcomment")
 
 (load "replace")
 (load "emacs-lisp/tabulated-list")
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 0862427c3ba..5c8829ff72e 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -102,30 +102,35 @@ Comments might be indented to a different value in order not to go beyond
   :type 'integer
   :group 'comment)
 (make-variable-buffer-local 'comment-column)
-;;;###autoload(put 'comment-column 'safe-local-variable 'integerp)
+;;;###autoload
+(put 'comment-column 'safe-local-variable 'integerp)
 
 ;;;###autoload
 (defvar comment-start nil
   "String to insert to start a new comment, or nil if no comment syntax.")
-;;;###autoload(put 'comment-start 'safe-local-variable 'string-or-null-p)
+;;;###autoload
+(put 'comment-start 'safe-local-variable 'string-or-null-p)
 
 ;;;###autoload
 (defvar comment-start-skip nil
   "Regexp to match the start of a comment plus everything up to its body.
 If there are any \\(...\\) pairs, the comment delimiter text is held to begin
 at the place matched by the close of the first pair.")
-;;;###autoload(put 'comment-start-skip 'safe-local-variable 'string-or-null-p)
+;;;###autoload
+(put 'comment-start-skip 'safe-local-variable 'string-or-null-p)
 
 ;;;###autoload
 (defvar comment-end-skip nil
   "Regexp to match the end of a comment plus everything back to its body.")
-;;;###autoload(put 'comment-end-skip 'safe-local-variable 'string-or-null-p)
+;;;###autoload
+(put 'comment-end-skip 'safe-local-variable 'string-or-null-p)
 
 ;;;###autoload
 (defvar comment-end (purecopy "")
   "String to insert to end a new comment.
 Should be an empty string if comments are terminated by end-of-line.")
-;;;###autoload(put 'comment-end 'safe-local-variable 'string-or-null-p)
+;;;###autoload
+(put 'comment-end 'safe-local-variable 'string-or-null-p)
 
 ;;;###autoload
 (defvar comment-indent-function 'comment-indent-default