aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2009-10-06 02:49:02 +0000
committerGlenn Morris2009-10-06 02:49:02 +0000
commit7938ab41f519585bb9c0ebd36673a1c464da723a (patch)
tree9eef5596948bb7fa9045909d4a8a520882bc18b6
parentd47afbc0b0e45845fff95d52af8668b4e18f5473 (diff)
downloademacs-7938ab41f519585bb9c0ebd36673a1c464da723a.tar.gz
emacs-7938ab41f519585bb9c0ebd36673a1c464da723a.zip
(f90-end-of-block, f90-beginning-of-block):
Also push mark in the macro case.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/f90.el6
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 086a82bd3f0..18d49b98817 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
12009-10-06 Glenn Morris <rgm@gnu.org> 12009-10-06 Glenn Morris <rgm@gnu.org>
2 2
3 * progmodes/f90.el (f90-end-of-block, f90-beginning-of-block):
4 * progmodes/fortran.el (fortran-end-of-block)
5 (fortran-beginning-of-block):
6 Also push mark in the macro case.
7
3 * emerge.el (emerge-show-file-name): 8 * emerge.el (emerge-show-file-name):
4 * calc/calc.el (calc-quit): 9 * calc/calc.el (calc-quit):
5 * calc/calc-misc.el (calc-big-or-small): 10 * calc/calc-misc.el (calc-big-or-small):
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 49f908c99f9..3a0fe1dfad7 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -1544,8 +1544,8 @@ for consistency of block types and labels (if present), and
1544completes outermost block if `f90-smart-end' is non-nil. 1544completes outermost block if `f90-smart-end' is non-nil.
1545Interactively, pushes mark before moving point." 1545Interactively, pushes mark before moving point."
1546 (interactive "p") 1546 (interactive "p")
1547 (if (called-interactively-p 'interactive) 1547 ;; Can move some distance.
1548 (push-mark (point) t)) ; can move some distance 1548 (if (called-interactively-p 'any) (push-mark (point) t))
1549 (and num (< num 0) (f90-beginning-of-block (- num))) 1549 (and num (< num 0) (f90-beginning-of-block (- num)))
1550 (let ((f90-smart-end (if f90-smart-end 'no-blink)) ; for final match-end 1550 (let ((f90-smart-end (if f90-smart-end 'no-blink)) ; for final match-end
1551 (case-fold-search t) 1551 (case-fold-search t)
@@ -1601,7 +1601,7 @@ Checks for consistency of block types and labels (if present).
1601Does not check the outermost block, because it may be incomplete. 1601Does not check the outermost block, because it may be incomplete.
1602Interactively, pushes mark before moving point." 1602Interactively, pushes mark before moving point."
1603 (interactive "p") 1603 (interactive "p")
1604 (if (called-interactively-p 'interactive) (push-mark (point) t)) 1604 (if (called-interactively-p 'any) (push-mark (point) t))
1605 (and num (< num 0) (f90-end-of-block (- num))) 1605 (and num (< num 0) (f90-end-of-block (- num)))
1606 (let ((case-fold-search t) 1606 (let ((case-fold-search t)
1607 (count (or num 1)) 1607 (count (or num 1))