rearrangement to avoid problem.

diff --git a/poe.el b/poe.el
index f77d66b..697b500 100644 (file)
--- a/poe.el
+++ b/poe.el
@@ -192,6 +192,18 @@ See also the function `defconst'."
 (def-edebug-spec defmacro-maybe defmacro)
 (def-edebug-spec defsubst-maybe defun)
 
+;;; Emacs 20.1 emulation
+
+;; imported from emacs-20.3/lisp/subr.el.
+(defmacro-maybe when (cond &rest body)
+  "If COND yields non-nil, do BODY, else return nil."
+  (list 'if cond (cons 'progn body)))
+
+;; imported from emacs-20.3/lisp/subr.el.
+(defmacro-maybe unless (cond &rest body)
+  "If COND yields nil, do BODY, else return nil."
+  (cons 'if (cons cond (cons nil body))))
+
 
 ;;; @ Emacs 19.23 emulation
 ;;;
@@ -202,6 +214,7 @@ See also the function `defconst'."
     (set-buffer (window-buffer (minibuffer-window)))
     (current-column)))
 
+
 ;;; @ Emacs 19.29 emulation
 ;;;
 
@@ -270,6 +283,7 @@ The extension, in a file name, is the part that follows the last `.'.
            (substring file 0 (match-beginning 0)))
        filename))))
 
+
 ;;; @ Emacs 19.30 emulation
 ;;;
 
@@ -331,16 +345,6 @@ Value is nil if OBJECT is not a buffer or if it has been killed.
 ;;;
 
 ;; imported from emacs-20.3/lisp/subr.el.
-(defmacro-maybe when (cond &rest body)
-  "If COND yields non-nil, do BODY, else return nil."
-  (list 'if cond (cons 'progn body)))
-
-;; imported from emacs-20.3/lisp/subr.el.
-(defmacro-maybe unless (cond &rest body)
-  "If COND yields nil, do BODY, else return nil."
-  (cons 'if (cons cond (cons nil body))))
-
-;; imported from emacs-20.3/lisp/subr.el.
 (defsubst-maybe caar (x)
   "Return the car of the car of X."
   (car (car x)))