Use eval-when-compile for (require 'cl)

This commit is contained in:
Zhang Chiyuan 2008-09-10 12:27:32 +00:00
parent b3f2a95f50
commit 331812fefb

View File

@ -35,7 +35,7 @@
;; For more information and detailed usage, refer to the project page: ;; For more information and detailed usage, refer to the project page:
;; http://code.google.com/p/yasnippet/ ;; http://code.google.com/p/yasnippet/
(require 'cl) (eval-when-compile (require 'cl))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; User customizable variables ;; User customizable variables
@ -174,6 +174,8 @@ Here's an example:
'(if (python-in-string/comment) '(if (python-in-string/comment)
'(require-snippet-condition . force-in-comment) '(require-snippet-condition . force-in-comment)
t))))") t))))")
(eval-when-compile
(make-variable-buffer-local 'yas/buffer-local-condition))
(defvar yas/fallback-behavior 'call-other-command (defvar yas/fallback-behavior 'call-other-command
"The fall back behavior of YASnippet when it can't find a snippet "The fall back behavior of YASnippet when it can't find a snippet
@ -1225,7 +1227,7 @@ when the condition evaluated to non-nil."
(if template (if template
(progn (yas/expand-snippet start end template) (progn (yas/expand-snippet start end template)
'expanded) ; expanded successfully 'expanded) ; expanded successfully
'interruptted)) ; interrupted by user 'interrupted)) ; interrupted by user
(if (eq yas/fallback-behavior 'return-nil) (if (eq yas/fallback-behavior 'return-nil)
nil ; return nil nil ; return nil
(let* ((yas/minor-mode nil) (let* ((yas/minor-mode nil)