aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2004-11-04 10:16:51 +0000
committerRichard M. Stallman2004-11-04 10:16:51 +0000
commit5e6c7c3c8d44bc2545db281cce97a6aa07387d15 (patch)
tree53c66517a76019153abd24e77ebd661949b2abe6
parent2de9d0c3be3d4e02d57ae96ae5bfe40cd4f45767 (diff)
downloademacs-5e6c7c3c8d44bc2545db281cce97a6aa07387d15.tar.gz
emacs-5e6c7c3c8d44bc2545db281cce97a6aa07387d15.zip
(f90-end-of-block): Don't use interactive-p.
-rw-r--r--lisp/progmodes/f90.el8
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 53165fbecb7..a1c4d539dd7 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -1223,14 +1223,16 @@ Return (TYPE NAME), or nil if not found."
1223With optional argument NUM, go forward that many balanced blocks. 1223With optional argument NUM, go forward that many balanced blocks.
1224If NUM is negative, go backward to the start of a block. 1224If NUM is negative, go backward to the start of a block.
1225Checks for consistency of block types and labels (if present), 1225Checks for consistency of block types and labels (if present),
1226and completes outermost block if necessary." 1226and completes outermost block if necessary.
1227Some of these things (which?) are not done if NUM is nil,
1228which only happens in a noninteractive call."
1227 (interactive "p") 1229 (interactive "p")
1228 (if (and num (< num 0)) (f90-beginning-of-block (- num))) 1230 (if (and num (< num 0)) (f90-beginning-of-block (- num)))
1229 (let ((f90-smart-end nil) ; for the final `f90-match-end' 1231 (let ((f90-smart-end nil) ; for the final `f90-match-end'
1230 (case-fold-search t) 1232 (case-fold-search t)
1231 (count (or num 1)) 1233 (count (or num 1))
1232 start-list start-this start-type start-label end-type end-label) 1234 start-list start-this start-type start-label end-type end-label)
1233 (if (interactive-p) (push-mark (point) t)) 1235 (if num (push-mark (point) t))
1234 (end-of-line) ; probably want this 1236 (end-of-line) ; probably want this
1235 (while (and (> count 0) (re-search-forward f90-blocks-re nil 'move)) 1237 (while (and (> count 0) (re-search-forward f90-blocks-re nil 'move))
1236 (beginning-of-line) 1238 (beginning-of-line)
@@ -1266,7 +1268,7 @@ and completes outermost block if necessary."
1266 (end-of-line)) 1268 (end-of-line))
1267 (if (> count 0) (error "Missing block end")) 1269 (if (> count 0) (error "Missing block end"))
1268 ;; Check outermost block. 1270 ;; Check outermost block.
1269 (if (interactive-p) 1271 (if num
1270 (save-excursion 1272 (save-excursion
1271 (beginning-of-line) 1273 (beginning-of-line)
1272 (skip-chars-forward " \t0-9") 1274 (skip-chars-forward " \t0-9")