From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 1 Apr 2007 19:35:32 +0000 (+0000)
Subject: (lisp-fill-paragraph): Only obey emacs-lisp-docstring-fill-column in
X-Git-Tag: emacs-pretest-22.0.97~47
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8ae799ba73eecc636ce2b877d4bee1b90b634252;p=emacs.git

(lisp-fill-paragraph): Only obey emacs-lisp-docstring-fill-column in
emacs-lisp-mode.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 50ce561026e..f31cf647ada 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* emacs-lisp/lisp-mode.el (lisp-fill-paragraph): Only obey
+	emacs-lisp-docstring-fill-column in emacs-lisp-mode.
+
+	* newcomment.el (comment-search-forward): Discard comment starters
+	before point.
+
 2007-04-01  Guanpeng Xu  <herberteuler@hotmail.com>
 
 	* mouse.el (mouse-set-secondary): Update mouse-secondary-overlay.
@@ -7,16 +15,15 @@
 	* mail/smtpmail.el (smtpmail-via-smtp): Use standard case table
 	when downcasing.
 
-	* button.el (previous-button): Rewrite to account for adjacent
-	buttons.
+	* button.el (previous-button): Rewrite to account for adjacent buttons.
 
 2007-04-01  J.D. Smith  <jdsmith@as.arizona.edu>
 
-	* progmodes/idlwave.el (idlwave-auto-fill): Revert
-	paragraph-separate change.
+	* progmodes/idlwave.el (idlwave-auto-fill):
+	Revert paragraph-separate change.
 
-	* progmodes/idlw-shell.el (idlwave-shell-break-in): Simplify
-	module calc.
+	* progmodes/idlw-shell.el (idlwave-shell-break-in):
+	Simplify module calc.
 	(idlwave-shell-set-bp-in-module): Compute module.
 
 2007-03-31  Glenn Morris  <rgm@gnu.org>
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 09cb8436c89..164756dfdc3 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -1280,7 +1280,8 @@ and initial semicolons."
 				     "\\|\\s-*\\([(;:\"]\\|`(\\|#'(\\)"))
 	    (paragraph-separate
 	     (concat paragraph-separate "\\|\\s-*\".*[,\\.]$"))
-            (fill-column (if (integerp emacs-lisp-docstring-fill-column)
+            (fill-column (if (and (integerp emacs-lisp-docstring-fill-column)
+                                  (derived-mode-p 'emacs-lisp-mode))
                              emacs-lisp-docstring-fill-column
                            fill-column)))
 	(fill-paragraph justify))