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

[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 <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

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

[Stefan Monnier]

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

Looks fine, thanks.  Could someone install those 4 patches, please?


        Stefan

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

[Leo Liu]

On 2013-09-27 23:20 +0800, Rüdiger Sonderfeld wrote:
> Initialize `inferior-octave-startup-file' with
> `locate-user-emacs-file' and support new "~/.emacs.d/init_octave.m"
> style.

Is this the default init file for octave in upcoming release? If yes
then that is not a good idea. We should give people a emacs-specific
file so that they can put emacs-specific settings there with common
settings in the standard init file. What do you think?

Leo

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

[Rüdiger Sonderfeld]

On Saturday 28 September 2013 10:10:31 Leo Liu wrote:
> Is this the default init file for octave in upcoming release? If yes
> then that is not a good idea. We should give people a emacs-specific
> file so that they can put emacs-specific settings there with common
> settings in the standard init file. What do you think?

No, it's Emacs specific.  It is in `user-emacs-directory' (typically 
~/.emacs.d).  Emacs is moving more and more stuff into `user-emacs-directory' 
to avoid spamming the user's home directory and I think octave.el should do 
that as well.

See also "** More packages look for ~/.emacs.d/<foo> additionally to 
~/.<foo>." in /etc/NEWS and the documentation of `locate-user-emacs-file'.

Regards,
Rüdiger

btw. there should also be a way to fix octave's doc statement in `inferior-
octave'.  In the past there was a script "info-emacs-info" which could be used 
to call emacs instead of info(1).  But it was removed from the octave 
distribution a while ago and it depended on the old gnuserv instead of 
server.el.

We could either write a new "info-emacs-info".  But I don't think the Emacs 
maintainers would be happy to ship a script like that if it's only used for 
octave.el.

Alternatively we could avoid using such a script if we get a way for server.el 
to handle additional command line options (as discussed here 
https://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00569.html) and for 
"doc" to pass additional options to "info_program()" (I talked about that with 
JordiGH and he says such a change would be acceptable).

Any ideas on that?

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

[Leo Liu]

On 2013-09-28 19:59 +0800, Rüdiger Sonderfeld wrote:
> No, it's Emacs specific.  It is in `user-emacs-directory' (typically 
> ~/.emacs.d).  Emacs is moving more and more stuff into `user-emacs-directory' 
> to avoid spamming the user's home directory and I think octave.el should do 
> that as well.

Patch merged with thanks.

Leo

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

[Leo Liu]

On 2013-09-28 19:59 +0800, Rüdiger Sonderfeld wrote:
> btw. there should also be a way to fix octave's doc statement in `inferior-
> octave'.  In the past there was a script "info-emacs-info" which could be used 
> to call emacs instead of info(1).  But it was removed from the octave 
> distribution a while ago and it depended on the old gnuserv instead of 
> server.el.
>
> We could either write a new "info-emacs-info".  But I don't think the Emacs 
> maintainers would be happy to ship a script like that if it's only used for 
> octave.el.

The info-lookup-symbol command should just work in the inferior- and
octave-mode.

Leo

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

[Rüdiger Sonderfeld]

On Monday 30 September 2013 09:20:42 Leo Liu wrote:
> On 2013-09-28 19:59 +0800, Rüdiger Sonderfeld wrote:
> > btw. there should also be a way to fix octave's doc statement in
> > `inferior-
> > octave'.  In the past there was a script "info-emacs-info" which could be
> > used to call emacs instead of info(1).  But it was removed from the
> > octave distribution a while ago and it depended on the old gnuserv
> > instead of server.el.
> > 
> > We could either write a new "info-emacs-info".  But I don't think the
> > Emacs
> > maintainers would be happy to ship a script like that if it's only used
> > for
> > octave.el.
> 
> The info-lookup-symbol command should just work in the inferior- and
> octave-mode.

Yes.  But the "doc" command should work as well in my opinion.  I'll look into 
it.

Regards,
Rüdiger