From d798ba4dc707c004d3b4f94e58656aa7b74e2e82 Mon Sep 17 00:00:00 2001 From: Stanislav Arnaudov Date: Tue, 23 Oct 2018 00:19:31 +0200 Subject: [PATCH] [Fix #1171] Add gnu/linux specific module and exec-path-from-shell support on linux (#1203) --- core/prelude-linux.el | 43 +++++++++++++++++++++++++++++++++++++++++++ init.el | 4 ++++ 2 files changed, 47 insertions(+) create mode 100644 core/prelude-linux.el diff --git a/core/prelude-linux.el b/core/prelude-linux.el new file mode 100644 index 0000000..9388631 --- /dev/null +++ b/core/prelude-linux.el @@ -0,0 +1,43 @@ +;;; prelude-linux.el --- Emacs Prelude: linux specific settings. +;; +;; Copyright © 2011-2018 Bozhidar Batsov +;; +;; Author: Stanislav Arnaudov +;; URL: https://github.com/bbatsov/prelude +;; Version: 1.0.0 +;; Keywords: convenience + +;; This file is not part of GNU Emacs. + +;;; Commentary: + +;; Some Linux specific stuff. + +;;; License: + +;; This program is free software; you can redistribute it and/or +;; modify it under the terms of the GNU General Public License +;; as published by the Free Software Foundation; either version 3 +;; of the License, or (at your option) any later version. +;; +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. + +;;; Code: + +;; On Linux Emacs doesn't use the shell PATH if it's not started from +;; the shell. Let's fix that: +(prelude-require-packages '(exec-path-from-shell)) + +(require 'exec-path-from-shell) +(exec-path-from-shell-initialize) + +(provide 'prelude-linux) +;;; prelude-linux.el ends here diff --git a/init.el b/init.el index 87d9419..94a6bb5 100644 --- a/init.el +++ b/init.el @@ -117,6 +117,10 @@ by Prelude.") (when (eq system-type 'darwin) (require 'prelude-macos)) +;; Linux specific settings +(when (eq system-type 'gnu/linux) + (require 'prelude-linux)) + (message "Loading Prelude's modules...") ;; the modules