From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Markus Triska Newsgroups: gmane.emacs.bugs Subject: bug#21526: 24.5; prolog-mode: broken indentation for if-then-else construct Date: Fri, 02 Oct 2015 18:23:25 +0200 Message-ID: <87y4fltf2a.fsf@metalevel.at> References: <87y4fo9zt6.fsf@metalevel.at> <87vbarwy9v.fsf@metalevel.at> <87bncjbpz4.fsf@metalevel.at> <87mvw3cdmf.fsf@metalevel.at> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1443805446 6632 80.91.229.3 (2 Oct 2015 17:04:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 2 Oct 2015 17:04:06 +0000 (UTC) Cc: 21526@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Oct 02 19:03:59 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 1Zi3kS-0000qA-OA for geb-bug-gnu-emacs@m.gmane.org; Fri, 02 Oct 2015 19:03:56 +0200 Original-Received: from localhost ([::1]:33650 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zi3kS-000647-2R for geb-bug-gnu-emacs@m.gmane.org; Fri, 02 Oct 2015 13:03:56 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53757) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zi37t-00048a-OY for bug-gnu-emacs@gnu.org; Fri, 02 Oct 2015 12:24:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zi37q-0008Cx-Kf for bug-gnu-emacs@gnu.org; Fri, 02 Oct 2015 12:24:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:35148) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zi37q-0008Cl-II for bug-gnu-emacs@gnu.org; Fri, 02 Oct 2015 12:24:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Zi37q-00025r-4L for bug-gnu-emacs@gnu.org; Fri, 02 Oct 2015 12:24:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Markus Triska Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 02 Oct 2015 16:24:02 +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.14438030098003 (code B ref 21526); Fri, 02 Oct 2015 16:24:02 +0000 Original-Received: (at 21526) by debbugs.gnu.org; 2 Oct 2015 16:23:29 +0000 Original-Received: from localhost ([127.0.0.1]:52352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Zi37I-000250-NK for submit@debbugs.gnu.org; Fri, 02 Oct 2015 12:23:28 -0400 Original-Received: from static.59.150.47.78.clients.your-server.de ([78.47.150.59]:55989 helo=metalevel.at) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Zi37G-00024r-V5 for 21526@debbugs.gnu.org; Fri, 02 Oct 2015 12:23:27 -0400 Original-Received: by metalevel.at (Postfix, from userid 1000) id E5ABCEC103; Fri, 2 Oct 2015 18:23:25 +0200 (CEST) In-Reply-To: (Stefan Monnier's message of "Thu, 01 Oct 2015 10:07:04 -0400") 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:107219 Archived-At: > Other than that, looks good, please install. I cannot push to the Emacs repository, but an updated and extended patch follows. Importantly, this makes the mode also support *-> (soft cut). All the best, Markus 2015-10-02 Markus Triska * prolog.el: Update and extend operator table. (prolog-smie-grammar): Add multifile, public etc. diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index ff2769e..81aeb8d 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el @@ -877,12 +877,21 @@ prolog-smie-grammar ;; manual uses precedence levels in the opposite sense (higher ;; numbers bind less tightly) than SMIE, so we use negative numbers. '(("." -10000 -10000) + ("?-" nil -1200) (":-" -1200 -1200) ("-->" -1200 -1200) + ("discontiguous" nil -1150) + ("dynamic" nil -1150) + ("meta_predicate" nil -1150) + ("module_transparent" nil -1150) + ("multifile" nil -1150) + ("public" nil -1150) + ("|" -1105 -1105) (";" -1100 -1100) + ("*->" -1050 -1050) ("->" -1050 -1050) ("," -1000 -1000) - ("\\+" -900 -900) + ("\\+" nil -900) ("=" -700 -700) ("\\=" -700 -700) ("=.." -700 -700)