From ce50b3dbfa7529fff3f642f986b6189436554276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Mon, 2 Sep 2013 11:55:55 +0100 Subject: [PATCH] Closes #318: Don't use CL-LABELS for backward compatibility with older emacsen --- yasnippet.el | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/yasnippet.el b/yasnippet.el index dab6b55..a6754ab 100644 --- a/yasnippet.el +++ b/yasnippet.el @@ -696,19 +696,18 @@ defined direct keybindings to the command (defun yas--modes-to-activate () "Compute list of mode symbols that are active for `yas-expand' and friends." - (cl-labels - ((dfs (mode &optional explored) - (push mode explored) - (cons mode - (loop for neighbour - in (remove nil (cons (get mode - 'derived-mode-parent) - (gethash mode yas--parents))) + (let ((dfs (lambda (mode &optional explored) + (push mode explored) + (cons mode + (loop for neighbour + in (remove nil (cons (get mode + 'derived-mode-parent) + (gethash mode yas--parents))) - unless (memq neighbour explored) - append (dfs neighbour explored))))) + unless (memq neighbour explored) + append (funcall dfs neighbour explored)))))) (remove-duplicates (append yas-extra-modes - (dfs major-mode))))) + (funcall dfs major-mode))))) (defvar yas-minor-mode-hook nil "Hook run when `yas-minor-mode' is turned on.")