[nongnu] elpa/nasm-mode 2fe823c 43/67: Adjust nasm-mode to remap join-line specifically.

[ELPA Syncer]

branch: elpa/nasm-mode
commit 2fe823c54fcc233c1053135f22e3130447d9b432
Author: Christopher Wellons <well...@nullprogram.com>
Commit: Christopher Wellons <well...@nullprogram.com>

    Adjust nasm-mode to remap join-line specifically.
---
 nasm-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nasm-mode.el b/nasm-mode.el
index 188f9a0..f0fc63e 100644
--- a/nasm-mode.el
+++ b/nasm-mode.el
@@ -567,7 +567,7 @@
     (prog1 map
       (define-key map (kbd ":") #'nasm-colon)
       (define-key map (kbd ";") #'nasm-comment)
-      (define-key map (kbd "M-^") #'nasm-join-line)))
+      (define-key map [remap join-line] #'nasm-join-line)))
   "Key bindings for `nasm-mode'.")
 
 (defun nasm-colon ()