* doc/misc/octave-mode.texi (Using Octave Mode): Remove outdated stuff

about RET and indentation.  E.g., octave-reindent-then-newline-and-indent
was removed three years ago.

When you delete commands, please use grep to check for references to them.

2 files changed, 5 insertions, 33 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 6e6146091f0..5458b6b407e 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-12  Glenn Morris  <rgm@gnu.org>
+
+        * octave-mode.texi (Using Octave Mode): Remove outdated stuff
+        about RET and indentation.
+
 2014-03-03  Juanma Barranquero  <lekktu@gmail.com>
 
         * gnus.texi:
diff --git a/doc/misc/octave-mode.texi b/doc/misc/octave-mode.texi
index 6dde042a315..cc2e4c305cd 100644
--- a/doc/misc/octave-mode.texi
+++ b/doc/misc/octave-mode.texi
@@ -148,39 +148,6 @@ and return values which have to be entered without parentheses
 in one of your Emacs startup files.
 @end table
 
-@c FIXME: `electric-indent-mode' is enabled by default in GNU Emacs 24.4.
-A common problem is that the @key{RET} key does @emph{not} indent the
-line to where the new text should go after inserting the newline.  This
-is because the standard Emacs convention is that @key{RET} (aka
-@kbd{C-m}) just adds a newline, whereas @key{LFD} (aka @kbd{C-j}) adds a
-newline and indents it.  This is particularly inconvenient for users with
-keyboards which do not have a special @key{LFD} key at all; in such
-cases, it is typically more convenient to use @key{RET} as the @key{LFD}
-key (rather than typing @kbd{C-j}).
-
-You can make @key{RET} do this by adding
-@lisp
-(define-key octave-mode-map "\C-m"
-  'octave-reindent-then-newline-and-indent)
-@end lisp
-@noindent
-to one of your Emacs startup files.  Another, more generally applicable
-solution is
-@lisp
-(defun RET-behaves-as-LFD ()
-  (let ((x (key-binding "\C-j")))
-    (local-set-key "\C-m" x)))
-(add-hook 'octave-mode-hook 'RET-behaves-as-LFD)
-@end lisp
-@noindent
-(this works for all modes by adding to the startup hooks, without
-having to know the particular binding of @key{RET} in that mode!).
-Similar considerations apply for using @key{M-RET} as @key{M-LFD}.  As
-@email{bwarsaw@@cnri.reston.va.us, Barry A. Warsaw} says in the
-documentation for his @code{cc-mode}, ``This is a very common
-question.  @code{:-)} If you want this to be the default behavior,
-don't lobby me, lobby RMS!''
-
 The following variables can be used to customize Octave mode.
 
 @vtable @code