summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2008-09-12 03:09:30 +0000
committerGlenn Morris <rgm@gnu.org>2008-09-12 03:09:30 +0000
commit835963480419fcb737b6eb0f7ed0bda1f317159e (patch)
tree0fa6467cde2e3201197498c87ec13e31286b6aea
parentdf321f09135179e786c0da17a4a3fb0d573d8216 (diff)
downloademacs-835963480419fcb737b6eb0f7ed0bda1f317159e.tar.gz
(f90-mode-map): Don't bind \t and \r.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/progmodes/f90.el5
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 701cfca5aed..087317bcdca 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
2008-09-12 Glenn Morris <rgm@gnu.org>
+ * progmodes/f90.el (f90-mode-map): Don't bind \t and \r.
+
* indent.el (indent-line-function): Doc fix.
* progmodes/sh-script.el (sh-font-lock-open-heredoc): Doc fix.
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 6e5dee5130a..a53e103c6f8 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -653,7 +653,7 @@ Can be overridden by the value of `font-lock-maximum-decoration'.")
(define-key map "\C-\M-p" 'f90-beginning-of-block)
(define-key map "\C-\M-q" 'f90-indent-subprogram)
(define-key map "\C-j" 'f90-indent-new-line) ; LFD equals C-j
- (define-key map "\r" 'newline)
+;;; (define-key map "\r" 'newline)
(define-key map "\C-c\r" 'f90-break-line)
;;; (define-key map [M-return] 'f90-break-line)
(define-key map "\C-c\C-a" 'f90-previous-block)
@@ -663,7 +663,8 @@ Can be overridden by the value of `font-lock-maximum-decoration'.")
(define-key map "\C-c\C-p" 'f90-previous-statement)
(define-key map "\C-c\C-n" 'f90-next-statement)
(define-key map "\C-c\C-w" 'f90-insert-end)
- (define-key map "\t" 'f90-indent-line)
+ ;; Standard tab binding will call this, and also handle regions.
+;;; (define-key map "\t" 'f90-indent-line)
(define-key map "," 'f90-electric-insert)
(define-key map "+" 'f90-electric-insert)
(define-key map "-" 'f90-electric-insert)