[Emacs-diffs] trunk r114485: * progmodes/octave.el (inferior-octave-startup-file): Prefer

[Leo Liu]

------------------------------------------------------------
revno: 114485
revision-id: address@hidden
parent: address@hidden
author: Rüdiger Sonderfeld <address@hidden>
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Mon 2013-09-30 09:13:19 +0800
message:
  * progmodes/octave.el (inferior-octave-startup-file): Prefer
  ~/.emacs.d/init_octave.m.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/octave.el       
octavemod.el-20091113204419-o5vbwnq5f7feedwu-1028

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-29 19:41:00 +0000
+++ b/lisp/ChangeLog    2013-09-30 01:13:19 +0000
@@ -1,3 +1,8 @@
+2013-09-30  Rüdiger Sonderfeld  <address@hidden>
+
+       * progmodes/octave.el (inferior-octave-startup-file): Prefer
+       ~/.emacs.d/init_octave.m.
+
 2013-09-29  Dmitry Gutov  <address@hidden>
 
        * emacs-lisp/package.el (package-desc-from-define): Accept

=== modified file 'lisp/progmodes/octave.el'
--- a/lisp/progmodes/octave.el  2013-09-28 03:15:56 +0000
+++ b/lisp/progmodes/octave.el  2013-09-30 01:13:19 +0000
@@ -609,8 +609,8 @@
   :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."