Use cl-labels instead of cl-flet, for cl-lib shim compatibility

diff --git a/company-dabbrev.el b/company-dabbrev.el
index 2ab4303e3e76f7bb375bd2b1c74caeca721b727f..a3e4eb766625f730fb27b5d2c540d01d5c5f409e 100644 (file)
--- a/company-dabbrev.el
+++ b/company-dabbrev.el
@@ -1,6 +1,6 @@
 ;;; company-dabbrev.el --- dabbrev-like company-mode completion back-end  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2009, 2011, 2014  Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2011, 2014, 2015  Free Software Foundation, Inc.
 
 ;; Author: Nikolaj Schumacher
 
@@ -100,13 +100,13 @@ This variable affects both `company-dabbrev' and `company-dabbrev-code'."
 (defun company-dabbrev--search-buffer (regexp pos symbols start limit
                                        ignore-comments)
   (save-excursion
-    (cl-flet ((maybe-collect-match
-               ()
-               (let ((match (match-string-no-properties 0)))
-                 (when (and (>= (length match) company-dabbrev-minimum-length)
-                            (not (and company-dabbrev-ignore-invisible
-                                      (invisible-p (match-beginning 0)))))
-                   (push match symbols)))))
+    (cl-labels ((maybe-collect-match
+                 ()
+                 (let ((match (match-string-no-properties 0)))
+                   (when (and (>= (length match) company-dabbrev-minimum-length)
+                              (not (and company-dabbrev-ignore-invisible
+                                        (invisible-p (match-beginning 0)))))
+                     (push match symbols)))))
       (goto-char (if pos (1- pos) (point-min)))
       ;; search before pos
       (company-dabrev--time-limit-while (re-search-backward regexp nil t)