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#17818: 24.3.91; sh-learn-buffer-indent doesn't learn current indent anymore Date: Fri, 20 Jun 2014 17:10:44 -0400 Message-ID: References: <87ha3fy6lv.fsf@marauder.physik.uni-ulm.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1403298687 24588 80.91.229.3 (20 Jun 2014 21:11:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 20 Jun 2014 21:11:27 +0000 (UTC) Cc: 17818@debbugs.gnu.org To: Reiner Steib Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jun 20 23:11:22 2014 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 1Wy65h-0002NJ-GY for geb-bug-gnu-emacs@m.gmane.org; Fri, 20 Jun 2014 23:11:21 +0200 Original-Received: from localhost ([::1]:42854 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wy65h-0004F8-1b for geb-bug-gnu-emacs@m.gmane.org; Fri, 20 Jun 2014 17:11:21 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54383) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wy65W-0004DJ-Cl for bug-gnu-emacs@gnu.org; Fri, 20 Jun 2014 17:11:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wy65O-00034J-SQ for bug-gnu-emacs@gnu.org; Fri, 20 Jun 2014 17:11:10 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35828) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wy65O-00034E-Om for bug-gnu-emacs@gnu.org; Fri, 20 Jun 2014 17:11:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Wy65N-0000RJ-Na for bug-gnu-emacs@gnu.org; Fri, 20 Jun 2014 17:11:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 20 Jun 2014 21:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 17818 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 17818-submit@debbugs.gnu.org id=B17818.14032986521672 (code B ref 17818); Fri, 20 Jun 2014 21:11:01 +0000 Original-Received: (at 17818) by debbugs.gnu.org; 20 Jun 2014 21:10:52 +0000 Original-Received: from localhost ([127.0.0.1]:55211 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wy65E-0000Qu-AL for submit@debbugs.gnu.org; Fri, 20 Jun 2014 17:10:52 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:59937) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wy65C-0000Qh-OW for 17818@debbugs.gnu.org; Fri, 20 Jun 2014 17:10:51 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArYGAIDvNVNLd+D9/2dsb2JhbABZgwaDSr0vgw6BFxd0giUBAQEBAgFWIwULCzQSFBgNJIgECNIZF456B4Q4BKkZgWqBcYFbIQ X-IPAS-Result: ArYGAIDvNVNLd+D9/2dsb2JhbABZgwaDSr0vgw6BFxd0giUBAQEBAgFWIwULCzQSFBgNJIgECNIZF456B4Q4BKkZgWqBcYFbIQ X-IronPort-AV: E=Sophos;i="4.97,753,1389762000"; d="scan'208";a="68899959" Original-Received: from 75-119-224-253.dsl.teksavvy.com (HELO pastel.home) ([75.119.224.253]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 20 Jun 2014 17:10:45 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id D2F5661711; Fri, 20 Jun 2014 17:10:44 -0400 (EDT) In-Reply-To: <87ha3fy6lv.fsf@marauder.physik.uni-ulm.de> (Reiner Steib's message of "Fri, 20 Jun 2014 16:54:04 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) 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: 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:90619 Archived-At: > if true; do > echo "My sh-basic-offset offset should be 2." > fi The above "do" should be "then", right? I installed the patch below which fixes some of the problem (the first hunk fixes an incorrect guess and the second fixes the code so the guess is actually activated). Please confirm that the result is OK for your use case. Stefan === modified file 'lisp/emacs-lisp/smie.el' --- lisp/emacs-lisp/smie.el 2014-06-20 01:05:40 +0000 +++ lisp/emacs-lisp/smie.el 2014-06-20 21:07:06 +0000 @@ -2138,7 +2138,7 @@ nil (push (cons (+ offset (nth 2 sig)) sig) rules) ;; Adjust the rest of the data. - (pcase-dolist ((and cotrace `(,count ,toffset ,trace)) + (pcase-dolist ((and cotrace `(,count ,toffset . ,trace)) cotraces) (setf (nth 1 cotrace) (- toffset offset)) (dolist (sig trace) @@ -2167,15 +2167,14 @@ (cond ((null config) (message "Nothing to change")) ((null smie-config--buffer-local) - (message "Local rules set") - (setq smie-config--buffer-local config)) + (smie-config-local config) + (message "Local rules set")) ((y-or-n-p "Replace existing local config? ") (message "Local rules replaced") - (setq smie-config--buffer-local config)) + (smie-config-local config)) ((y-or-n-p "Merge with existing local config? ") (message "Local rules adjusted") - (setq smie-config--buffer-local - (append config smie-config--buffer-local))) + (smie-config-local (append config smie-config--buffer-local))) (t (message "Rules guessed: %S" config)))))