[nongnu] elpa/pacmacs d6b63ef5b9 317/472: Merge pull request #166 from codingteam/drop-emacs-24.3-165

[ELPA Syncer]

branch: elpa/pacmacs
commit d6b63ef5b94d0fe4058f11c1576af14e1a9c7295
Merge: a896a83366 e1ae35d526
Author: Alexey Kutepov <reximkut@gmail.com>
Commit: Alexey Kutepov <reximkut@gmail.com>

    Merge pull request #166 from codingteam/drop-emacs-24.3-165
    
    Drop Emacs 24.3 support
---
 .travis.yml |  1 -
 README.md   |  2 +-
 pacmacs.el  | 13 ++++---------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index eaa0786262..cd4011dd6d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,6 @@ install:
   - curl -fsSkL https://raw.github.com/cask/cask/master/go | python
   - cask
 env:
-  - EVM_EMACS=emacs-24.3-bin
   - EVM_EMACS=emacs-24.4-bin
   - EVM_EMACS=emacs-24.5-bin
 script:
diff --git a/README.md b/README.md
index 06e4eb236d..dee64f182d 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Pacman for Emacs
 
 ## Requirements ##
 
-- Emacs 24.3+
+- Emacs 24.4+
 - Emacs should have displaying images support
 - Emacs should have the [XPM](https://en.wikipedia.org/wiki/X_PixMap) image 
format support
 
diff --git a/pacmacs.el b/pacmacs.el
index c969715207..695ffb9ec2 100644
--- a/pacmacs.el
+++ b/pacmacs.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Alexey Kutepov <reximkut@gmail.com>
 ;; URL: http://github.com/rexim/pacmacs.el
 ;; Version: 0.0.1
-;; Package-Requires: ((dash "2.11.0") (dash-functional "1.2.0") (cl-lib "0.5") 
(f "0.18.0"))
+;; Package-Requires: ((emacs "24.4") (dash "2.11.0") (dash-functional "1.2.0") 
(cl-lib "0.5") (f "0.18.0"))
 
 ;; Permission is hereby granted, free of charge, to any person
 ;; obtaining a copy of this software and associated documentation
@@ -157,14 +157,9 @@
   (dolist (terrified-ghost pacmacs--terrified-ghosts)
     (plist-bind ((terrified-timer :terrified-timer))
         terrified-ghost
-      (when
-          ;; FIXME: In Emacs 24.3 `<=` accepts only 2
-          ;; arguments. Please rewrite this when Emacs 24.3 is finally
-          ;; dropped.
-          (and (<= terrified-timer
-                   pacmacs--ghost-blinking-threshold-ms)
-               (<= pacmacs--ghost-blinking-threshold-ms
-                   (+ terrified-timer pacmacs-tick-duration-ms)))
+      (when (<= terrified-timer
+                pacmacs--ghost-blinking-threshold-ms
+                (+ terrified-timer pacmacs-tick-duration-ms))
         (plist-put terrified-ghost
                    :current-animation
                    (pacmacs-load-anim "Blinking-Terrified-Ghost"))))))