From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?ISO-8859-1?Q?R=FCdiger?= Sonderfeld Newsgroups: gmane.emacs.devel Subject: [PATCH 4/4] octave.el: Use `locate-user-emacs-file'. Date: Fri, 27 Sep 2013 17:20:42 +0200 Message-ID: <1576674.5hNPsu3pnl@descartes> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1380295307 18482 80.91.229.3 (27 Sep 2013 15:21:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 27 Sep 2013 15:21:47 +0000 (UTC) Cc: Leo Liu To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Sep 27 17:21:50 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VPZrZ-00069q-3M for ged-emacs-devel@m.gmane.org; Fri, 27 Sep 2013 17:21:49 +0200 Original-Received: from localhost ([::1]:37124 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VPZrY-0000Wv-Ji for ged-emacs-devel@m.gmane.org; Fri, 27 Sep 2013 11:21:48 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49942) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VPZqh-0007sK-78 for emacs-devel@gnu.org; Fri, 27 Sep 2013 11:21:01 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VPZqb-0001Te-2Y for emacs-devel@gnu.org; Fri, 27 Sep 2013 11:20:55 -0400 Original-Received: from ptmx.org ([178.63.28.110]:58226) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VPZqa-0001TO-Rt for emacs-devel@gnu.org; Fri, 27 Sep 2013 11:20:48 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by ptmx.org (Postfix) with ESMTP id E7F912AA7C; Fri, 27 Sep 2013 17:20:47 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at ptmx.org Original-Received: from ptmx.org ([127.0.0.1]) by localhost (ptmx.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hdWVG9ElAINI; Fri, 27 Sep 2013 17:20:46 +0200 (CEST) Original-Received: from descartes.localnet (chello080108246092.7.14.vie.surfer.at [80.108.246.92]) by ptmx.org (Postfix) with ESMTPSA id 63BF42221B; Fri, 27 Sep 2013 17:20:46 +0200 (CEST) User-Agent: KMail/4.10.5 (Linux/3.8.0-30-generic; KDE/4.10.5; x86_64; ; ) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 178.63.28.110 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:163684 Archived-At: 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=C3=BCdiger Sonderfeld --- 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") =20 (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." --=20 1.8.4