jt/emacs-prelude
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename prelude-osx.el to prelude-macos.el

Browse source
This commit is contained in:
Bozhidar Batsov 2018-05-06 09:48:32 +03:00
parent d6786e33f1
commit e1d2f4fd7e
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/prelude-osx.el → core/prelude-macos.el
View file

@ -1,4 +1,4 @@
;;; prelude-osx.el --- Emacs Prelude: OSX specific settings. ;;; prelude-macos.el --- Emacs Prelude: macOS specific settings.
;; ;;
;; Copyright © 2011-2018 Bozhidar Batsov ;; Copyright © 2011-2018 Bozhidar Batsov
;; ;;
@ -32,7 +32,7 @@
;;; Code: ;;; Code:
;; On OS X Emacs doesn't use the shell PATH if it's not started from ;; On macOS Emacs doesn't use the shell PATH if it's not started from
;; the shell. Let's fix that: ;; the shell. Let's fix that:
(prelude-require-packages '(exec-path-from-shell vkill)) (prelude-require-packages '(exec-path-from-shell vkill))
@ -42,7 +42,7 @@
;; It's all in the Meta ;; It's all in the Meta
(setq ns-function-modifier 'hyper) (setq ns-function-modifier 'hyper)
;; proced-mode doesn't work on OS X so we use vkill instead ;; proced-mode doesn't work on macOS so we use vkill instead
(autoload 'vkill "vkill" nil t) (autoload 'vkill "vkill" nil t)
(global-set-key (kbd "C-x p") 'vkill) (global-set-key (kbd "C-x p") 'vkill)
@ -71,5 +71,5 @@ Windows external keyboard from time to time."
(set-fontset-font t 'unicode "Apple Color Emoji" nil 'prepend)) (set-fontset-font t 'unicode "Apple Color Emoji" nil 'prepend))
(provide 'prelude-osx) (provide 'prelude-macos)
;;; prelude-osx.el ends here ;;; prelude-macos.el ends here

4
init.el
View file

@ -113,9 +113,9 @@ by Prelude.")
(require 'prelude-editor) (require 'prelude-editor)
(require 'prelude-global-keybindings) (require 'prelude-global-keybindings)
;; OSX specific settings ;; macOS specific settings
(when (eq system-type 'darwin) (when (eq system-type 'darwin)
(require 'prelude-osx)) (require 'prelude-macos))
(message "Loading Prelude's modules...") (message "Loading Prelude's modules...")