[ELPA-diffs] [elpa] 07/14: Merge pull request #44 from dcolascione/master

2014-01-14 Thread emacs-devel
This is an automated email from the git hooks/post-receive script.

root pushed a commit to branch master
in repository elpa.

commit b70540b5fcd062c4670dea7004453de326ff4f70
Merge: f4174bc 2bf0ecf
Author: Dmitry Gutov 
Date:   Mon Dec 23 06:10:55 2013 -0800

Merge pull request #44 from dcolascione/master

Require cl before using cl

 company-oddmuse.el |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.



[ELPA-diffs] [elpa] 08/14: Fix http://debbugs.gnu.org/16334

2014-01-14 Thread emacs-devel
This is an automated email from the git hooks/post-receive script.

root pushed a commit to branch master
in repository elpa.

commit fefcae59d66589e81823fe08c0b40a995d9118a4
Author: Dmitry Gutov 
Date:   Sun Jan 5 07:16:13 2014 +0400

Fix http://debbugs.gnu.org/16334
---
 NEWS.md |1 +
 company-capf.el |7 +++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index ff598f7..ae1124c 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,6 +2,7 @@
 
 ## Next
 
+* `company-capf` supports completion tables that return non-default boundaries.
 * `company-elisp` is enabled in `inferior-emacs-lisp-mode`.
 
 ## 2013-09-28 (0.6.12)
