[PATCH 4/4] octave.el: Use `locate-user-emacs-file'.

[Rüdiger Sonderfeld]

Initialize `inferior-octave-startup-file' with
`locate-user-emacs-file' and support new "~/.emacs.d/init_octave.m"
style.

* lisp/progmodes/octave.el (inferior-octave-startup-file): Use
  `locate-user-emacs-file'.

Signed-off-by: Rüdiger Sonderfeld <address@hidden>
---
 lisp/progmodes/octave.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index aeb17d0..1e3e466 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -609,8 +609,9 @@ (defcustom inferior-octave-prompt-read-only comint-prompt-
read-only
   :version "24.4")
 
 (defcustom inferior-octave-startup-file
-  (convert-standard-filename
-   (concat "~/.emacs-" (file-name-nondirectory inferior-octave-program)))
+  (locate-user-emacs-file
+   (concat "init_" (file-name-nondirectory inferior-octave-program) ".m")
+   (concat ".emacs-" (file-name-nondirectory inferior-octave-program)))
   "Name of the inferior Octave startup file.
 The contents of this file are sent to the inferior Octave process on
 startup."
-- 
1.8.4