From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#23526: 25.0.93; sh-mode heredoc triggers incorrectly Date: Tue, 29 Aug 2017 09:44:33 -0400 Message-ID: References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1504014330 12564 195.159.176.226 (29 Aug 2017 13:45:30 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 29 Aug 2017 13:45:30 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) Cc: 23526-done@debbugs.gnu.org To: Anders Lindgren Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Aug 29 15:45:24 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmgpI-0002HM-LT for geb-bug-gnu-emacs@m.gmane.org; Tue, 29 Aug 2017 15:45:08 +0200 Original-Received: from localhost ([::1]:45050 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dmgpP-0003Vx-9q for geb-bug-gnu-emacs@m.gmane.org; Tue, 29 Aug 2017 09:45:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36648) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dmgpH-0003SQ-0c for bug-gnu-emacs@gnu.org; Tue, 29 Aug 2017 09:45:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dmgpD-0000mE-0x for bug-gnu-emacs@gnu.org; Tue, 29 Aug 2017 09:45:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:51600) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dmgpC-0000lt-Ti for bug-gnu-emacs@gnu.org; Tue, 29 Aug 2017 09:45:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dmgpC-0006Ap-Ho for bug-gnu-emacs@gnu.org; Tue, 29 Aug 2017 09:45:02 -0400 Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Tue, 29 Aug 2017 13:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 23526 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: confirmed Mail-Followup-To: 23526@debbugs.gnu.org, monnier@IRO.UMontreal.CA, andlind@gmail.com Original-Received: via spool by 23526-done@debbugs.gnu.org id=D23526.150401427823667 (code D ref 23526); Tue, 29 Aug 2017 13:45:02 +0000 Original-Received: (at 23526-done) by debbugs.gnu.org; 29 Aug 2017 13:44:38 +0000 Original-Received: from localhost ([127.0.0.1]:60281 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmgom-00069d-NJ for submit@debbugs.gnu.org; Tue, 29 Aug 2017 09:44:38 -0400 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:38410) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmgok-00069S-LD for 23526-done@debbugs.gnu.org; Tue, 29 Aug 2017 09:44:35 -0400 Original-Received: from ceviche.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.7/8.14.1) with ESMTP id v7TDiX4W004317; Tue, 29 Aug 2017 09:44:33 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 53C5666232; Tue, 29 Aug 2017 09:44:33 -0400 (EDT) In-Reply-To: (Anders Lindgren's message of "Fri, 13 May 2016 09:51:59 +0200") X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 2 Rules triggered EDT_SA_DN_PASS=0, RV6104=0 X-NAI-Spam-Version: 2.3.0.9418 : core <6104> : inlines <6039> : streams <1760693> : uri <2491618> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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" Xref: news.gmane.org gmane.emacs.bugs:136318 Archived-At: > In some cases, the "heredoc" system of sh-mode triggers on things that > aren't heredocs. > Steps to repeat: > Create a file, test.sh, with the following content: > ========8<-------- > # This is a normal comment > echo "<>" > # This is incorrectly highlighted as a heredoc comment. > echo "This is also incorrectly highlighted as a heredoc comment" > ========8<-------- > emacs -Q test.sh > Now, the two last lines are highlighted as a heredoc. Indeed, thanks for catching it. I installed the patch below which seems to fix it. Stefan diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 54c47b719f..ea2e98424f 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -1138,7 +1138,7 @@ sh-syntax-propertize-function (syntax-propertize-rules (sh-here-doc-open-re (2 (sh-font-lock-open-heredoc - (match-beginning 0) (match-string 1) (match-beginning 2)))) + (1+ (match-beginning 0)) (match-string 1) (match-beginning 2)))) ("\\s|" (0 (prog1 nil (sh-syntax-propertize-here-doc end)))) ;; A `#' begins a comment when it is unquoted and at the ;; beginning of a word. In the shell, words are separated by