From: "John W. Eaton" <jwe@bevo.che.wisc.edu>
To: emacs-devel@gnu.org
Cc: Kurt.Hornik@wu-wien.ac.at, GAIL <gail@tnp-online.de>,
rms@gnu.org, John Eaton <jwe@bevo.che.wisc.edu>
Subject: Re: [gail@tnp-online.de: octave-mod.el: wrong indentation for "IF", "FOR", etc.]
Date: Wed, 10 Oct 2007 11:38:08 -0400 [thread overview]
Message-ID: <18188.61920.576598.871247@segfault.lan> (raw)
In-Reply-To: <18188.40056.604794.828796@mithrandir.hornik.net>
[-- Attachment #1: message body text --]
[-- Type: text/plain, Size: 1189 bytes --]
On 10-Oct-2007, Kurt Hornik wrote:
| >>>>> Richard Stallman writes:
|
| > Can you please send the apropriate fix to emacs-devel@gnu.org,
| > then ack this message?
|
| I assume this means that in all functions using looking-at() or
| re-search-forward() with possibly case sensitive regexps one needs to
| let() case-fold-search to nil?
Thanks.
How about the attached patch then?
Here's the original message:
------- Start of forwarded message -------
X-Spam-Status: No, score=0.0 required=5.0 tests=UNPARSEABLE_RELAY
autolearn=failed version=3.1.0
Date: Mon, 08 Oct 2007 13:17:49 +0200
From: GAIL <gail@tnp-online.de>
MIME-Version: 1.0
To: bug-gnu-emacs@gnu.org
Content-Type: text/plain; charset=ISO-8859-15; format=flowed
Subject: octave-mod.el: wrong indentation for "IF", "FOR", etc.
In octave-mode, depending on toggle-case-fold-search, octave-indent-line produces either this
IF = 1 ;
x = 2 ;
or that:
IF = 1 ;
x = 2 ;
(via the function re-search-backward). The second behavior is obviously nonsense. Similar for "FOR" etc.
I verified the behavior for emacs-20.7.1/octave-2.1.34 and emacs 22.1.1/octave 2.9.14.
G.
------- End of forwarded message -------
jwe
[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 4646 bytes --]
lisp/ChangeLog:
2007-10-10 John W. Eaton <jwe@octave.org>
* progmodes/octave-mod.el (octave-looking-at-kw,
octave-re-search-forward-kw, octave-re-search-backward-kw):
New functions.
(octave-in-defun-p, calculate-octave-indent,
octave-blink-matching-block-open, octave-beginning-of-defun,
octave-auto-fill): Use octave-looking-at-kw instead of looking-at
to search for regexps that contain case-sensitive keywords.
(octave-beginning-of-defun): Use octave-re-search-backward-kw
instead of re-search-backward to search for regexps that contain
case-sensitive keywords.
(octave-scan-blocks): Likewise, for octave-re-search-forward-kw.
Index: lisp/progmodes/octave-mod.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/octave-mod.el,v
retrieving revision 1.39
diff -u -u -r1.39 octave-mod.el
--- lisp/progmodes/octave-mod.el 6 Oct 2007 01:48:02 -0000 1.39
+++ lisp/progmodes/octave-mod.el 10 Oct 2007 15:34:27 -0000
@@ -581,13 +581,25 @@
(error nil))
(< pos (point)))))
+(defun octave-looking-at-kw (regexp)
+ (let ((case-fold-search nil))
+ (looking-at regexp)))
+
+(defun octave-re-search-forward-kw (regexp)
+ (let ((case-fold-search nil))
+ (re-search-forward regexp nil 'move inc)))
+
+(defun octave-re-search-backward-kw (regexp)
+ (let ((case-fold-search nil))
+ (re-search-backward regexp nil 'move inc)))
+
(defun octave-in-defun-p ()
"Return t if point is inside an Octave function declaration.
The function is taken to start at the `f' of `function' and to end after
the end keyword."
(let ((pos (point)))
(save-excursion
- (or (and (looking-at "\\<function\\>")
+ (or (and (octave-looking-at-kw "\\<function\\>")
(octave-not-in-string-or-comment-p))
(and (octave-beginning-of-defun)
(condition-case nil
@@ -658,14 +670,14 @@
(while (< (point) eol)
(if (octave-not-in-string-or-comment-p)
(cond
- ((looking-at "\\<switch\\>")
+ ((octave-looking-at-kw "\\<switch\\>")
(setq icol (+ icol (* 2 octave-block-offset))))
- ((looking-at octave-block-begin-regexp)
+ ((octave-looking-at-kw octave-block-begin-regexp)
(setq icol (+ icol octave-block-offset)))
- ((looking-at octave-block-else-regexp)
+ ((octave-looking-at-kw octave-block-else-regexp)
(if (= bot (point))
(setq icol (+ icol octave-block-offset))))
- ((looking-at octave-block-end-regexp)
+ ((octave-looking-at-kw octave-block-end-regexp)
(if (not (= bot (point)))
(setq icol (- icol
(octave-block-end-offset)))))))
@@ -675,10 +687,10 @@
(save-excursion
(back-to-indentation)
(cond
- ((and (looking-at octave-block-else-regexp)
+ ((and (octave-looking-at-kw octave-block-else-regexp)
(octave-not-in-string-or-comment-p))
(setq icol (- icol octave-block-offset)))
- ((and (looking-at octave-block-end-regexp)
+ ((and (octave-looking-at-kw octave-block-end-regexp)
(octave-not-in-string-or-comment-p))
(setq icol (- icol (octave-block-end-offset))))
((or (looking-at "\\s<\\s<\\s<\\S<")
@@ -854,8 +866,8 @@
(save-excursion
(while (/= count 0)
(catch 'foo
- (while (or (re-search-forward
- octave-block-begin-or-end-regexp nil 'move inc)
+ (while (or (octave-re-search-forward-kw
+ octave-block-begin-or-end-regexp)
(if (/= depth 0)
(error "Unbalanced block")))
(if (octave-not-in-string-or-comment-p)
@@ -974,7 +986,7 @@
(looking-at "\\>")
(save-excursion
(skip-syntax-backward "w")
- (looking-at octave-block-else-or-end-regexp)))
+ (octave-looking-at-kw octave-block-else-or-end-regexp)))
(save-excursion
(cond
((match-end 1)
@@ -1021,11 +1033,11 @@
(inc (if (> arg 0) 1 -1))
(found))
(and (not (eobp))
- (not (and (> arg 0) (looking-at "\\<function\\>")))
+ (not (and (> arg 0) (octave-looking-at-kw "\\<function\\>")))
(skip-syntax-forward "w"))
(while (and (/= arg 0)
(setq found
- (re-search-backward "\\<function\\>" nil 'move inc)))
+ (octave-re-search-backward-kw "\\<function\\>")))
(if (octave-not-in-string-or-comment-p)
(setq arg (- arg inc))))
(if found
@@ -1078,7 +1090,7 @@
(save-excursion
(beginning-of-line)
(and auto-fill-inhibit-regexp
- (looking-at auto-fill-inhibit-regexp))))
+ (octave-looking-at-kw auto-fill-inhibit-regexp))))
nil ; Can't do anything
(if (and (not (octave-in-comment-p))
(> (current-column) fc))
[-- Attachment #3: Type: text/plain, Size: 142 bytes --]
_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel
next parent reply other threads:[~2007-10-10 15:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <E1If3fk-0003hN-Nr@fencepost.gnu.org>
[not found] ` <18188.40056.604794.828796@mithrandir.hornik.net>
2007-10-10 15:38 ` John W. Eaton [this message]
2007-10-11 5:20 ` [gail@tnp-online.de: octave-mod.el: wrong indentation for "IF", "FOR", etc.] Richard Stallman
2007-10-12 1:23 ` Glenn Morris
2007-10-12 1:57 ` John W. Eaton
2007-10-12 15:59 ` Richard Stallman
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=18188.61920.576598.871247@segfault.lan \
--to=jwe@bevo.che.wisc.edu \
--cc=Kurt.Hornik@wu-wien.ac.at \
--cc=emacs-devel@gnu.org \
--cc=gail@tnp-online.de \
--cc=rms@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.