all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Rüdiger Sonderfeld" <ruediger@c-plusplus.de>
To: emacs-devel@gnu.org
Cc: Leo Liu <sdl.web@gmail.com>
Subject: [PATCH 4/4] octave.el: Use `locate-user-emacs-file'.
Date: Fri, 27 Sep 2013 17:20:42 +0200	[thread overview]
Message-ID: <1576674.5hNPsu3pnl@descartes> (raw)

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 <ruediger@c-plusplus.de>
---
 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




             reply	other threads:[~2013-09-27 15:20 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-27 15:20 Rüdiger Sonderfeld [this message]
2013-09-28  0:35 ` [PATCH 4/4] octave.el: Use `locate-user-emacs-file' Stefan Monnier
2013-09-28  2:10 ` Leo Liu
2013-09-28 11:59   ` Rüdiger Sonderfeld
2013-09-30  1:16     ` Leo Liu
2013-09-30  1:20     ` Leo Liu
2013-10-02 20:42       ` Rüdiger Sonderfeld

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1576674.5hNPsu3pnl@descartes \
    --to=ruediger@c-plusplus.de \
    --cc=emacs-devel@gnu.org \
    --cc=sdl.web@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.