Update some keybindings, lighters & more

C-c map:
- use d for "display" features
- m for "manuals"
- only bind p [cf] when the equivalent C-x binding does not exist.

Org 9.3.7 (future 9.4) now honors electric-indent-mode.

Delight visual-line-mode since I have fringe indicators.

Keep selection highlighted when moving to another window.

2 files changed, 14 insertions, 9 deletions

diff --git a/.emacs b/.emacs
index 51a9160..17e9637 100644
--- a/.emacs
+++ b/.emacs
@@ -124,25 +124,28 @@
   (magit-status (project-prompt-project-dir)))
 
 (global-set-key (kbd "C-c c") 'compile)
+(global-set-key (kbd "C-c d t") 'toggle-truncate-lines)
+(global-set-key (kbd "C-c d v") 'visual-line-mode)
 (global-set-key (kbd "C-c e f") 'auto-fill-mode)
 (global-set-key (kbd "C-c i t") (my/make-toggle-input-method 'TeX))
 (global-set-key (kbd "C-c i u") (my/make-toggle-input-method 'my/input-method))
 (global-set-key (kbd "C-c k f") 'my/kill-ring-filename)
 (global-set-key (kbd "C-c k |") 'my/kill-ring-pipe-region)
 (global-set-key (kbd "C-c k !") 'my/kill-ring-shell)
-(global-set-key (kbd "C-c m") 'man)
-(global-set-key (kbd "C-c p c") (my/make-project-wide 'compile))
+(global-set-key (kbd "C-c m i") 'info-display-manual)
+(global-set-key (kbd "C-c m m") 'man)
 (global-set-key (kbd "C-c p g") 'my/magit-project)
 (global-set-key (kbd "C-c p !") (my/make-project-wide 'shell-command))
 (global-set-key (kbd "C-c p &") (my/make-project-wide 'async-shell-command))
-(global-set-key (kbd "C-c p f") 'project-find-file)
-(global-set-key (kbd "C-c t") 'toggle-truncate-lines)
-(global-set-key (kbd "C-c v") 'visual-line-mode)
 (global-set-key (kbd "C-c w c") 'whitespace-cleanup)
 (global-set-key (kbd "C-c w f") 'page-break-lines-mode)
 (global-set-key (kbd "C-c w m") 'whitespace-mode)
 (global-set-key (kbd "C-c w t") 'my/set-tab-width)
 
+(unless (>= emacs-major-version 28)
+  (global-set-key (kbd "C-c p c") (my/make-project-wide 'compile))
+  (global-set-key (kbd "C-c p f") 'project-find-file))
+
 (rg-enable-default-bindings)            ; Uses the C-c s prefix.
 
 ;; What's life without a little risk?
@@ -186,7 +189,7 @@
 (delight 'text-scale-mode
          '(:eval (if (>= text-scale-mode-amount 0) "🗚" "🗛"))
          'face-remap)
-(delight 'visual-line-mode "⤸" t)
+(delight 'visual-line-mode nil t)
 (delight 'whitespace-mode nil 'whitespace)
 (delight 'with-editor-mode "⸎" 'with-editor)
 ;; TODO: Narrow (⌖, ⛶)
@@ -308,10 +311,11 @@
           (lambda ()
             (ibuffer-switch-to-saved-filter-groups "my/ibuffer-groups")))
 
-(eval-after-load 'org-keys
+(eval-after-load 'org
   '(progn
-     (define-key org-mode-map (kbd "C-j") 'org-return)
-     (define-key org-mode-map (kbd "RET") 'org-return-indent)))
+     (when (version< org-version "9.3.7")
+       (define-key org-mode-map (kbd "C-j") 'org-return)
+       (define-key org-mode-map (kbd "RET") 'org-return-indent))))
 
 
 ;; Helper functions and miscellaneous settings.
diff --git a/.emacs-custom.el b/.emacs-custom.el
index 367015d..6580748 100644
--- a/.emacs-custom.el
+++ b/.emacs-custom.el
@@ -41,6 +41,7 @@
  '(global-diff-hl-mode t)
  '(global-page-break-lines-mode t nil (page-break-lines))
  '(gnus-cloud-method "nnimap:gmail")
+ '(highlight-nonselected-windows t)
  '(hscroll-step 1)
  '(ibuffer-default-sorting-mode 'filename/process)
  '(icomplete-mode t)