* progmodes/octave.el (inferior-octave-startup-file): Prefer

~/.emacs.d/init_octave.m.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3e689f443cec553c352512ee73c272aa35777fcc..4eb0e7ec5849f24aac12f642d64b8e13f9a4aef4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-30  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
+
+       * progmodes/octave.el (inferior-octave-startup-file): Prefer
+       ~/.emacs.d/init_octave.m.
+
 2013-09-29  Dmitry Gutov  <dgutov@yandex.ru>
 
        * emacs-lisp/package.el (package-desc-from-define): Accept

diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index 899f2752a7e025cf66d10504cb8cba5d5c211f6b..51cee8b2989116b6a869ee79f605e0a969f4989a 100644 (file)
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -609,8 +609,8 @@ See `comint-prompt-read-only' for details."
   :version "24.4")
 
 (defcustom inferior-octave-startup-file
-  (convert-standard-filename
-   (concat "~/.emacs-" (file-name-nondirectory inferior-octave-program)))
+  (let ((n (file-name-nondirectory inferior-octave-program)))
+    (locate-user-emacs-file (format "init_%s.m" n) (format ".emacs-%s" n)))
   "Name of the inferior Octave startup file.
 The contents of this file are sent to the inferior Octave process on
 startup."