Revert "Remove the [return] binding (#530)"

This reverts commit e357eb695f9f0d5274b1ec5ce5c854a71650c115.

And fixes #543.

diff --git a/company.el b/company.el
index 27bee545acef1ea334e3957546db662b36af24a3..bfadc99a792c6352d2bfe109bc537dbdb0a49470 100644 (file)
--- a/company.el
+++ b/company.el
@@ -643,6 +643,7 @@ asynchronous call into synchronous.")
     (define-key keymap [mouse-3] 'company-select-mouse)
     (define-key keymap [up-mouse-1] 'ignore)
     (define-key keymap [up-mouse-3] 'ignore)
+    (define-key keymap [return] 'company-complete-selection)
     (define-key keymap (kbd "RET") 'company-complete-selection)
     (define-key keymap [tab] 'company-complete-common)
     (define-key keymap (kbd "TAB") 'company-complete-common)