Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bumps required emacs version to 24.4 #218

Merged
merged 2 commits into from
Sep 12, 2015
Merged

Bumps required emacs version to 24.4 #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e524a71
Updates required emacs version on init.el
heimojuh Aug 13, 2015
4345771
Bumps required version on README.md to 24.4
heimojuh Aug 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

<img src="http://github.com/downloads/overtone/emacs-live/emacs-live.png" />

<!--
Expand Down Expand Up @@ -53,9 +54,9 @@ in battle against the evil friction of poor text editor workflows.
"Power of the horse, full force!"
The Space Stallions.

### Requires Emacs 24.3
### Requires Emacs 24.4

Emacs Live is only compatible with Emacs 24.3 and above.
Emacs Live is only compatible with Emacs 24.4 and above.

### Easy Install

Expand Down
6 changes: 3 additions & 3 deletions init.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@

(setq live-supported-emacsp t)

(when (version< emacs-version "24.3")
(when (version< emacs-version "24.4")
(setq live-supported-emacsp nil)
(setq initial-scratch-message (concat "
;; _.-^^---....,,--
Expand All @@ -92,7 +92,7 @@
;; | ; :|
;; _____.,-#%&$@%#&#~,._____
;;
;; I'm sorry, Emacs Live is only supported on Emacs 24.3+.
;; I'm sorry, Emacs Live is only supported on Emacs 24.4+.
;;
;; You are running: " emacs-version "
;;
Expand All @@ -110,7 +110,7 @@
(let* ((old-file (concat (file-name-as-directory "~") ".emacs-old.el")))
(if (file-exists-p old-file)
(load-file old-file)
(error (concat "Oops - your emacs isn't supported. Emacs Live only works on Emacs 24.3+ and you're running version: " emacs-version ". Please upgrade your Emacs and try again, or define ~/.emacs-old.el for a fallback")))))
(error (concat "Oops - your emacs isn't supported. Emacs Live only works on Emacs 24.4+ and you're running version: " emacs-version ". Please upgrade your Emacs and try again, or define ~/.emacs-old.el for a fallback")))))

(let ((emacs-live-directory (getenv "EMACS_LIVE_DIR")))
(when emacs-live-directory
Expand Down