branch: externals/company
commit e0f8c9ad754bdc2c02318f4baf433886c7aa83e3
Author: Dmitry Gutov <dgu...@yandex.ru>
Commit: Dmitry Gutov <dgu...@yandex.ru>
Use the -or-abort versions of commands
---
NEWS.md | 8 +++++---
company.el | 8 ++++----
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/NEWS.md b/NEWS.md
index 7d56aec..e247c94 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -6,9 +6,11 @@
([#949](https://github.com/company-mode/company-mode/issues/949)).
* Default key bindings have been changed, moving `company-select-next` and
`company-select-previous` from `M-n` and `M-p` to `C-n` and `C-p`
- ([#1098](https://github.com/company-mode/company-mode/pull/1098)). The
- previous bindings still work, but show a warning and will be disabled soon.
To
- undo that change locally, do:
+ ([#1098](https://github.com/company-mode/company-mode/pull/1098)). The bound
+ commands are also changed: `company-select-next-or-abort` and
+ `company-select-previous-or-abort`, to match the `<up>` and `<down>`
+ bindings. The previous bindings still work, but show a warning and will be
+ disabled soon. To undo that change locally, do:
```el
(with-eval-after-load 'company
diff --git a/company.el b/company.el
index 13aaea7..5358fe3 100644
--- a/company.el
+++ b/company.el
@@ -688,8 +688,8 @@ asynchronous call into synchronous.")
(define-key keymap "\C-g" 'company-abort)
(define-key keymap (kbd "M-n") 'company--select-next-and-warn)
(define-key keymap (kbd "M-p") 'company--select-previous-and-warn)
- (define-key keymap (kbd "C-n") 'company-select-next)
- (define-key keymap (kbd "C-p") 'company-select-previous)
+ (define-key keymap (kbd "C-n") 'company-select-next-or-abort)
+ (define-key keymap (kbd "C-p") 'company-select-previous-or-abort)
(define-key keymap (kbd "<down>") 'company-select-next-or-abort)
(define-key keymap (kbd "<up>") 'company-select-previous-or-abort)
(define-key keymap [remap scroll-up-command] 'company-next-page)
@@ -2259,8 +2259,8 @@ each one wraps a part of the input string."
(define-key keymap (char-to-string meta-prefix-char) meta-map)
(define-key keymap [escape] meta-map))
(define-key keymap (vector meta-prefix-char t) 'company-search-other-char)
- (define-key keymap (kbd "C-n") 'company-select-next)
- (define-key keymap (kbd "C-p") 'company-select-previous)
+ (define-key keymap (kbd "C-n") 'company-select-next-or-abort)
+ (define-key keymap (kbd "C-p") 'company-select-previous-or-abort)
(define-key keymap (kbd "M-n") 'company--select-next-and-warn)
(define-key keymap (kbd "M-p") 'company--select-previous-and-warn)
(define-key keymap (kbd "<down>") 'company-select-next-or-abort)
