[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: address@hidden: shell-script-mode case indenting]
From: |
Michael Welsh Duggan |
Subject: |
Re: address@hidden: shell-script-mode case indenting] |
Date: |
Thu, 21 Sep 2006 18:29:56 -0400 |
User-agent: |
Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) |
Richard Stallman <address@hidden> writes:
> Would someone please DTRT and ack? This is not a must-fix bug, since
> perfect indentation in Shell Script mode is too much to hope for, but
> we should fix it if it isn't hard.
>
> From: Dan Jacobson <address@hidden>
> Subject: shell-script-mode case indenting
> To: address@hidden
> Date: Thu, 21 Sep 2006 18:28:18 +0800
> X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=failed
> version=3.0.4
>
> Pressing TAB on each line in this file.sh produces the first line of
> this case expression indented different than the rest:
> (sed 's/.$/ &/'|while read route company; do case $company in
> r)set ???? Renyou;;
> z)set ???? Taizhong;;
> q)set ???? Quanhang;;
> j)set ???? Juye;;
> t)set ???? Tonglian;;
> *)echo $company: HUH? 1>&2;exit 55;;
> esac; echo "[[????:???? ${1}???? - Operator $2 Bus Co.]]" \
> >> $route; done)<<EOF
> 001r
> 005q
> 006r
> EOF
The following patch attempts to take `sh-leading-keywords' into account
when calculating (sh-prev-thing). This patch seems to work in this
and a few other cases I played around with, but I make no guarantees
that I haven't broken something along the way:
Index: sh-script.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/sh-script.el,v
retrieving revision 1.186
diff -u -p -r1.186 sh-script.el
--- sh-script.el 8 Aug 2006 15:09:25 -0000 1.186
+++ sh-script.el 21 Sep 2006 22:26:28 -0000
@@ -2473,33 +2473,42 @@ we go to the end of the previous line an
(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)
- (error "point %d < min-point %d" (point) min-point))
- (cond
- ((looking-at "\\s-*;;")
- ;; (message "Found ;; !")
- ";;")
- ((or (eq c ?\n)
- (eq c nil)
- (eq c ?\;))
- (save-excursion
- ;; skip forward over white space newline and \ at eol
- (skip-chars-forward " \t\n\\\\")
- (sh-debug "Now at %d start=%d" (point) start)
- (if (>= (point) start)
- (progn
- (sh-debug "point: %d >= start: %d" (point) start)
- nil)
- (sh-get-word))
- ))
- (t
- ;; c -- return a string
- (char-to-string c)
- ))
- )))
+ (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)
+ (error "point %d < min-point %d" (point) min-point))
+ (cond
+ ((looking-at "\\s-*;;")
+ ;; (message "Found ;; !")
+ ";;")
+ ((or (eq c ?\n)
+ (eq c nil)
+ (eq c ?\;))
+ (let (done kwd next
+ (boundary (point)))
+ (skip-chars-forward " \t\n\\\\")
+ (while (and (not done) (not (eobp)))
+ (if next (setq boundary next))
+ ;; skip forward over white space newline and \ at eol
+ (sh-debug "Now at %d start=%d" (point) start)
+ (if (>= (point) start)
+ (progn
+ (sh-debug "point: %d >= start: %d" (point) start)
+ nil)
+ (setq kwd (sh-get-word))
+ (unless (eobp) (forward-char 1))
+ (if (member kwd (sh-feature sh-leading-keywords))
+ (setq next (point))
+ (setq done t)))
+ (skip-chars-forward " \t\n\\\\"))
+ (goto-char boundary)
+ kwd))
+ (t
+ ;; c -- return a string
+ (char-to-string c)
+ ))
+ )))))
(defun sh-this-is-a-continuation ()
--
Michael Welsh Duggan
(address@hidden)