* loadup.el: Preload newcomment.el.

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 33138c348096b8f27277829a8d8e940ada6b222a..b0a042f06647b2d19378e8762fa6adfe78691ea6 100644 (file)
--- 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 5f005a4e709b00e08ff7adb66c9216436be0e39f..ab3b107e56c82e2918c38d08bd58257d77d7061e 100644 (file)
--- 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 0862427c3baf2b3bfcc8209b210e08dd2d5d2dd7..5c8829ff72ed3ed360a9fb31ae6d640a2140c8c4 100644 (file)
--- 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