From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Daniel Colascione Newsgroups: gmane.emacs.bugs Subject: bug#16159: [PATCH] Better paragraph separation for sh-mode Date: Mon, 16 Dec 2013 02:49:32 -0800 Message-ID: <52AEDABC.2020305@dancol.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1387192220 25516 80.91.229.3 (16 Dec 2013 11:10:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 16 Dec 2013 11:10:20 +0000 (UTC) To: 16159@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Dec 16 12:10:25 2013 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 1VsW47-0004e4-Vo for geb-bug-gnu-emacs@m.gmane.org; Mon, 16 Dec 2013 12:10:24 +0100 Original-Received: from localhost ([::1]:55447 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsW47-0006hp-GH for geb-bug-gnu-emacs@m.gmane.org; Mon, 16 Dec 2013 06:10:23 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsVlX-0003bY-De for bug-gnu-emacs@gnu.org; Mon, 16 Dec 2013 05:51:17 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VsVlO-0001UN-FW for bug-gnu-emacs@gnu.org; Mon, 16 Dec 2013 05:51:11 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:39028) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsVlO-0001UJ-Cj for bug-gnu-emacs@gnu.org; Mon, 16 Dec 2013 05:51:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1VsVlN-0000E3-Qv for bug-gnu-emacs@gnu.org; Mon, 16 Dec 2013 05:51:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Daniel Colascione Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 16 Dec 2013 10:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 16159 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-emacs Original-Received: via spool by submit@debbugs.gnu.org id=B.1387191055848 (code B ref -1); Mon, 16 Dec 2013 10:51:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 16 Dec 2013 10:50:55 +0000 Original-Received: from localhost ([127.0.0.1]:53047 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VsVlG-0000Db-JX for submit@debbugs.gnu.org; Mon, 16 Dec 2013 05:50:55 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:57281) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VsVlE-0000DR-6h for submit@debbugs.gnu.org; Mon, 16 Dec 2013 05:50:53 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VsVl7-0001Sa-E0 for submit@debbugs.gnu.org; Mon, 16 Dec 2013 05:50:51 -0500 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:54320) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsVl7-0001SU-3y for submit@debbugs.gnu.org; Mon, 16 Dec 2013 05:50:45 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58934) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsVl0-0002sy-7M for bug-gnu-emacs@gnu.org; Mon, 16 Dec 2013 05:50:44 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VsVks-0001QL-7l for bug-gnu-emacs@gnu.org; Mon, 16 Dec 2013 05:50:38 -0500 Original-Received: from dancol.org ([2600:3c01::f03c:91ff:fedf:adf3]:46632) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsVkr-0001NM-Ir for bug-gnu-emacs@gnu.org; Mon, 16 Dec 2013 05:50:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=dancol.org; s=x; h=Content-Transfer-Encoding:Content-Type:Subject:To:MIME-Version:From:Date:Message-ID; bh=HOtmCvsdeOgefTFJWSVtS0q9PlVwfIvXSs2S9eqcqVY=; b=C0qjap0IebhdIsMJ4vxDclDoK6wPadKa+5siM2nQfEKDbR3a/jnEH/B/BaMJpVuEMBBDhNSMx5NsoLVmCZHG0BROqJx2g217NI322xZ+DUTacofx2KHcZ1/wC3g+UcJVbtSPXux74cSXEJaodAOm4fQqLlGL0Z/B0+0fcQJGzKMtHw2bMUFOFvsZJhQcc+0YnrSdyV9FFc4p6gxGGl5W/eg5s8wNUYBk7lt1/69BEnifbsKjKKONqoU3y4/cfaYe37H2kcIgQp3yL5/QCcLEposx0pq0I1WHFoD8rGNripg1W6/re0ZSMrr6eAbEu1rnCvglyMvisqOZctRvY30dVA==; Original-Received: from [173.252.71.189] (helo=[172.20.16.114]) by dancol.org with esmtpsa (TLS1.0:DHE_RSA_CAMELLIA_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1VsVkj-0003xf-1u for bug-gnu-emacs@gnu.org; Mon, 16 Dec 2013 02:50:21 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). 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:82051 Archived-At: This change should make sure that M-q doesn't combine a comment line with the initial shebang of a shell script. $ bzr diff === modified file 'lisp/progmodes/sh-script.el' --- lisp/progmodes/sh-script.el 2013-11-09 10:49:42 +0000 +++ lisp/progmodes/sh-script.el 2013-12-16 10:46:04 +0000 @@ -1589,7 +1589,7 @@ (lambda () (or (eolp) (newline) (indent-relative)))) (setq-local paragraph-start (concat page-delimiter "\\|$")) - (setq-local paragraph-separate paragraph-start) + (setq-local paragraph-separate (concat paragraph-start "\\|#!/")) (setq-local comment-start "# ") (setq-local comment-start-skip "#+[\t ]*") (setq-local local-abbrev-table sh-mode-abbrev-table)