branch: externals/company
commit 6d10e3db3f5c20c421facff9a848707beb54d411
Author: Dmitry Gutov <[email protected]>
Commit: Dmitry Gutov <[email protected]>

    Improve NEWS entry
---
 NEWS.md | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 8af89966e2..5873d9e6a4 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -3,8 +3,20 @@
 # Next
 
 * Default key bindings have been changed, moving `company-show-doc-buffer` and
-  `company-show-location` to `M-h` and `M-g` (from `C-h` and `C-w`)
-  ([#1537](https://github.com/company-mode/company-mode/issues/1537)).
+  `company-show-location` to `M-h` and `M-g` (from `C-h`/`<f1>` and `C-w`)
+  ([#1537](https://github.com/company-mode/company-mode/issues/1537)). The
+  previous bindings still work, but show a warning and will be disabled after
+  the next release. To undo that change locally, do:
+
+```el
+(with-eval-after-load 'company
+  (define-key company-active-map (kbd "C-h") #'company-show-doc-buffer)
+  (define-key company-active-map (kbd "<f1>") #'company-show-doc-buffer)
+  (define-key company-active-map (kbd "C-w") #'company-show-location)
+  (define-key company-active-map (kbd "M-h") nil)
+  (define-key company-active-map (kbd "M-g") nil))
+```
+
 * Search mode input is displayed at the bottom of the popup
   ([#1535](https://github.com/company-mode/company-mode/pull/1535)).
 * New built-in frontend using "real graphical" widget for the popup

Reply via email to