diff --git a/company-capf.el b/company-capf.el
index 2d20bee..ee2ac1e 100644
--- a/company-capf.el
+++ b/company-capf.el
@@ -52,7 +52,14 @@ Requires Emacs 24.1 or newer."
   (buffer-substring (nth 1 res) (nth 2 res))
   table pred))
 (sortfun (cdr (assq 'display-sort-function meta)))
+(boundaries (completion-boundaries arg table pred ""))
 (candidates (all-completions arg table pred)))
+   (unless (zerop (car boundaries))
+ (let ((before (substring arg 0 (car boundaries
+   (setq candidates
+ (mapcar (lambda (candidate)
+   (concat before candidate))
+ candidates
(if sortfun (funcall sortfun candidates) candidates)
 (`sorted
  (let ((res (company--capf-data)))

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.



[ELPA-diffs] [elpa] 01/14: Include emacs22 in the Travis build again

2014-01-14 Thread emacs-devel
This is an automated email from the git hooks/post-receive script.

root pushed a commit to branch master
in repository elpa.

commit a3feaccae8c9738a3569cce5b7b2737029f51c3c
Author: Dmitry Gutov 
Date:   Wed Oct 23 01:15:39 2013 +0400

Include emacs22 in the Travis build again

Should work now rolandwalker/emacs-travis#3
---
 .travis.yml |   20 
 Makefile|2 +-
 2 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cdf55d1..33c183c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,31 @@ language: emacs-lisp
 
 env:
   matrix:
+- EMACS=emacs22
 - EMACS=emacs23
 - EMACS=emacs24
 - EMACS=emacs-snapshot
 
+matrix:
+  allow_failures:
+- env: EMACS=emacs22
+
 install:
+  - if [ "$EMACS" = "emacs22" ]; then
+curl -Os 
http://security.ubuntu.com/ubuntu/pool/universe/e/emacs22/emacs22_22.2-0ubuntu9_i386.deb
 &&
+curl -Os 
http://security.ubuntu.com/ubuntu/pool/universe/e/emacs22/emacs22-bin-common_22.2-0ubuntu9_i386.deb
 &&
+curl -Os 
http://security.ubuntu.com/ubuntu/pool/universe/e/emacs22/emacs22-common_22.2-0ubuntu9_all.deb
 &&
+curl -Os 
http://security.ubuntu.com/ubuntu/pool/universe/e/emacs22/emacs22-el_22.2-0ubuntu9_all.deb
 &&
+curl -Os 
http://security.ubuntu.com/ubuntu/pool/universe/e/emacs22/emacs22-gtk_22.2-0ubuntu9_i386.deb
 &&
+sudo apt-get -qq update &&
+sudo apt-get -qq remove emacs emacs23-bin-common emacs23-common 
emacs23-nox &&
+sudo apt-get -qq --fix-missing install install-info emacsen-common 
libjpeg62:i386 xaw3dg:i386 liblockfile1:i386 libasound2:i386 libgif4:i386 
libncurses5:i386 libpng12-0:i386 libtiff4:i386 libxpm4:i386 libxft2:i386 
libglib2.0-0:i386 libgtk2.0-0:i386 &&
+sudo apt-get -qq -f install &&
+sudo dpkg -i emacs22-common_22.2-0ubuntu9_all.deb 
emacs22-el_22.2-0ubuntu9_all.deb &&
+sudo dpkg -i --force-depends emacs22-bin-common_22.2-0ubuntu9_i386.deb 
&&
+sudo dpkg -i emacs22_22.2-0ubuntu9_i386.deb 
emacs22-gtk_22.2-0ubuntu9_i386.deb &&
+sudo update-alternatives --set emacs22 /usr/bin/emacs22-gtk;
+fi
   - if [ "$EMACS" = "emacs23" ]; then
 sudo apt-get update -qq &&
 sudo apt-get install -qq emacs23-gtk emacs23-el;
diff --git a/Makefile b/Makefile
index f11b04e..2602191 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 EMACS=emacs
 CURL=curl --silent
-ERT_URL=http://git.savannah.gnu.org/cgit/emacs.git/plain/lisp/emacs-lisp/ert.el?h=emacs-24
+ERT_URL=http://git.savannah.gnu.org/cgit/emacs.git/plain/lisp/emacs-lisp/ert.el?h=emacs-24.3
 
 .PHONY: ert test test-batch
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.



[ELPA-diffs] [elpa] 13/14: Fix a broken test, remove a duplicate one

2014-01-14 Thread emacs-devel
This is an automated email from the git hooks/post-receive script.

root pushed a commit to branch master
in repository elpa.

commit 67a96dbbfe645b64291ed62eab6f1eb391a834e0
Author: Dmitry Gutov 
Date:   Tue Jan 14 15:20:59 2014 +0200

Fix a broken test, remove a duplicate one
---
 company-tests.el |   18 ++
 company.el   |   14 +++---
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/company-tests.el b/company-tests.el
index b111822..e9116b2 100644
--- a/company-tests.el
+++ b/company-tests.el
@@ -166,6 +166,7 @@
   (with-temp-buffer
 (company-mode)
 (let (company-frontends
+  company-end-of-buffer-workaround
   (company-backends
(list (lambda (command &optional arg)
(case command
@@ -177,7 +178,7 @@
 (company-complete))
   (should (string= "ab" (buffer-string)))
   (delete-char -2)
-  (insert "AB") ; hack, to keep it in one test
+  (insert "A") ; hack, to keep it in one test
   (company-complete-selection)
   (should (string= "abcd" (buffer-string))
 
@@ -210,21 +211,6 @@
  (candidates '("tea-cup" "teal-color")))
   (let (this-command)
 (company-complete))
-  (should (string= "tc" (buffer-string))
-
-(ert-deftest company-non-prefix-completion ()
-  (with-temp-buffer
-(insert "tc")
-(company-mode)
-(let (company-frontends
-  company-end-of-buffer-workaround
-  (company-backends
-   (list (lambda (command &optional arg)
-   (case command
- (prefix (buffer-substring (point-min) (point)))
- (candidates '("tea-cup" "teal-color")))
-  (let (this-command)
-(company-complete))
   (should (string= "tc" (buffer-string)))
   (company-complete-selection)
   (should (string= "tea-cup" (buffer-string))
diff --git a/company.el b/company.el
index 1015415..1a324c7 100644
--- a/company.el
+++ b/company.el
@@ -828,13 +828,13 @@ can retrieve meta-data for them."
   ;; Save in cache:
   (push (cons company-prefix company-candidates) company-candidates-cache)
   ;; Calculate common.
-  (let ((completion-ignore-case (company-call-backend 'ignore-case))
-;; We want to support non-prefix completion, so filtering is the
-;; responsibility of each respective backend, not ours.
-;; On the other hand, we don't want to replace non-prefix input in
-;; `company-complete-common'.
-(common (try-completion company-prefix company-candidates)))
-(setq company-common (company--safe-candidate common
+  (let ((completion-ignore-case (company-call-backend 'ignore-case)))
+;; We want to support non-prefix completion, so filtering is the
+;; responsibility of each respective backend, not ours.
+;; On the other hand, we don't want to replace non-prefix input in
+;; `company-complete-common'.
+(setq company-common (company--safe-candidate
+  (try-completion company-prefix 
company-candidates)
 
 (defun company--safe-candidate (str)
   (or (company-call-backend 'crop str)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.



[ELPA-diffs] [elpa] 10/14: * packages/company/company-etags.el: Require `cl' for `case'. * packages/company/company-oddmuse.el: Avoid `eval-when'.

2014-01-14 Thread emacs-devel
This is an automated email from the git hooks/post-receive script.

root pushed a commit to branch master
in repository elpa.

commit 17a64360a9ccb4619db677f2df693311866ad112
Author: Stefan Monnier 
Date:   Tue Jan 14 06:34:41 2014 +0200

* packages/company/company-etags.el: Require `cl' for `case'.
* packages/company/company-oddmuse.el: Avoid `eval-when'.
---
 company-etags.el   |3 ++-
 company-oddmuse.el |6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/company-etags.el b/company-etags.el
index 956e294..f93c763 100644
--- a/company-etags.el
+++ b/company-etags.el
@@ -1,6 +1,6 @@
 ;;; company-etags.el --- company-mode completion back-end for etags
 
-;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011, 2014  Free Software Foundation, Inc.
 
 ;; Author: Nikolaj Schumacher
 
@@ -25,6 +25,7 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
 (require 'company)
 (require 'etags)
 
diff --git a/company-oddmuse.el b/company-oddmuse.el
index 2415a74..358d5ea 100644
--- a/company-oddmuse.el
+++ b/company-oddmuse.el
@@ -1,6 +1,6 @@
 ;;; company-oddmuse.el --- company-mode completion back-end for oddmuse-mode
 
-;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011, 2014  Free Software Foundation, Inc.
 
 ;; Author: Nikolaj Schumacher
 
@@ -27,8 +27,8 @@
 
 (require 'company)
 (eval-when-compile (require 'cl))
-(eval-when 'compile (require 'yaooddmuse nil t))
-(eval-when 'compile (require 'oddmuse nil t))
+(eval-when-compile (require 'yaooddmuse nil t))
+(eval-when-compile (require 'oddmuse nil t))
 
 (defvar company-oddmuse-link-regexp
   "\\(\\<[A-Z][[:alnum:]]*\\>\\)\\|\\[\\[\\([[:alnum:]]+\\>\\|\\)")

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.



[ELPA-diffs] [elpa] branch master updated (25219bd -> e6d8543)

2014-01-14 Thread emacs-devel
This is an automated email from the git hooks/post-receive script.

root pushed a change to branch master
in repository elpa.

  from  25219bd   Merge commit 'af601c4a8a087cc5a12a08e08af094c4e21d417c' 
from diff-hl
   new  a3feacc   Include emacs22 in the Travis build again
   new  b584759   Add option to wrap around selection in popup
   new  e56ef8b   company-elisp: enable in inferior-emacs-lisp-mode
   new  f3a632b   company--should-complete: Don't check if we're in 
minibuffer
   new  f4174bc   Fix #43
   new  2bf0ecf   Require cl before using cl
   new  b70540b   Merge pull request #44 from dcolascione/master
   new  fefcae5   Fix http://debbugs.gnu.org/16334
   new  8ecec35   company-capf: Perform sorting before prefix adjustment
   new  17a6436   * packages/company/company-etags.el: Require `cl' for 
`case'. * packages/company/company-oddmuse.el: Avoid `eval-when'.
   new  55caaa4   Replace company-elisp with company-capf
   new  bd82c7e   Close #45
   new  67a96db   Fix a broken test, remove a duplicate one
   new  e6d8543   Merge commit '67a96dbbfe645b64291ed62eab6f1eb391a834e0' 
from company

The 14 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 packages/company/.travis.yml|   20 ++
 packages/company/Makefile   |2 +-
 packages/company/NEWS.md|8 
 packages/company/company-capf.el|   26 +++---
 packages/company/company-dabbrev.el |2 +-
 packages/company/company-elisp.el   |2 +-
 packages/company/company-ispell.el  |2 +-
 packages/company/company-oddmuse.el |2 +-
 packages/company/company-tests.el   |   60 +++
 packages/company/company.el |   67 ++
 10 files changed, 165 insertions(+), 26 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.



[ELPA-diffs] [elpa] 04/14: company--should-complete: Don't check if we're in minibuffer

2014-01-14 Thread emacs-devel
This is an automated email from the git hooks/post-receive script.

root pushed a commit to branch master
in repository elpa.

commit f3a632b1581591480d8b0bbfb02116fe44d428fd
Author: Dmitry Gutov 
Date:   Fri Dec 6 03:24:00 2013 +0200

company--should-complete: Don't check if we're in minibuffer

This check has been fairly useless since 25f2c535

#42
---
 company.el |6 ++
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/company.el b/company.el
index b139b26..bee150c 100644
--- a/company.el
+++ b/company.el
@@ -426,8 +426,7 @@ as if it was on this list."
 (defcustom company-selection-wrap-around nil
   "If enabled, selecting item before first or after last wraps around."
   :type '(choice (const :tag "off" nil)
- (const :tag "on" t))
-  :group 'company)
+ (const :tag "on" t)))
 
 (defvar company-end-of-buffer-workaround t
   "Work around a visualization bug when completing at the end of the buffer.
@@ -759,8 +758,7 @@ can retrieve meta-data for them."
 
 (defun company--should-complete ()
   (and (not (or buffer-read-only overriding-terminal-local-map
-overriding-local-map
-(minibufferp)))
+overriding-local-map))
;; Check if in the middle of entering a key combination.
(or (equal (this-command-keys-vector) [])
(not (keymapp (key-binding (this-command-keys-vector)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.



[ELPA-diffs] [elpa] 03/14: company-elisp: enable in inferior-emacs-lisp-mode

2014-01-14 Thread emacs-devel
This is an automated email from the git hooks/post-receive script.

root pushed a commit to branch master
in repository elpa.

commit e56ef8b9ec06a21d6319f046df862a9b6a5dc6b4
Author: Dmitry Gutov 
Date:   Thu Dec 5 02:08:09 2013 +0200

company-elisp: enable in inferior-emacs-lisp-mode

#42
---
 NEWS.md  |4 
 company-elisp.el |2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 8c43c58..ff598f7 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,9 @@
 # History of user-visible changes
 
+## Next
+
+* `company-elisp` is enabled in `inferior-emacs-lisp-mode`.
+
 ## 2013-09-28 (0.6.12)
 
 * Default value of `company-begin-commands` changed to `(self-insert-command)`.
diff --git a/company-elisp.el b/company-elisp.el
index 5bfc27e..0ea4c69 100644
--- a/company-elisp.el
+++ b/company-elisp.el
@@ -197,7 +197,7 @@ first in the candidates list."
   (interactive (list 'interactive))
   (case command
 (interactive (company-begin-backend 'company-elisp))
-(prefix (and (eq (derived-mode-p 'emacs-lisp-mode) 'emacs-lisp-mode)
+(prefix (and (derived-mode-p 'emacs-lisp-mode 'inferior-emacs-lisp-mode)
  (company-elisp--prefix)))
 (candidates (company-elisp-candidates arg))
 (sorted company-elisp-show-locals-first)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.



[ELPA-diffs] [elpa] 09/14: company-capf: Perform sorting before prefix adjustment

2014-01-14 Thread emacs-devel
This is an automated email from the git hooks/post-receive script.

root pushed a commit to branch master
in repository elpa.

commit 8ecec3594931ae8e2329fec4b793ad4ba392e4ef
Author: Dmitry Gutov 
Date:   Mon Jan 6 07:53:07 2014 +0400

company-capf: Perform sorting before prefix adjustment
---
 company-capf.el |   15 ---
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/company-capf.el b/company-capf.el
index ee2ac1e..6dcd87b 100644
--- a/company-capf.el
+++ b/company-capf.el
@@ -54,13 +54,14 @@ Requires Emacs 24.1 or newer."
 (sortfun (cdr (assq 'display-sort-function meta)))
 (boundaries (completion-boundaries arg table pred ""))
 (candidates (all-completions arg table pred)))
-   (unless (zerop (car boundaries))
- (let ((before (substring arg 0 (car boundaries
-   (setq candidates
- (mapcar (lambda (candidate)
-   (concat before candidate))
- candidates
-   (if sortfun (funcall sortfun candidates) candidates)
+   (when sortfun
+ (setq candidates (funcall sortfun candidates)))
+   (if (not (zerop (car boundaries)))
+   (let ((before (substring arg 0 (car boundaries
+ (mapcar (lambda (candidate)
+   (concat before candidate))
+ candidates))
+ candidates)
 (`sorted
  (let ((res (company--capf-data)))
(when res

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.



[ELPA-diffs] [elpa] 06/14: Require cl before using cl

2014-01-14 Thread emacs-devel
This is an automated email from the git hooks/post-receive script.

root pushed a commit to branch master
in repository elpa.

commit 2bf0ecfd29e78d276a18623de637cc7ec78d5bc5
Author: Daniel Colascione 
Date:   Mon Dec 23 05:25:18 2013 -0800

Require cl before using cl
---
 company-oddmuse.el |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/company-oddmuse.el b/company-oddmuse.el
index b76c87e..2415a74 100644
--- a/company-oddmuse.el
+++ b/company-oddmuse.el
@@ -26,9 +26,9 @@
 ;;; Code:
 
 (require 'company)
+(eval-when-compile (require 'cl))
 (eval-when 'compile (require 'yaooddmuse nil t))
 (eval-when 'compile (require 'oddmuse nil t))
-(eval-when-compile (require 'cl))
 
 (defvar company-oddmuse-link-regexp
   "\\(\\<[A-Z][[:alnum:]]*\\>\\)\\|\\[\\[\\([[:alnum:]]+\\>\\|\\)")

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.



[ELPA-diffs] [elpa] 12/14: Close #45

2014-01-14 Thread emacs-devel
This is an automated email from the git hooks/post-receive script.

root pushed a commit to branch master
in repository elpa.

commit bd82c7e096ecf4c6f0a0545f442be4296c741db5
Author: Dmitry Gutov 
Date:   Tue Jan 14 09:41:34 2014 +0200

Close #45

* Replace prefix with candidate unless backend says to keep it.
* Add non-prefix completions support.
---
 NEWS.md|1 +
 company-capf.el|5 +++-
 company-dabbrev.el |2 +-
 company-ispell.el  |2 +-
 company-tests.el   |   67 
 company.el |   44 -
 6 files changed, 106 insertions(+), 15 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index fe9ddf7..beb2cfb 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,6 +2,7 @@
 
 ## Next
 
+* Experimental support for non-prefix completion.
 * Starting with Emacs version 24.4, `company-capf` is included in
   `company-backends` and replaces `company-elisp`.
 * `company-capf` supports completion tables that return non-default boundaries.
diff --git a/company-capf.el b/company-capf.el
index 0d68562..21b9214 100644
--- a/company-capf.el
+++ b/company-capf.el
@@ -58,7 +58,10 @@ Requires Emacs 24.1 or newer."
   table pred))
 (sortfun (cdr (assq 'display-sort-function meta)))
 (boundaries (completion-boundaries arg table pred ""))
-(candidates (all-completions arg table pred)))
+(candidates (completion-all-completions arg table pred (length 
arg)))
+(last (last candidates 1)))
+   (when (numberp (cdr last))
+ (setcdr last nil))
(when sortfun
  (setq candidates (funcall sortfun candidates)))
(if (not (zerop (car boundaries)))
diff --git a/company-dabbrev.el b/company-dabbrev.el
index 1be9792..4b1a9d8 100644
--- a/company-dabbrev.el
+++ b/company-dabbrev.el
@@ -120,7 +120,7 @@ See also `company-dabbrev-time-limit'."
  (company-dabbrev--search (company-dabbrev--make-regexp arg)
   company-dabbrev-time-limit
   company-dabbrev-other-buffers)))
-(ignore-case t)
+(ignore-case 'keep-prefix)
 (duplicates t)))
 
 (provide 'company-dabbrev)
diff --git a/company-ispell.el b/company-ispell.el
index 9647f85..3e599f0 100644
--- a/company-ispell.el
+++ b/company-ispell.el
@@ -63,7 +63,7 @@ If nil, use `ispell-complete-word-dict'."
 (candidates (lookup-words arg (or company-ispell-dictionary
   ispell-complete-word-dict)))
 (sorted t)
-(ignore-case t)))
+(ignore-case 'keep-prefix)))
 
 (provide 'company-ispell)
 ;;; company-ispell.el ends here
diff --git a/company-tests.el b/company-tests.el
index 016e439..b111822 100644
--- a/company-tests.el
+++ b/company-tests.el
@@ -162,6 +162,73 @@
   (should (null company-candidates))
   (should (null (company-explicit-action-p))
 
+(ert-deftest company-ignore-case-replaces-prefix ()
+  (with-temp-buffer
+(company-mode)
+(let (company-frontends
+  (company-backends
+   (list (lambda (command &optional arg)
+   (case command
+ (prefix (buffer-substring (point-min) (point)))
+ (candidates '("abcd" "abef"))
+ (ignore-case t))
+  (insert "A")
+  (let (this-command)
+(company-complete))
+  (should (string= "ab" (buffer-string)))
+  (delete-char -2)
+  (insert "AB") ; hack, to keep it in one test
+  (company-complete-selection)
+  (should (string= "abcd" (buffer-string))
+
+(ert-deftest company-ignore-case-with-keep-prefix ()
+  (with-temp-buffer
+(insert "AB")
+(company-mode)
+(let (company-frontends
+  (company-backends
+   (list (lambda (command &optional arg)
+   (case command
+ (prefix (buffer-substring (point-min) (point)))
+ (candidates '("abcd" "abef"))
+ (ignore-case 'keep-prefix))
+  (let (this-command)
+(company-complete))
+  (company-complete-selection)
+  (should (string= "ABcd" (buffer-string))
+
+(ert-deftest company-non-prefix-completion ()
+  (with-temp-buffer
+(insert "tc")
+(company-mode)
+(let (company-frontends
+  company-end-of-buffer-workaround
+  (company-backends
+   (list (lambda (command &optional arg)
+   (case command
+ (prefix (buffer-substring (point-min) (point)))
+ (candidates '("tea-cup" "teal-color")))
+  (let (this-command)
+(company-complete))
+  (should (string= "tc" (buffer-string))
+
+(ert-deftest company-non-prefix-completion ()
+  (with-temp-buffer
+(insert "tc")
+(company-mode)
+(let (company-frontends
+  company-end-of-buffer-workarou

[ELPA-diffs] [elpa] 05/14: Fix #43

2014-01-14 Thread emacs-devel
This is an automated email from the git hooks/post-receive script.

root pushed a commit to branch master
in repository elpa.

commit f4174bc6156a831a9a465c0f60da004e9997fa1a
Author: Dmitry Gutov 
Date:   Mon Dec 23 12:46:38 2013 +0200

Fix #43
---
 company-tests.el |7 +++
 company.el   |6 --
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/company-tests.el b/company-tests.el
index 870ad2b..016e439 100644
--- a/company-tests.el
+++ b/company-tests.el
@@ -198,6 +198,13 @@
 (should (string= (overlay-get ov 'company-after)
  " 123\nc45 c\nddd\n")))
 
+(ert-deftest company-create-lines-shows-numbers ()
+  (let ((company-show-numbers t)
+(company-candidates '("x" "y" "z"))
+(company-candidates-length 3))
+(should (equal '("x 1" "y 2" "z 3")
+   (company--create-lines 0 999)
+
 (ert-deftest company-column-with-composition ()
   (with-temp-buffer
 (insert "lambda ()")
diff --git a/company.el b/company.el
index bee150c..0d3bb38 100644
--- a/company.el
+++ b/company.el
@@ -1773,8 +1773,10 @@ Example: \(company-begin-with '\(\"foo\" \"foobar\" 
\"foobarbaz\"\)\)"
 
 (dotimes (_ len)
   (setq width (max (length (pop lines-copy)) width)))
-(setq width (min width (window-width)))
-
+(setq width (min (window-width)
+ (if company-show-numbers
+ (+ 2 width)
+   width)))
 (setq lines-copy lines)
 
 ;; number can make tooltip too long

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.



[ELPA-diffs] [elpa] 02/14: Add option to wrap around selection in popup

2014-01-14 Thread emacs-devel
This is an automated email from the git hooks/post-receive script.

root pushed a commit to branch master
in repository elpa.

commit b584759ed43a4a175706ca40b03dcebcf7b9ace9
Author: Ingo Lohmar 
Date:   Fri Nov 1 03:02:24 2013 +0400

Add option to wrap around selection in popup

Close #39
---
 company.el |   11 ++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/company.el b/company.el
index ec0f2b3..b139b26 100644
--- a/company.el
+++ b/company.el
@@ -423,6 +423,12 @@ as if it was on this list."
   :type '(choice (const :tag "off" nil)
  (const :tag "on" t)))
 
+(defcustom company-selection-wrap-around nil
+  "If enabled, selecting item before first or after last wraps around."
+  :type '(choice (const :tag "off" nil)
+ (const :tag "on" t))
+  :group 'company)
+
 (defvar company-end-of-buffer-workaround t
   "Work around a visualization bug when completing at the end of the buffer.
 The work-around consists of adding a newline.")
@@ -772,7 +778,10 @@ can retrieve meta-data for them."
 frontend (error-message-string err) command)
 
 (defun company-set-selection (selection &optional force-update)
-  (setq selection (max 0 (min (1- company-candidates-length) selection)))
+  (setq selection
+(if company-selection-wrap-around
+(mod selection company-candidates-length)
+  (max 0 (min (1- company-candidates-length) selection
   (when (or force-update (not (equal selection company-selection)))
 (setq company-selection selection
   company-selection-changed t)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.



[ELPA-diffs] [elpa] 11/14: Replace company-elisp with company-capf

2014-01-14 Thread emacs-devel
This is an automated email from the git hooks/post-receive script.

root pushed a commit to branch master
in repository elpa.

commit 55caaa4a05781354d6bb81005f7f25dad99d7933
Author: Dmitry Gutov 
Date:   Tue Jan 14 06:45:32 2014 +0200

Replace company-elisp with company-capf
---
 NEWS.md |2 ++
 company-capf.el |   11 ---
 company.el  |8 +++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index ae1124c..fe9ddf7 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,6 +2,8 @@
 
 ## Next
 
+* Starting with Emacs version 24.4, `company-capf` is included in
+  `company-backends` and replaces `company-elisp`.
 * `company-capf` supports completion tables that return non-default boundaries.
 * `company-elisp` is enabled in `inferior-emacs-lisp-mode`.
 
diff --git a/company-capf.el b/company-capf.el
index 6dcd87b..0d68562 100644
--- a/company-capf.el
+++ b/company-capf.el
@@ -25,10 +25,15 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (defun company--capf-data ()
-  (let ((data (run-hook-wrapped 'completion-at-point-functions
-;; Ignore misbehaving functions.
-#'completion--capf-wrapper 'optimist)))
+  ;; Ignore tags-completion-at-point-function because it subverts company-etags
+  ;; in the default value of company-backends, where the latter comes later.
+  (letf* (((default-value 'completion-at-point-functions) nil)
+  (data (run-hook-wrapped 'completion-at-point-functions
+  ;; Ignore misbehaving functions.
+  #'completion--capf-wrapper 'optimist)))
 (when (consp data) data)))
 
 (defun company-capf (command &optional arg &rest _args)
diff --git a/company.el b/company.el
index 0d3bb38..5f9d6e1 100644
--- a/company.el
+++ b/company.el
@@ -243,9 +243,15 @@ If this many lines are not available, prefer to display 
the tooltip above."
 (assq backend company-safe-backends))
 (return t))
 
-(defcustom company-backends '(company-elisp company-nxml company-css
+(defvar company--include-capf (version< "24.3.50" emacs-version))
+
+(defcustom company-backends `(,@(unless company--include-capf
+  (list 'company-elisp))
+  company-nxml company-css
   company-eclim company-semantic company-clang
   company-xcode company-ropemacs company-cmake
+  ,@(when company--include-capf
+  (list 'company-capf))
   (company-gtags company-etags company-dabbrev-code
company-keywords)
   company-oddmuse company-files company-dabbrev)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.



[ELPA-diffs] [elpa] branch master updated (e6d8543 -> 34f15b6)

2014-01-14 Thread emacs-devel
This is an automated email from the git hooks/post-receive script.

root pushed a change to branch master
in repository elpa.

  from  e6d8543   Merge commit '67a96dbbfe645b64291ed62eab6f1eb391a834e0' 
from company
   new  34f15b6   New package: ascii-art-to-unicode

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../ascii-art-to-unicode/ascii-art-to-unicode.el   |  277 
 1 files changed, 277 insertions(+), 0 deletions(-)
 create mode 100644 packages/ascii-art-to-unicode/ascii-art-to-unicode.el

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.



[ELPA-diffs] [elpa] 14/14: Merge commit '67a96dbbfe645b64291ed62eab6f1eb391a834e0' from company

2014-01-14 Thread emacs-devel
This is an automated email from the git hooks/post-receive script.

root pushed a commit to branch master
in repository elpa.

commit e6d8543056c171b8f295ed35979ad925c9dda6be
Merge: 25219bd 67a96db
Author: Dmitry Gutov 
Date:   Tue Jan 14 15:39:37 2014 +0200

Merge commit '67a96dbbfe645b64291ed62eab6f1eb391a834e0' from company

Conflicts:
packages/company/company-elisp.el
packages/company/company-oddmuse.el

 packages/company/.travis.yml|   20 ++
 packages/company/Makefile   |2 +-
 packages/company/NEWS.md|8 
 packages/company/company-capf.el|   26 +++---
 packages/company/company-dabbrev.el |2 +-
 packages/company/company-elisp.el   |2 +-
 packages/company/company-ispell.el  |2 +-
 packages/company/company-oddmuse.el |2 +-
 packages/company/company-tests.el   |   60 +++
 packages/company/company.el |   67 ++
 10 files changed, 165 insertions(+), 26 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.



[ELPA-diffs] [elpa] 01/01: New package: ascii-art-to-unicode

2014-01-14 Thread emacs-devel
This is an automated email from the git hooks/post-receive script.

root pushed a commit to branch master
in repository elpa.

commit 34f15b65699ed3bb7b5cf6f9f1c12fd99a937c8f
Author: Thien-Thi Nguyen 
Date:   Tue Jan 14 21:54:33 2014 +0100

New package: ascii-art-to-unicode

* packages/ascii-art-to-unicode/: New dir.
* packages/ascii-art-to-unicode/ascii-art-to-unicode.el: New file.
---
 .../ascii-art-to-unicode/ascii-art-to-unicode.el   |  277 
 1 files changed, 277 insertions(+), 0 deletions(-)

diff --git a/packages/ascii-art-to-unicode/ascii-art-to-unicode.el 
b/packages/ascii-art-to-unicode/ascii-art-to-unicode.el
new file mode 100644
index 000..6c691a7
--- /dev/null
+++ b/packages/ascii-art-to-unicode/ascii-art-to-unicode.el
@@ -0,0 +1,277 @@
+;;; ascii-art-to-unicode.el --- a small artist adjunct -*- lexical-binding: t 
-*-
+
+;; Copyright (C) 2014  Free Software Foundation, Inc.
+
+;; Author: Thien-Thi Nguyen 
+;; Version: 1.4
+
+;; 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
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see .
+
+;;; Commentary:
+
+;; The command `aa2u' converts simple ASCII art line drawings in
+;; the {active,accessible} region of the current buffer to Unicode.
+;;
+;; Example use case:
+;; - M-x artist-mode RET
+;; - C-c C-a r   ; artist-select-op-rectangle
+;; - (draw two rectangles)
+;;
+;;   +---+
+;;   |   |
+;;   |   +---+--+
+;;   |   |   |  |
+;;   |   |   |  |
+;;   |   |   |  |
+;;   +---+---+  |
+;;   |  |
+;;   |  |
+;;   |  |
+;;   +--+
+;;
+;; - C-c C-c ; artist-mode-off (optional)
+;; - C-x n n ; narrow-to-region
+;; - M-x aa2u RET
+;;
+;;   ┌───┐
+;;   │   │
+;;   │   ┌───┼──┐
+;;   │   │   │  │
+;;   │   │   │  │
+;;   │   │   │  │
+;;   └───┼───┘  │
+;;   │  │
+;;   │  │
+;;   │  │
+;;   └──┘
+;;
+;; TODO:
+;; - Add phase 0, to grok and lock label (as opposed to line) text.
+;; - Add interactive mode, to choose per-line light vs heavy.
+;; - Improve neighbor-determining heuristic.
+;; - Choose plus-replacement by composing "VERTICAL", "LEFT", etc.
+
+;;; News:
+
+;; - 1.4 | 2014-01-14
+;;   - move to ELPA (from )
+;;   - change copyright to FSF
+;;   - require 'cl-lib instead of 'cl
+;;   - use ‘cl-flet’ and ‘cl-labels’
+;;   - comment munging
+;; - add ‘lexical-binding: t’
+;; - remove huge list at EOF
+;; - add Author and News headers
+;;
+;; - 1.3 | 2013-09-21
+;;   - bug fixed: ‘?+’ neighbor valuation polarity flipped
+;;   - new support for BOX DRAWINGS LIGHT {UP,DOWN,LEFT,RIGHT} (singleton)
+;;
+;; - 1.2 | 2012-11-05
+;;   - refer to Unicode characters by name, not number
+;;
+;; - 1.1 | 2012-04-17
+;;   - TAB agnostic
+;;   - ‘aa2u’ operates on active region if ‘use-region-p’
+;;   - example use case also demonstrates transformation
+;;
+;; - 1.0 | 2012-04-07
+;;   - initial release
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'pcase)
+
+;;;---
+;;; support
+
+(defun aa2u-ucs-bd-uniform-name (weight &rest components)
+  "Return a string naming UCS char w/ WEIGHT and COMPONENTS.
+The string begins with \"BOX DRAWINGS\"; followed by WEIGHT,
+a symbol from the set:
+
+  HEAVY
+  LIGHT
+
+followed by COMPONENTS, a list of one or two symbols from the set:
+
+  VERTICAL
+  HORIZONTAL
+  DOWN
+  UP
+  RIGHT
+  LEFT
+
+If of length two, the first element in COMPONENTS should be
+the \"Y-axis\" (VERTICAL, DOWN, UP).  In that case, the returned
+string includes \"AND\" between the elements of COMPONENTS.
+
+Lastly, all words are separated by space (U+20)."
+  (format "BOX DRAWINGS %s %s"
+  weight
+  (mapconcat 'symbol-name components
+ " AND ")))
+
+(defun aa2u-1c (stringifier &rest components)
+  "Apply STRINGIFIER to COMPONENTS; return the UCS char w/ this name.
+The char is a string (of length one), with two properties:
+
+  aa2u-stringifier
+  aa2u-components
+
+Their values are STRINGIFIER and COMPONENTS, respectively."
+  (let ((s (string (cdr (assoc-string (apply stringifier components)
+