From unknown Mon Aug 18 17:54:31 2025 X-Loop: help-debbugs@gnu.org Subject: bug#6916: Fwd: [PATCH] fix indent bug in sh-script Resent-From: Daniel Colascione Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 26 Aug 2010 05:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 6916 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 6916@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.128279974224469 (code B ref -1); Thu, 26 Aug 2010 05:16:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Aug 2010 05:15:42 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OoUoP-0006Mc-BK for submit@debbugs.gnu.org; Thu, 26 Aug 2010 01:15:41 -0400 Received: from mail.gnu.org ([199.232.76.166] helo=mx10.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OoUoN-0006MX-EE for submit@debbugs.gnu.org; Thu, 26 Aug 2010 01:15:40 -0400 Received: from lists.gnu.org ([199.232.76.165]:55163) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1OoUpj-0008Rx-IA for submit@debbugs.gnu.org; Thu, 26 Aug 2010 01:17:03 -0400 Received: from [140.186.70.92] (port=54887 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OoUph-0002ei-CY for bug-gnu-emacs@gnu.org; Thu, 26 Aug 2010 01:17:02 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,T_DKIM_INVALID,T_TO_NO_BRKTS_FREEMAIL autolearn=unavailable version=3.3.1 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OoUpg-0007H0-16 for bug-gnu-emacs@gnu.org; Thu, 26 Aug 2010 01:17:01 -0400 Received: from mail-yw0-f41.google.com ([209.85.213.41]:39941) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OoUpf-0007Gr-V1 for bug-gnu-emacs@gnu.org; Thu, 26 Aug 2010 01:17:00 -0400 Received: by ywo7 with SMTP id 7so714891ywo.0 for ; Wed, 25 Aug 2010 22:16:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:x-enigmail-version:content-type :content-transfer-encoding; bh=wzfbTvBr1EbRhTQu3wWgne2jM04RZJBPpstuWlGV0LU=; b=qwzZ2pr+3VVdGdKDwTInLTqn1/I3+lMklN7JWhQb8UkPwt9Cxp8KGnTtQB3VOznZU3 DpdFr1pLfL9avJmTsepGd6oKQWwVS4rCIKUSFcVt4ENqlxSrJVSeI4yh619KLEffhsRW +jUyXhkc1VtYMo6YAZSNSyI57a7KWUF3N1EE0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :x-enigmail-version:content-type:content-transfer-encoding; b=j3ATEgpXKdvqoTFmvt5vLBTj6oTKGMAwuJJ1EGXCrr/K6wOqlhTNTwsMBLXQV7UH67 w2uS6eFf1+kMZ5red9JUQv+JoF7aE55j0tNrevOK8NRc1fdnFBeWtkl/A6WLQLBD+Raz lt9aGnR1/sLVoAFb3H0dgYlNOmz3u54S47Wis= Received: by 10.151.62.9 with SMTP id p9mr9908371ybk.122.1282799818559; Wed, 25 Aug 2010 22:16:58 -0700 (PDT) Received: from edith.local (c-67-183-23-114.hsd1.wa.comcast.net [67.183.23.114]) by mx.google.com with ESMTPS id g31sm2100679ibh.10.2010.08.25.22.16.56 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 25 Aug 2010 22:16:57 -0700 (PDT) Message-ID: <4C75F8C7.4060201@gmail.com> Date: Wed, 25 Aug 2010 22:16:55 -0700 From: Daniel Colascione User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.8) Gecko/20100802 Thunderbird/3.1.2 MIME-Version: 1.0 X-Enigmail-Version: 1.1.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Spam-Score: -5.9 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -5.9 (-----) Modes should not inspect font-lock-controlled properties to control indentation. This patch fixes one such problem in sh-script that caused newline-and-indent to malfunction when invoked at the end of a line ending in a string delimiter. diff --git a/override/sh-script.el b/override/sh-script.el index 610fa14..94973f0 100644 --- a/override/sh-script.el +++ b/override/sh-script.el @@ -2233,10 +2233,9 @@ STRING This is ignored for the purposes of calculating ;; Note: setting result to t means we are done and will return nil. ;;(This function never returns just t.) (cond - ((or (and (boundp 'font-lock-string-face) (not (bobp)) - (eq (get-text-property (1- (point)) 'face) - font-lock-string-face)) + ((or (nth 3 (syntax-ppss (point))) (eq (get-text-property (point) 'face) sh-heredoc-face)) + ;; String continuation -- don't indent (setq result t) From unknown Mon Aug 18 17:54:31 2025 X-Loop: help-debbugs@gnu.org Subject: bug#6916: Fwd: [PATCH] fix indent bug in sh-script Resent-From: Chong Yidong Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 26 Aug 2010 15:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 6916 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Daniel Colascione Cc: 6916@debbugs.gnu.org Received: via spool by 6916-submit@debbugs.gnu.org id=B6916.128283632013724 (code B ref 6916); Thu, 26 Aug 2010 15:26:01 +0000 Received: (at 6916) by debbugs.gnu.org; 26 Aug 2010 15:25:20 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OoeKN-0003ZJ-Pf for submit@debbugs.gnu.org; Thu, 26 Aug 2010 11:25:19 -0400 Received: from pantheon-po23.its.yale.edu ([130.132.50.117]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OoeKK-0003ZD-Gm for 6916@debbugs.gnu.org; Thu, 26 Aug 2010 11:25:16 -0400 Received: from furry (dhcp128036014154.central.yale.edu [128.36.14.154]) (authenticated bits=0) by pantheon-po23.its.yale.edu (8.12.11.20060308/8.12.11) with ESMTP id o7QFQfMd000598 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 26 Aug 2010 11:26:41 -0400 Received: by furry (Postfix, from userid 1000) id BF01AC017; Thu, 26 Aug 2010 11:26:41 -0400 (EDT) From: Chong Yidong References: <4C75F8C7.4060201@gmail.com> Date: Thu, 26 Aug 2010 11:26:41 -0400 In-Reply-To: <4C75F8C7.4060201@gmail.com> (Daniel Colascione's message of "Wed, 25 Aug 2010 22:16:55 -0700") Message-ID: <871v9lqtse.fsf@stupidchicken.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-YaleITSMailFilter: Version 1.2c (attachment(s) not renamed) X-Spam-Score: -2.7 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.7 (--) Daniel Colascione writes: > Modes should not inspect font-lock-controlled properties to control > indentation. This patch fixes one such problem in sh-script that caused > newline-and-indent to malfunction when invoked at the end of a line > ending in a string delimiter. Thanks, applied. From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 26 11:25:33 2010 Received: (at control) by debbugs.gnu.org; 26 Aug 2010 15:25:33 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OoeKb-0003ZU-N7 for submit@debbugs.gnu.org; Thu, 26 Aug 2010 11:25:33 -0400 Received: from pantheon-po45.its.yale.edu ([130.132.50.79]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OoeKY-0003ZP-To for control@debbugs.gnu.org; Thu, 26 Aug 2010 11:25:31 -0400 Received: from furry (dhcp128036014154.central.yale.edu [128.36.14.154]) (authenticated bits=0) by pantheon-po45.its.yale.edu (8.12.11.20060308/8.12.11) with ESMTP id o7QFQuqf015062 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Thu, 26 Aug 2010 11:26:56 -0400 Received: by furry (Postfix, from userid 1000) id 61A80C017; Thu, 26 Aug 2010 11:26:56 -0400 (EDT) From: Chong Yidong To: control@debbugs.gnu.org Subject: close 6916 Date: Thu, 26 Aug 2010 11:26:56 -0400 Message-ID: <87d3t5z96n.fsf@stupidchicken.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-YaleITSMailFilter: Version 1.2c (attachment(s) not renamed) X-Spam-Score: -2.7 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.7 (--) close 6916 thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 06 18:05:40 2011 Received: (at control) by debbugs.gnu.org; 6 Aug 2011 22:05:40 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Qpozz-0007c6-Nn for submit@debbugs.gnu.org; Sat, 06 Aug 2011 18:05:40 -0400 Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Qpozy-0007by-6p for control@debbugs.gnu.org; Sat, 06 Aug 2011 18:05:38 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Qpoz7-00047N-4Q for control@debbugs.gnu.org; Sat, 06 Aug 2011 18:04:45 -0400 Date: Sat, 06 Aug 2011 18:04:45 -0400 Message-Id: Subject: control message for bug 9193 To: X-Mailer: mail (GNU Mailutils 2.1) From: Glenn Morris X-Spam-Score: -6.4 (------) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.4 (------) unarchive 6916 forcemerge 6916 9193