[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 02/15: Check for pkg-dir to load ergoemacs-macros on compile
|
From: |
Matthew Fidler |
|
Subject: |
[elpa] 02/15: Check for pkg-dir to load ergoemacs-macros on compile |
|
Date: |
Sun, 06 Jul 2014 03:56:14 +0000 |
mlf176f2 pushed a commit to branch externals/ergoemacs-mode
in repository elpa.
commit 54ad6026163f63e3a605e7cbcadcac32063df984
Author: Matthew L. Fidler <address@hidden>
Date: Thu Jul 3 08:17:15 2014 -0500
Check for pkg-dir to load ergoemacs-macros on compile
---
ergoemacs-advices.el | 5 +++--
ergoemacs-functions.el | 11 ++++++-----
ergoemacs-shortcuts.el | 11 ++++++-----
ergoemacs-test.el | 9 +++++----
ergoemacs-theme-engine.el | 9 +++++----
ergoemacs-themes.el | 9 +++++----
ergoemacs-translate.el | 13 +++++++------
ergoemacs-unbind.el | 10 ++++++----
8 files changed, 43 insertions(+), 34 deletions(-)
diff --git a/ergoemacs-advices.el b/ergoemacs-advices.el
index 4526724..d8a107b 100644
--- a/ergoemacs-advices.el
+++ b/ergoemacs-advices.el
@@ -32,10 +32,11 @@
(require 'cl)
(require 'ergoemacs-macros
(expand-file-name "ergoemacs-macros"
- (file-name-directory (or
+ (or (and (boundp 'pkg-dir) pkg-dir)
+ (file-name-directory (or
load-file-name
(buffer-file-name)
- default-directory)))))
+ default-directory))))))
(defvar ergoemacs-advices '()
"List of advices to enable and disable when ergoemacs is running.")
diff --git a/ergoemacs-functions.el b/ergoemacs-functions.el
index e6d8c47..98cfcfc 100644
--- a/ergoemacs-functions.el
+++ b/ergoemacs-functions.el
@@ -32,11 +32,12 @@
(eval-when-compile
(require 'cl)
(require 'ergoemacs-macros
- (expand-file-name "ergoemacs-macros"
- (file-name-directory (or
- load-file-name
- (buffer-file-name)
- default-directory)))))
+ (expand-file-name "ergoemacs-macros"
+ (or (and (boundp 'pkg-dir) pkg-dir)
+ (file-name-directory (or
+ load-file-name
+ (buffer-file-name)
+ default-directory))))))
(require 'redo "redo.elc" t) ; for redo shortcut
diff --git a/ergoemacs-shortcuts.el b/ergoemacs-shortcuts.el
index bef677d..ac30f19 100644
--- a/ergoemacs-shortcuts.el
+++ b/ergoemacs-shortcuts.el
@@ -54,11 +54,12 @@
(eval-when-compile
(require 'cl)
(require 'ergoemacs-macros
- (expand-file-name "ergoemacs-macros"
- (file-name-directory (or
- load-file-name
- (buffer-file-name)
- default-directory)))))
+ (expand-file-name "ergoemacs-macros"
+ (or (and (boundp 'pkg-dir) pkg-dir)
+ (file-name-directory (or
+ load-file-name
+ (buffer-file-name)
+ default-directory))))))
(unless (fboundp 'ergoemacs-pretty-key)
(require 'ergoemacs-translate))
diff --git a/ergoemacs-test.el b/ergoemacs-test.el
index e39136f..7ea3b5b 100644
--- a/ergoemacs-test.el
+++ b/ergoemacs-test.el
@@ -32,10 +32,11 @@
(require 'cl)
(require 'ergoemacs-macros
(expand-file-name "ergoemacs-macros"
- (file-name-directory (or
- load-file-name
- (buffer-file-name)
- default-directory)))))
+ (or (and (boundp 'pkg-dir) pkg-dir)
+ (file-name-directory (or
+ load-file-name
+ (buffer-file-name)
+ default-directory))))))
(declare-function ergoemacs-set "ergoemacs-theme-engine.el")
(declare-function ergoemacs-define-key "ergoemacs-theme-engine.el")
diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index a00ce88..61e5068 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -55,10 +55,11 @@
(require 'cl)
(require 'ergoemacs-macros
(expand-file-name "ergoemacs-macros"
- (file-name-directory (or
- load-file-name
- (buffer-file-name)
- default-directory)))))
+ (or (and (boundp 'pkg-dir) pkg-dir)
+ (file-name-directory (or
+ load-file-name
+ (buffer-file-name)
+ default-directory))))))
;;; Not sure why `adjoin' may be called at run-time; sigh.
(autoload 'adjoin "cl.el")
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index af75e10..8ea889c 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -31,10 +31,11 @@
(require 'cl)
(require 'ergoemacs-macros
(expand-file-name "ergoemacs-macros"
- (file-name-directory (or
- load-file-name
- (buffer-file-name)
- default-directory)))))
+ (or (and (boundp 'pkg-dir) pkg-dir)
+ (file-name-directory (or
+ load-file-name
+ (buffer-file-name)
+ default-directory))))))
(autoload 'dired-jump "dired-x" "ergoemacs-autoload." t)
(autoload 'wdired-change-to-wdired-mode "wdired" "ergoemacs-autoload." t)
diff --git a/ergoemacs-translate.el b/ergoemacs-translate.el
index 79ec34d..c4fe3c2 100644
--- a/ergoemacs-translate.el
+++ b/ergoemacs-translate.el
@@ -50,14 +50,15 @@
;;
;;; Code:
-(eval-when-compile
+(eval-when-compile
(require 'cl)
(require 'ergoemacs-macros
- (expand-file-name "ergoemacs-macros"
- (file-name-directory (or
- load-file-name
- (buffer-file-name)
- default-directory)))))
+ (expand-file-name "ergoemacs-macros"
+ (or (and (boundp 'pkg-dir) pkg-dir)
+ (file-name-directory (or
+ load-file-name
+ (buffer-file-name)
+ default-directory))))))
;;; ergoemacs pretty keys
diff --git a/ergoemacs-unbind.el b/ergoemacs-unbind.el
index a1d041d..0833fd4 100644
--- a/ergoemacs-unbind.el
+++ b/ergoemacs-unbind.el
@@ -32,10 +32,12 @@
(require 'cl)
(require 'ergoemacs-macros
(expand-file-name "ergoemacs-macros"
- (file-name-directory (or
- load-file-name
- (buffer-file-name)
- default-directory)))))
+ (or (and (boundp 'pkg-dir) pkg-dir)
+ (file-name-directory (or
+ load-file-name
+ (buffer-file-name)
+ default-directory))))))
+
(require 'edmacro)
(defvar ergoemacs-emacs-default-bindings
- [elpa] branch externals/ergoemacs-mode updated (376bdc5 -> e2ab286), Matthew Fidler, 2014/07/05
- [elpa] 01/15: Should fix Issue #251, Matthew Fidler, 2014/07/05
- [elpa] 05/15: Put back C-u -> Ctrl+U instead of Ctrl+u, Matthew Fidler, 2014/07/05
- [elpa] 03/15: Make U-> ã€â‡§Shift+U】, Matthew Fidler, 2014/07/05
- [elpa] 02/15: Check for pkg-dir to load ergoemacs-macros on compile,
Matthew Fidler <=
- [elpa] 06/15: Fix website addresses, Matthew Fidler, 2014/07/05
- [elpa] 07/15: Allow short symbols to represent keys, Matthew Fidler, 2014/07/05
- [elpa] 04/15: Fix package-list-packages to show: X packages can be upgraded; type `ã€â‡§Shift+U】' to mark them for upgrading., Matthew Fidler, 2014/07/05
- [elpa] 08/15: Add test for U in package list, Matthew Fidler, 2014/07/05
- [elpa] 09/15: Add unbound commands test for C-x C-s, Matthew Fidler, 2014/07/05
- [elpa] 10/15: Fix Issue #264, Matthew Fidler, 2014/07/05
- [elpa] 11/15: declare real-key-binding, Matthew Fidler, 2014/07/05
- [elpa] 12/15: Make package a requirement., Matthew Fidler, 2014/07/05
- [elpa] 14/15: Remove unnecessary file expansion, Matthew Fidler, 2014/07/05
- [elpa] 13/15: remove ergoemacs-unbind-keymap compiler warning, Matthew Fidler, 2014/07/05