From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#20256: 25.0.50; css-mode: filling multi-line comments Date: Mon, 13 Apr 2015 10:28:31 -0400 Message-ID: References: <1428691550.2286.0@smtp.gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1428935381 27795 80.91.229.3 (13 Apr 2015 14:29:41 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 13 Apr 2015 14:29:41 +0000 (UTC) Cc: 20256@debbugs.gnu.org To: Simen =?UTF-8?Q?Heggest=C3=B8yl?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Apr 13 16:29:23 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YhfMT-0001ju-MN for geb-bug-gnu-emacs@m.gmane.org; Mon, 13 Apr 2015 16:29:17 +0200 Original-Received: from localhost ([::1]:52144 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YhfMS-0006BM-S9 for geb-bug-gnu-emacs@m.gmane.org; Mon, 13 Apr 2015 10:29:16 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56598) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YhfMK-00064W-Sq for bug-gnu-emacs@gnu.org; Mon, 13 Apr 2015 10:29:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YhfMF-0007iP-2X for bug-gnu-emacs@gnu.org; Mon, 13 Apr 2015 10:29:08 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:37098) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YhfME-0007iK-W6 for bug-gnu-emacs@gnu.org; Mon, 13 Apr 2015 10:29:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YhfME-00041A-Eg for bug-gnu-emacs@gnu.org; Mon, 13 Apr 2015 10:29:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 13 Apr 2015 14:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20256 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 20256-submit@debbugs.gnu.org id=B20256.142893533715433 (code B ref 20256); Mon, 13 Apr 2015 14:29:02 +0000 Original-Received: (at 20256) by debbugs.gnu.org; 13 Apr 2015 14:28:57 +0000 Original-Received: from localhost ([127.0.0.1]:55107 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YhfM8-00040r-Sf for submit@debbugs.gnu.org; Mon, 13 Apr 2015 10:28:57 -0400 Original-Received: from mercure.iro.umontreal.ca ([132.204.24.67]:39769) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YhfM6-00040j-Ov for 20256@debbugs.gnu.org; Mon, 13 Apr 2015 10:28:55 -0400 Original-Received: from hidalgo.iro.umontreal.ca (hidalgo.iro.umontreal.ca [132.204.27.50]) by mercure.iro.umontreal.ca (Postfix) with ESMTP id 10AFC85F2A; Mon, 13 Apr 2015 10:28:54 -0400 (EDT) Original-Received: from lechon.iro.umontreal.ca (lechon.iro.umontreal.ca [132.204.27.242]) by hidalgo.iro.umontreal.ca (Postfix) with ESMTP id 54FD01E5B94; Mon, 13 Apr 2015 10:28:31 -0400 (EDT) Original-Received: by lechon.iro.umontreal.ca (Postfix, from userid 20848) id 3A6CCB4122; Mon, 13 Apr 2015 10:28:31 -0400 (EDT) In-Reply-To: <1428691550.2286.0@smtp.gmail.com> ("Simen =?UTF-8?Q?Heggest=C3=B8yl?="'s message of "Fri, 10 Apr 2015 20:45:50 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-DIRO-MailScanner-Information: Please contact the ISP for more information X-DIRO-MailScanner: Found to be clean X-DIRO-MailScanner-SpamCheck: n'est pas un polluriel, SpamAssassin (score=-2.82, requis 5, autolearn=not spam, ALL_TRUSTED -2.82, MC_TSTLAST 0.00) X-DIRO-MailScanner-From: monnier@iro.umontreal.ca X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:101478 Archived-At: > Ah, thanks, I missed that. An updated patch follows. It defines > `css-adaptive-fill' buffer-locally, which makes `auto-fill-mode' > behave nice. Thanks, looks good. > `css-fill-paragraph' should now be general again. Not quite: for example a comment starter may fail to match (regexp-quote comment-start), in modes where comments can be of several different forms (e.g. some modes might accept both (*...*) and /*...*/ for example). > + (when (save-excursion > + (back-to-indentation) > + (looking-at (regexp-quote comment-start))) This should probably use comment-start-skip (or comment-search-forward). > - (concat "\\(?:[ \t]*" (regexp-quote comment-continue) > + (concat "\\(?:[ \t]*" > + (regexp-opt > + (list comment-continue comment-start > + comment-end)) I think this should not use comment-end if it's the empty string (otherwise the regexp might trigger pathological behavior of our backtracking-based matcher). Maybe better would be to use comment-start-skip and comment-end-skip rather than comment-start and comment-end. > +(defun scss-fill-paragraph (&optional justify) > + "Call `css-fill-paragraph', but ensure that the multi-line > + variants of `comment-start' and `comment-end' are in use, in > + order to support multi-line comment filling in SCSS mode as > + well." > + (let ((comment-start "/*") > + (comment-end "*/")) > + (css-fill-paragraph justify))) Once you fix the code to use comment-start/end-skip instead of comment-start/end, this function should be unneeded. Stefan