From 417dcddd244951d520987f103f4ff56bab5604c2 Mon Sep 17 00:00:00 2001 Message-Id: <417dcddd244951d520987f103f4ff56bab5604c2.1726872097.git.mdw@distorted.org.uk> From: Mark Wooding Date: Fri, 4 Apr 2008 21:13:18 +0100 Subject: [PATCH] dot-emacs: Fix the eval-when-compile stanza. Organization: Straylight/Edgeware From: Mark Wooding Firstly, it just wasn't spelt correctly! Secondly, it didn't include the cl macros, which are useful. (I henceforth permit the use of CL macros, but not functions, in dot-emacs.el, on condition that the expansions don't require CL functions.) Thirdly, fix mdw-regexps to quote its expansion. --- dot-emacs.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dot-emacs.el b/dot-emacs.el index 0f7cc5d..5d650cf 100644 --- a/dot-emacs.el +++ b/dot-emacs.el @@ -43,12 +43,14 @@ (let ((probe nil) (next command-line-args)) ;;;----- Some general utilities --------------------------------------------- -(evan-when-compile (or (fboundp 'make-regexp) - (load "make-regexp"))) +(eval-when-compile + (unless (fboundp 'make-regexp) + (load "make-regexp")) + (require 'cl)) (defmacro mdw-regexps (&rest list) "Turn a LIST of strings into a single regular expression at compile-time." - (make-regexp list)) + `',(make-regexp list)) ;; --- Some error trapping --- ;; -- [mdw]