[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org f84033b 1/2: Merge branch 'maint'
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org f84033b 1/2: Merge branch 'maint' |
Date: |
Sat, 1 May 2021 16:57:12 -0400 (EDT) |
branch: externals/org
commit f84033b0887f83ef1bf701257f152fd064551978
Merge: 2d965df ccd513a
Author: Bastien <bzg@gnu.org>
Commit: Bastien <bzg@gnu.org>
Merge branch 'maint'
---
lisp/org.el | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/lisp/org.el b/lisp/org.el
index e6d4414..7506f79 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -4918,6 +4918,18 @@ The following commands are available:
(when org-startup-numerated (require 'org-num) (org-num-mode 1))
(when org-startup-indented (require 'org-indent) (org-indent-mode 1))))
+ ;; Add a custom keymap for `visual-line-mode' so that activating
+ ;; this minor mode does not override Org's keybindings.
+ ;; FIXME: Probably `visual-line-mode' should take care of this.
+ (let ((oldmap (cdr (assoc 'visual-line-mode minor-mode-map-alist)))
+ (newmap (make-sparse-keymap)))
+ (set-keymap-parent newmap oldmap)
+ (define-key newmap [remap move-beginning-of-line] nil)
+ (define-key newmap [remap move-end-of-line] nil)
+ (define-key newmap [remap kill-line] nil)
+ (make-local-variable 'minor-mode-overriding-map-alist)
+ (push `(visual-line-mode . ,newmap) minor-mode-overriding-map-alist))
+
;; Activate `org-table-header-line-mode'
(when org-table-header-line-p
(org-table-header-line-mode 1))