From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michael Welsh Duggan Newsgroups: gmane.emacs.devel Subject: Re: [jidanni@jidanni.org: shell-script-mode case indenting] Date: Sun, 01 Oct 2006 14:38:51 -0400 Message-ID: <87odsvop8k.fsf@cs.cmu.edu> References: <87k63wc0pn.fsf@cs.cmu.edu> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: sea.gmane.org 1159728097 4338 80.91.229.2 (1 Oct 2006 18:41:37 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sun, 1 Oct 2006 18:41:37 +0000 (UTC) Cc: Glenn Morris , jidanni@jidanni.org, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Oct 01 20:41:34 2006 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1GU6Fo-00083t-S7 for ged-emacs-devel@m.gmane.org; Sun, 01 Oct 2006 20:41:33 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GU6Fo-0001qR-DM for ged-emacs-devel@m.gmane.org; Sun, 01 Oct 2006 14:41:32 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1GU6Fd-0001q3-PB for emacs-devel@gnu.org; Sun, 01 Oct 2006 14:41:21 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1GU6Fc-0001nj-79 for emacs-devel@gnu.org; Sun, 01 Oct 2006 14:41:21 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GU6Fc-0001nX-4P for emacs-devel@gnu.org; Sun, 01 Oct 2006 14:41:20 -0400 Original-Received: from [205.201.10.244] (helo=maru) by monty-python.gnu.org with esmtp (Exim 4.52) id 1GU6LM-0006my-VY; Sun, 01 Oct 2006 14:47:17 -0400 Original-Received: from md5i by maru with local (Exim 4.63) (envelope-from ) id 1GU6DD-0006sQ-7y; Sun, 01 Oct 2006 14:38:51 -0400 Original-To: rms@gnu.org In-Reply-To: (Richard Stallman's message of "Sun\, 01 Oct 2006 11\:15\:46 -0400") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:60360 Archived-At: --=-=-= Richard Stallman writes: > And now indentation of ordinary case blocks is wrong: > > Should we take out that change, or what? This should fix the problem. I was originally messed up by the fact that the `unless' body in the original code was not indented, and due to that misplaced a parentheses. --=-=-= Content-Type: text/x-patch Content-Disposition: inline Index: sh-script.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/progmodes/sh-script.el,v retrieving revision 1.187 diff -u -p -c -r1.187 sh-script.el cvs diff: conflicting specifications of output style *** sh-script.el 30 Sep 2006 09:38:45 -0000 1.187 --- sh-script.el 1 Oct 2006 18:35:31 -0000 *************** we go to the end of the previous line an *** 2472,2479 **** (point)) (skip-chars-backward " \t;") (unless (looking-at "\\s-*;;") ! (skip-chars-backward "^)}];\"'`({[") ! (setq c (char-before)) (sh-debug "stopping at %d c is %s start=%d min-point=%d" (point) c start min-point) (if (< (point) min-point) --- 2472,2479 ---- (point)) (skip-chars-backward " \t;") (unless (looking-at "\\s-*;;") ! (skip-chars-backward "^)}];\"'`({[") ! (setq c (char-before))) (sh-debug "stopping at %d c is %s start=%d min-point=%d" (point) c start min-point) (if (< (point) min-point) *************** we go to the end of the previous line an *** 2508,2514 **** ;; c -- return a string (char-to-string c) )) ! ))))) (defun sh-this-is-a-continuation () --- 2508,2514 ---- ;; c -- return a string (char-to-string c) )) ! )))) (defun sh-this-is-a-continuation () --=-=-= -- Michael Welsh Duggan (md5i@cs.cmu.edu) --=-=-= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-devel mailing list Emacs-devel@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-devel --=-=-=--