From 48c0f1345c6d1c13c3383e6750721fb18bce5767 Mon Sep 17 00:00:00 2001 From: Greg Pfeil Date: Fri, 16 Mar 2012 17:27:17 -0600 Subject: [PATCH] Fall back to one-arg require if searching fails. This is necessary during compilation, when both `load-file-name` and `buffer-file-name` are nil. Fixes issue #41. --- color-theme-solarized.el | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/color-theme-solarized.el b/color-theme-solarized.el index e95b782..f4b1abe 100644 --- a/color-theme-solarized.el +++ b/color-theme-solarized.el @@ -10,12 +10,14 @@ ;;; 2. Load this file ;;; 3. M-x color-theme-solarized-[dark|light] -(require 'solarized-definitions - (let* ((reqname (concat (file-name-directory (or load-file-name - buffer-file-name)) - "solarized-definitions.el")) - (compreqname (concat reqname "c"))) - (if (file-exists-p compreqname) compreqname reqname))) +(let ((current-file-name (or load-file-name buffer-file-name))) + (if current-file-name + (let* ((reqname (concat (file-name-directory current-file-name) + "solarized-definitions.el")) + (compreqname (concat reqname "c"))) + (require 'solarized-definitions + (if (file-exists-p compreqname) compreqname reqname))) + (require 'solarized-definitions))) (eval-when-compile (require 'color-theme))