(comment-style): Default to `indent'. (Bug#1589)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0c06b012fd61027993605cca51826dc34c77632a..05b299e2fa8cbde4b07e1988308b805b3550e295 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2008-12-18  Dan Nicolaescu  <dann@ics.uci.edu>
 
+       * newcomment.el (comment-style): Default to `indent'.  (Bug#1153)
+
        * startup.el (command-line): Do not mention the server name in
        case the user has not mentioned it, print a more explicit message.
 

diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 91ece5aa2fab59d9c2dfbc9e5be5afe4f47f2088..4750676caf3c8c4b137f83f8b16a076d73aec4b1 100644 (file)
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -207,13 +207,14 @@ If INDENT is `multi-char', that means indent multi-character
   comment starters, but not one-character comment starters.")
 
 ;;;###autoload
-(defcustom comment-style 'indent-or-triple
+(defcustom comment-style 'indent
   "Style to be used for `comment-region'.
 See `comment-styles' for a list of available styles."
   :type (if (boundp 'comment-styles)
            `(choice ,@(mapcar (lambda (s) `(const ,(car s)))
                               comment-styles))
          'symbol)
+  :version "23.1"
   :group 'comment)
 
 ;;;###autoload