From: Michael Welsh Duggan <md5i@cs.cmu.edu>
Cc: emacs-devel@gnu.org
Subject: Re: [jidanni@jidanni.org: shell-script-mode case indenting]
Date: Thu, 21 Sep 2006 18:29:56 -0400 [thread overview]
Message-ID: <87k63wc0pn.fsf@cs.cmu.edu> (raw)
In-Reply-To: <E1GQUx7-0000eH-Ns@fencepost.gnu.org> (Richard Stallman's message of "Thu\, 21 Sep 2006 16\:15\:21 -0400")
[-- Attachment #1: Type: text/plain, Size: 1223 bytes --]
Richard Stallman <rms@gnu.org> 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 <jidanni@jidanni.org>
> Subject: shell-script-mode case indenting
> To: emacs-pretest-bug@gnu.org
> 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:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 2322 bytes --]
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 ()
[-- 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
next prev parent reply other threads:[~2006-09-21 22:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-21 20:15 [jidanni@jidanni.org: shell-script-mode case indenting] Richard Stallman
2006-09-21 22:29 ` Michael Welsh Duggan [this message]
2006-09-22 17:01 ` Richard Stallman
2006-09-30 20:06 ` Glenn Morris
2006-10-01 15:15 ` Richard Stallman
2006-10-01 18:38 ` Michael Welsh Duggan
2006-10-01 23:43 ` Glenn Morris
2006-10-02 14:37 ` Stefan Monnier
2006-10-03 19:22 ` Michael Welsh Duggan
2006-10-03 19:41 ` Stefan Monnier
2006-10-04 3:33 ` Michael Welsh Duggan
2006-10-04 4:09 ` Stefan Monnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87k63wc0pn.fsf@cs.cmu.edu \
--to=md5i@cs.cmu.edu \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.