[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 1079d1a 057/173: Use cl-labels instead of cl-flet, for cl-
From: |
Dmitry Gutov |
Subject: |
[elpa] master 1079d1a 057/173: Use cl-labels instead of cl-flet, for cl-lib shim compatibility |
Date: |
Thu, 23 Jun 2016 00:28:37 +0000 (UTC) |
branch: master
commit 1079d1af8aa3860a57e221336adb95badf7b23c8
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Use cl-labels instead of cl-flet, for cl-lib shim compatibility
---
company-dabbrev.el | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/company-dabbrev.el b/company-dabbrev.el
index 2ab4303..a3e4eb7 100644
--- 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)
- [elpa] master 4ba4264 047/173: company--begin-new: Reorder statements, (continued)
- [elpa] master 4ba4264 047/173: company--begin-new: Reorder statements, Dmitry Gutov, 2016/06/22
- [elpa] master 9c8364d 049/173: company-keywords: Support scala-mode, Dmitry Gutov, 2016/06/22
- [elpa] master d2ff1dc 046/173: company--begin-new: Call `company-cancel' in the unique case, Dmitry Gutov, 2016/06/22
- [elpa] master a053848 050/173: Sort alphabetically, to appease a test, Dmitry Gutov, 2016/06/22
- [elpa] master 25cf452 060/173: Don't start automatically during macro recording, Dmitry Gutov, 2016/06/22
- [elpa] master 7419d5f 058/173: Update the tests, Dmitry Gutov, 2016/06/22
- [elpa] master 8202638 041/173: Document ignore-case backend command, Dmitry Gutov, 2016/06/22
- [elpa] master d463642 062/173: company-etags-find-table: fix fallback tags file expansion, Dmitry Gutov, 2016/06/22
- [elpa] master 5f8e6eb 066/173: Merge pull request #397 from bremner/make-elpa-fix, Dmitry Gutov, 2016/06/22
- [elpa] master 6e88174 053/173: Don't cut off the last character from a wrapped line, Dmitry Gutov, 2016/06/22
- [elpa] master 1079d1a 057/173: Use cl-labels instead of cl-flet, for cl-lib shim compatibility,
Dmitry Gutov <=
- [elpa] master 3aa806f 063/173: company-etags-find-table: check that TAGS is a regular file, cf. #222, Dmitry Gutov, 2016/06/22
- [elpa] master 93aa472 064/173: Merge pull request #382 from ilohmar/etags-fix, Dmitry Gutov, 2016/06/22
- [elpa] master 46d4455 071/173: Merge pull request #402 from vspinu/sorted, Dmitry Gutov, 2016/06/22
- [elpa] master 050c0c1 070/173: Improvements of the `company-backends` docstring, Dmitry Gutov, 2016/06/22
- [elpa] master 4646d35 078/173: Allow advising company-dabbrev(-code)? regex generation, Dmitry Gutov, 2016/06/22
- [elpa] master ed3e711 084/173: company-yasnippet: Disable cache (#422), Dmitry Gutov, 2016/06/22
- [elpa] master 7d14350 051/173: company-eclim-executable: Pick up the value of eclim-executable, if present, Dmitry Gutov, 2016/06/22
- [elpa] master 9e66366 067/173: Fix #404 by blanking out line-prefix again, Dmitry Gutov, 2016/06/22
- [elpa] master 433ae92 072/173: Retouch the docstring further, Dmitry Gutov, 2016/06/22
- [elpa] master 02d0e74 074/173: Modernize the Commentary a bit, Dmitry Gutov, 2016/06/22