From: Rüdiger Sonderfeld <ruediger@c-plusplus.de>
Date: Mon, 30 Sep 2013 01:13:19 +0000 (+0800)
Subject: * progmodes/octave.el (inferior-octave-startup-file): Prefer
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1424
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=481a8e0f453026bdb4ab3c81e783f17060d892b0;p=emacs.git

* progmodes/octave.el (inferior-octave-startup-file): Prefer
~/.emacs.d/init_octave.m.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3e689f443ce..4eb0e7ec584 100644
--- 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 899f2752a7e..51cee8b2989 100644
--- 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."