Re: [jidanni@jidanni.org: shell-script-mode case indenting]

[Michael Welsh Duggan <md5i@cs.cmu.edu>]

[-- Attachment #1: Type: text/plain, Size: 319 bytes --]

Richard Stallman <rms@gnu.org> 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.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1312 bytes --]

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 ()

[-- Attachment #3: Type: text/plain, Size: 44 bytes --]


-- 
Michael Welsh Duggan
(md5i@cs.cmu.edu)

[-- Attachment #4: Type: text/plain, Size: 142 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel