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#21526: 24.5; prolog-mode: broken indentation for if-then-else construct Date: Mon, 21 Sep 2015 16:22:31 -0400 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1442867006 28783 80.91.229.3 (21 Sep 2015 20:23:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 21 Sep 2015 20:23:26 +0000 (UTC) Cc: 21526@debbugs.gnu.org To: Markus Triska Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Sep 21 22:23:17 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 1Ze7cK-0003Ki-6W for geb-bug-gnu-emacs@m.gmane.org; Mon, 21 Sep 2015 22:23:16 +0200 Original-Received: from localhost ([::1]:33573 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ze7cJ-0002Db-Eg for geb-bug-gnu-emacs@m.gmane.org; Mon, 21 Sep 2015 16:23:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59912) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ze7cB-0002Cg-AP for bug-gnu-emacs@gnu.org; Mon, 21 Sep 2015 16:23:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ze7c6-0002jQ-EE for bug-gnu-emacs@gnu.org; Mon, 21 Sep 2015 16:23:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:48751) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ze7c6-0002jL-9y for bug-gnu-emacs@gnu.org; Mon, 21 Sep 2015 16:23:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Ze7c6-0004VM-1u for bug-gnu-emacs@gnu.org; Mon, 21 Sep 2015 16:23: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, 21 Sep 2015 20:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 21526 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 21526-submit@debbugs.gnu.org id=B21526.144286695617282 (code B ref 21526); Mon, 21 Sep 2015 20:23:01 +0000 Original-Received: (at 21526) by debbugs.gnu.org; 21 Sep 2015 20:22:36 +0000 Original-Received: from localhost ([127.0.0.1]:40961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Ze7bg-0004Uf-D8 for submit@debbugs.gnu.org; Mon, 21 Sep 2015 16:22:36 -0400 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:34026) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Ze7be-0004UX-Ir for 21526@debbugs.gnu.org; Mon, 21 Sep 2015 16:22:35 -0400 Original-Received: from ceviche.home (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id t8LKMW3V012516; Mon, 21 Sep 2015 16:22:33 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id C41226614D; Mon, 21 Sep 2015 16:22:31 -0400 (EDT) In-Reply-To: (Markus Triska's message of "Mon, 21 Sep 2015 08:02:32 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV5436=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5436> : inlines <3851> : streams <1509038> : uri <2045823> 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: 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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:106795 Archived-At: > When I try it with your patch, it fails to indent subsequent lines. Ugh! That should be fixed now (see patch below). >> IIUC the only remaining issue is the indentation we get when the line is >> empty. > This issue also remains. Thank you! Right. This one requires thinking (but will benefit other modes as well). Stefan diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index 24ac8d7..8c02e54 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el @@ -2081,7 +2081,7 @@ Argument BOUND is a buffer position limiting searching." (defun prolog-find-unmatched-paren () "Return the column of the last unmatched left parenthesis." (save-excursion - (goto-char (or (car (nth 9 (syntax-ppss))) (point-min))) + (goto-char (or (nth 1 (syntax-ppss)) (point-min))) (current-column)))