From 481a8e0f453026bdb4ab3c81e783f17060d892b0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=BCdiger=20Sonderfeld?= Date: Mon, 30 Sep 2013 09:13:19 +0800 Subject: [PATCH] * progmodes/octave.el (inferior-octave-startup-file): Prefer ~/.emacs.d/init_octave.m. --- lisp/ChangeLog | 5 +++++ lisp/progmodes/octave.el | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) 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 + + * progmodes/octave.el (inferior-octave-startup-file): Prefer + ~/.emacs.d/init_octave.m. + 2013-09-29 Dmitry Gutov * 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." -- 2.39.2