From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Leo Liu Newsgroups: gmane.emacs.bugs Subject: bug#14350: 24.3; octave mode comment indentation Date: Sat, 11 May 2013 13:14:24 +0800 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1368249300 586 80.91.229.3 (11 May 2013 05:15:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 11 May 2013 05:15:00 +0000 (UTC) Cc: 14350@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat May 11 07:14:58 2013 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 1Ub292-0004pF-0e for geb-bug-gnu-emacs@m.gmane.org; Sat, 11 May 2013 07:14:56 +0200 Original-Received: from localhost ([::1]:53505 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ub291-00015N-IB for geb-bug-gnu-emacs@m.gmane.org; Sat, 11 May 2013 01:14:55 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:57165) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ub28v-000156-JT for bug-gnu-emacs@gnu.org; Sat, 11 May 2013 01:14:52 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ub28u-0002MJ-Lg for bug-gnu-emacs@gnu.org; Sat, 11 May 2013 01:14:49 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:60241) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ub28u-0002MF-ID for bug-gnu-emacs@gnu.org; Sat, 11 May 2013 01:14:48 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1Ub297-00036l-Kt for bug-gnu-emacs@gnu.org; Sat, 11 May 2013 01:15:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Leo Liu Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 11 May 2013 05:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 14350 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 14350-submit@debbugs.gnu.org id=B14350.136824929111908 (code B ref 14350); Sat, 11 May 2013 05:15:01 +0000 Original-Received: (at 14350) by debbugs.gnu.org; 11 May 2013 05:14:51 +0000 Original-Received: from localhost ([127.0.0.1]:36117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Ub28x-000360-GA for submit@debbugs.gnu.org; Sat, 11 May 2013 01:14:51 -0400 Original-Received: from mail-pd0-f173.google.com ([209.85.192.173]:48815) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Ub28u-00035j-Mf for 14350@debbugs.gnu.org; Sat, 11 May 2013 01:14:49 -0400 Original-Received: by mail-pd0-f173.google.com with SMTP id v10so3217059pde.18 for <14350@debbugs.gnu.org>; Fri, 10 May 2013 22:14:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:references:face:date:in-reply-to :message-id:user-agent:mime-version:content-type; bh=X53Xb7VQo/pRGhRuNJaZaIp7xI0kBC1AMilBWHRKQog=; b=K3UK6JH5fM1Nez0t8MmhXlp2iKF7iCevoc7848QZjJD3fdRQ/DR6OZllUkUFr8vrAV wCNEk91nTwANOAClE261h/xqnce2E9KKSxINqvlICE7m6V2UFNYBgcJPO7n8olWoKAdm 5W3ZdRAaCb7iA1m6rvdLT2T0ZDo4hx7F9pSemlkeqYI1YcovHl09z9uMki1Yv3GTEb4M jyDdN89X7ZvmVf06pZX5jhAZ0jzslUy4pByXfjDtGfzS3qb2AxQPvd8T5Dh+KyFJDbLa Sy1aaHshdnBUDWjrBz2MZ7AcT2jGwPLysB9Ndb7mOXrtrb4ynrpTpZwsjqnePBmM20dE 2PUw== X-Received: by 10.68.129.100 with SMTP id nv4mr19304886pbb.178.1368249274214; Fri, 10 May 2013 22:14:34 -0700 (PDT) Original-Received: from Zeuss-MacBook.local (li511-224.members.linode.com. [66.175.216.224]) by mx.google.com with ESMTPSA id 10sm5129671pbr.45.2013.05.10.22.14.31 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 10 May 2013 22:14:33 -0700 (PDT) Face: iVBORw0KGgoAAAANSUhEUgAAACgAAAAoBAMAAAB+0KVeAAAAElBMVEUAAAAAAP+LRRP0pGC+ vr7///+7mT1iAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9cBBwMO DhglKe4AAAEsSURBVCjPbZNBboQwDEV/Cd4X9QJRThApmn0XYW+Jyf2v0m+HhqDBgiAe9rcTG7QH w/1Vn2Ar8gBb/ocywSN3qK9T3z4eFDB4eApocBpeBs1RSykoJd8gQcm8pGmHXFso3ajnmsqV0TnY DQkOfXUfN5NwaI7AWTVOyEhcu1aHmdWItHddUVUcUgUBCkitu8V6ditHVOVdqzl2EQ1ZVGTbdK0V 7cqn8vWzoU5Q/bF9Y/Y0cRU1xwkys5dJ+Dt6pBDWifcNQml8Gh2JVmPSoQzo7en0grswkxrUGYJ7 0hSxxAGr7ZMwYcHIzprpi7TENEE1xtiYxixRlCfPBsUUrwHD7uGIwATrbnODJcVrPpVn3hxiGloe m/S+z3CtuzUSMo83N4DPH+F0evwR3P4A2k+75838OKQAAAAASUVORK5CYII= In-Reply-To: (Stefan Monnier's message of "Fri, 10 May 2013 23:35:14 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (OS X 10.8.3) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.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:74155 Archived-At: On 2013-05-11 11:35 +0800, Stefan Monnier wrote: > No, no, you don't. smie-indent-functions is just a hook that runs > functions that come up with some indentation choice. It basically sits > between line-indent-function and smie proper. You can add your own > function which will not itself need to use anything from smie. > Look at its docstring. I intend to fix the bug with this patch. Comments? diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el index 780bb2f5..5d8186f5 100644 --- a/lisp/progmodes/octave.el +++ b/lisp/progmodes/octave.el @@ -414,6 +414,13 @@ (defun octave-smie-rules (kind token) ;; (if (smie-parent-p "switch") 4) 0)))) +(defun octave-indent-comment () + "A function for `smie-indent-functions'." + (save-excursion + (back-to-indentation) + (when (and (looking-at-p "\\s<") (not (looking-at-p "\\s<\\s<"))) + (comment-choose-indent)))) + (defvar octave-font-lock-keywords (list @@ -488,6 +495,7 @@ (define-derived-mode octave-mode prog-mode "Octave" :forward-token #'octave-smie-forward-token :backward-token #'octave-smie-backward-token) (setq-local smie-indent-basic 'octave-block-offset) + (add-hook 'smie-indent-functions #'octave-indent-comment nil t) (setq-local smie-blink-matching-triggers (cons ?\; smie-blink-matching-triggers))