branch: elpa/popup
commit 68b71de41baa22be9c12b13d1efbf619a29ceadc
Merge: 4438b94 4ab00e1
Author: Syohei YOSHIDA <syo...@gmail.com>
Commit: Syohei YOSHIDA <syo...@gmail.com>
Merge pull request #96 from auto-complete/improve
Improve package
---
.travis.yml | 28 +++++++++++-----------------
README.md | 19 ++++++++++++++-----
popup.el | 7 ++++---
3 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index abed12f..62d1878 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,13 @@
-language: emacs-lisp
-env:
- matrix:
- - EMACS=emacs24
- - EMACS=emacs-snapshot
- global:
- - CASK=$HOME/.cask/bin/cask
+language: generic
+sudo: false
before_install:
- - sudo add-apt-repository -y ppa:cassou/emacs
- - sudo add-apt-repository -y ppa:ubuntu-elisp/ppa
- - sudo apt-get update -qq
- - sudo apt-get install -qq $EMACS
- - if [ "$EMACS" = 'emacs-snapshot' ]; then
- sudo apt-get install -qq emacs-snapshot-el emacs-snapshot-nox;
- fi
- - curl -fsSkL --max-time 10 --retry 10 --retry-delay 10
- https://raw.github.com/cask/cask/master/go | python
+ - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh
&& source ./x.sh
+ - evm install $EVM_EMACS --use --skip
+ - cask
+env:
+ - EVM_EMACS=emacs-24.3-travis
+ - EVM_EMACS=emacs-24.4-travis
+ - EVM_EMACS=emacs-24.5-travis
script:
- make travis-ci
+ - emacs --version
+ - make travis-ci
diff --git a/README.md b/README.md
index 3749b65..428973d 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Screenshots
Installation
------------
-You can install `popup.el` from [MELPA](http://melpa.org/) with package.el.
+You can install `popup.el` from [MELPA](https://melpa.org/) with package.el.
popwin is tested under GNU Emacs 24 or later.
Popup Items
@@ -334,11 +334,20 @@ Here is an example:
(popup-cascade-menu '(("Top1" "Sub1" "Sub2") "Top2"))
+
+### Customize Variables
+
+#### `popup-isearch-regexp-builder-function`
+
+Function used to construct a regexp from a pattern. You may for instance
+provide a function that replaces spaces by '.+' if you like helm or ivy style
+of completion. Default value is `#'regexp-quote`.
+
----
Copyright (C) 2011-2015 Tomohiro Matsuyama <<m2ym....@gmail.com>>
-[melpa-link]: http://melpa.org/#/popup
-[melpa-stable-link]: http://stable.melpa.org/#/popup
-[melpa-badge]: http://melpa.org/packages/popup-badge.svg
-[melpa-stable-badge]: http://stable.melpa.org/packages/popup-badge.svg
+[melpa-link]: https://melpa.org/#/popup
+[melpa-stable-link]: https://stable.melpa.org/#/popup
+[melpa-badge]: https://melpa.org/packages/popup-badge.svg
+[melpa-stable-badge]: https://stable.melpa.org/packages/popup-badge.svg
diff --git a/popup.el b/popup.el
index bad8404..0e8e98f 100644
--- a/popup.el
+++ b/popup.el
@@ -5,7 +5,7 @@
;; Author: Tomohiro Matsuyama <m2ym....@gmail.com>
;; Keywords: lisp
;; Version: 0.5.3
-;; Package-Requires: ((cl-lib "0.3"))
+;; Package-Requires: ((cl-lib "0.5"))
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -887,10 +887,11 @@ Pages up through POPUP."
(defvar popup-menu-show-quick-help-function 'popup-menu-show-quick-help
"Function used for showing quick help by `popup-menu*'.")
-(defcustom popup-isearch-regexp-builder-function 'regexp-quote
+(defcustom popup-isearch-regexp-builder-function #'regexp-quote
"Function used to construct a regexp from a pattern. You may for instance
provide a function that replaces spaces by '.+' if you like helm or ivy style
- of completion.")
+ of completion."
+ :type 'function)
(defsubst popup-isearch-char-p (char)
(and (integerp char)
