From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Karl Chen Newsgroups: gmane.emacs.devel Subject: [patch] python.el (python-open-block-statement-p) Date: 11 Jun 2004 16:52:52 +0200 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1086965600 20441 80.91.224.253 (11 Jun 2004 14:53:20 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 11 Jun 2004 14:53:20 +0000 (UTC) Keywords: CERN SpamKiller Note: -49 Charset: west-latin Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Fri Jun 11 16:53:12 2004 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1BYnP6-0001kP-00 for ; Fri, 11 Jun 2004 16:53:12 +0200 Original-Received: from lists.gnu.org ([199.232.76.165]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1BYnP6-0006ep-00 for ; Fri, 11 Jun 2004 16:53:12 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1BYnPq-0001SS-D4 for emacs-devel@quimby.gnus.org; Fri, 11 Jun 2004 10:53:58 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1BYnPn-0001SD-Kd for emacs-devel@gnu.org; Fri, 11 Jun 2004 10:53:55 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1BYnPm-0001S1-Qy for emacs-devel@gnu.org; Fri, 11 Jun 2004 10:53:55 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1BYnPm-0001Ry-NU for emacs-devel@gnu.org; Fri, 11 Jun 2004 10:53:54 -0400 Original-Received: from [137.138.166.160] (helo=cernmxlb.cern.ch) by monty-python.gnu.org with esmtp (Exim 4.34) id 1BYnOo-0002BR-VR for emacs-devel@gnu.org; Fri, 11 Jun 2004 10:53:00 -0400 X-Filter: CERNMX06 SMTPGW CERN Spam Sink v1.0 Original-Received: from PCOLRENT20.cern.ch ([137.138.37.14]) by cernmxlb.cern.ch with Microsoft SMTPSVC(6.0.3790.0); Fri, 11 Jun 2004 16:52:52 +0200 Original-Received: by PCOLRENT20.cern.ch (Postfix, from userid 9390) id 19BB45FFA4; Fri, 11 Jun 2004 16:52:52 +0200 (CEST) Original-To: Emacs Developement List , Dave Love X-Quack-Archive: 1 X-Payment: hashcash 1.2 0:040611:emacs-devel@gnu.org:9f937812e2091e9bf7dfecde X-Hashcash: 0:040611:emacs-devel@gnu.org:9f937812e2091e9bf7dfecde X-Payment: hashcash 1.2 0:040611:d.love@dl.ac.uk:16189e393e76a2a8fd0a1b5d X-Hashcash: 0:040611:d.love@dl.ac.uk:16189e393e76a2a8fd0a1b5d Original-Lines: 30 X-OriginalArrivalTime: 11 Jun 2004 14:52:52.0307 (UTC) FILETIME=[C572D230:01C44FC3] X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.4 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:24836 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:24836 There's a bug in `python-open-block-statement-p' that causes indentation after a block opening containing a comment to fail, e.g.: if foo: # comment <-- doesn't indent correctly here Patch below fixes it. Index: python.el =================================================================== --- python.el (revision 6501) +++ python.el (working copy) @@ -323,7 +323,8 @@ line-end)) (save-excursion (python-end-of-statement)) t) - (not (python-in-string/comment))))) + (not (progn (goto-char (match-beginning 0)) + (python-in-string/comment)))))) (defun python-close-block-statement-p (&optional bos) "Return non-nil if current line is a statement closing a block. -- Karl 2004-06-11 16:48