mlf176f2 pushed a commit to branch externals/ergoemacs-mode in repository elpa.
commit f801aa366570ae021638802544fc2c3904d5bf21 Author: Matthew L. Fidler <[email protected]> Date: Sat Jul 5 22:51:09 2014 -0500 Remove unnecessary file expansion --- Makefile | 2 +- ergoemacs-advices.el | 8 +------- ergoemacs-functions.el | 8 +------- ergoemacs-shortcuts.el | 8 +------- ergoemacs-test.el | 8 +------- ergoemacs-theme-engine.el | 8 +------- ergoemacs-themes.el | 8 +------- ergoemacs-translate.el | 8 +------- ergoemacs-unbind.el | 8 +------- 9 files changed, 9 insertions(+), 57 deletions(-) diff --git a/Makefile b/Makefile index 43338f9..c377ced 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ TRAVIS_FILE=.travis.yml test-dep-4 test-dep-5 test-dep-6 test-dep-7 test-dep-8 test-dep-9 build : - $(EMACS) $(EMACS_BATCH) --eval \ + $(EMACS) $(EMACS_BATCH) -L . --eval \ "(progn \ (setq byte-compile-error-on-warn t) \ (batch-byte-compile))" *.el diff --git a/ergoemacs-advices.el b/ergoemacs-advices.el index 964caae..e22af5a 100644 --- a/ergoemacs-advices.el +++ b/ergoemacs-advices.el @@ -30,13 +30,7 @@ (eval-when-compile (require 'cl) - (require 'ergoemacs-macros - (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 'ergoemacs-macros)) (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 98cfcfc..0793f20 100644 --- a/ergoemacs-functions.el +++ b/ergoemacs-functions.el @@ -31,13 +31,7 @@ ;;; Code: (eval-when-compile (require 'cl) - (require 'ergoemacs-macros - (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 'ergoemacs-macros)) (require 'redo "redo.elc" t) ; for redo shortcut diff --git a/ergoemacs-shortcuts.el b/ergoemacs-shortcuts.el index ac30f19..2d598bc 100644 --- a/ergoemacs-shortcuts.el +++ b/ergoemacs-shortcuts.el @@ -53,13 +53,7 @@ (eval-when-compile (require 'cl) - (require 'ergoemacs-macros - (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 'ergoemacs-macros)) (unless (fboundp 'ergoemacs-pretty-key) (require 'ergoemacs-translate)) diff --git a/ergoemacs-test.el b/ergoemacs-test.el index 5817b98..1503445 100644 --- a/ergoemacs-test.el +++ b/ergoemacs-test.el @@ -30,13 +30,7 @@ (eval-when-compile (require 'cl) - (require 'ergoemacs-macros - (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 'ergoemacs-macros)) (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 a89f56d..842bfa3 100644 --- a/ergoemacs-theme-engine.el +++ b/ergoemacs-theme-engine.el @@ -53,13 +53,7 @@ (eval-when-compile (require 'cl) - (require 'ergoemacs-macros - (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 'ergoemacs-macros)) ;;; 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 8ea889c..61f4e04 100644 --- a/ergoemacs-themes.el +++ b/ergoemacs-themes.el @@ -29,13 +29,7 @@ ;;; Code: (eval-when-compile (require 'cl) - (require 'ergoemacs-macros - (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 'ergoemacs-macros)) (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 781914f..6fdc92b 100644 --- a/ergoemacs-translate.el +++ b/ergoemacs-translate.el @@ -52,13 +52,7 @@ (eval-when-compile (require 'cl) - (require 'ergoemacs-macros - (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 'ergoemacs-macros)) ;;; ergoemacs pretty keys diff --git a/ergoemacs-unbind.el b/ergoemacs-unbind.el index 0833fd4..2770019 100644 --- a/ergoemacs-unbind.el +++ b/ergoemacs-unbind.el @@ -30,13 +30,7 @@ ;;; Code: (eval-when-compile (require 'cl) - (require 'ergoemacs-macros - (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 'ergoemacs-macros)) (require 'edmacro)
