From: rearman <rearman@r717.net>
Date: Wed, 12 Jun 2024 13:04:43 +0000 (-0400)
Subject: Remove android stuff, fix C-h binding
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=936eeb01868d345fcc8307ac9988e962b375d563;p=emacsinit.git

Remove android stuff, fix C-h binding
---

diff --git a/init.org b/init.org
index 95eba9d..df25862 100644
--- a/init.org
+++ b/init.org
@@ -44,7 +44,7 @@ git update-index --no-assume-unchanged init.el
 #+END_SRC
 
 * Early init
-This file was introduced in Emacs 27.  I use it for speeding up init, removing all the UI stuff I don't want, etc.  Maybe superfluous, but I do get startup times on the order of /0.015/ seconds.  No longer superfluous, because this is where you set up the items needed for android emacs to play nice with termux - see [[https://sourceforge.net/projects/android-ports-for-gnu-emacs/files/termux][SourceForge]]
+This file was introduced in Emacs 27.  I use it for speeding up init, removing all the UI stuff I don't want, etc.  Maybe superfluous, but I do get startup times on the order of /0.015/ seconds on Windows.
 
 ** The normal header
 There are no GNU Police (yet), but I feel nicer by adding this in.
@@ -56,16 +56,6 @@ There are no GNU Police (yet), but I feel nicer by adding this in.
 ;; Code:
 #+END_SRC
 
-** Android Setup
-Version 30.0 brings android support - let's try it out.  This makes emacs play nice with termux.  See [[https://sourceforge.net/projects/android-ports-for-gnu-emacs/files/termux][SourceForge]].
-#+BEGIN_SRC emacs-lisp :tangle ./early-init.el
-(when (equal system-type 'android)
-  (defvar termux-path "/data/data/com.termux/files/usr/bin")
-  (setenv "PATH" (format "%s:%s" termux-path
-                         (getenv "PATH")))
-  (push termux-path exec-path))
-#+END_SRC
-
 ** GC thrashing
 Set the GC threshold to max during startup, then set it back to a value that is somewhat more sane than the default /800kb/.
 
@@ -136,14 +126,13 @@ Exactly what they say they are
 #+END_SRC
 
 *** Packages I don't want on my work computers
-I don't need these on a windows PC or android.
+I don't need these on a windows PC.
 #+BEGIN_SRC emacs-lisp
-(unless (or (equal system-type 'windows-nt)
-            (equal system-type 'android))
+(unless (equal system-type 'windows-nt)
   (use-package ledger-mode
     :ensure t
     :bind
-  ((:map ledger-mode-map ("C-c s" . ledger-sort-buffer)))))
+    ((:map ledger-mode-map ("C-c s" . ledger-sort-buffer)))))
 #+END_SRC
 
 *** visual-fill-column
@@ -199,9 +188,9 @@ This comes with base corfu, but is configured separately.
   (corfu-popupinfo-delay '(nil . 0.01))
   (corfu-popupinfo-hide nil)
   :config
-  (corfu-popupinfo-mode)
-  :bind
-  ((:map corfu-map ("C-h" . corfu-popupinfo-toggle))))
+  (corfu-popupinfo-mode))
+  ;; :bind
+  ;; ((:map corfu-map ("C-h" . corfu-popupinfo-toggle))))
 #+END_SRC
 
 *** expand-region
@@ -248,9 +237,8 @@ I need to open binary files with their own editor.  Disgusting.
 *** acme-mouse
 Not a package in the strict sense, just a .el file loaded as a git submodule - forked from [[https://github.com/akrito/acme-mouse/]] to [[https://github.com/rearman/acme-mouse/]] and modified to meet changes to the old =cl= package, and to fix the ~mouse-3~ search function.  Also see the [[id:451a20e6-73a0-4d55-aeaa-e795980a6974][Maus]] section.
 #+BEGIN_SRC emacs-lisp
-(unless (equal system-type 'android)
-  (add-to-list 'load-path (concat user-emacs-directory "acme-mouse/"))
-  (require 'acme-mouse))
+(add-to-list 'load-path (concat user-emacs-directory "acme-mouse/"))
+(require 'acme-mouse)
 #+END_SRC
 
 *** AUCTeX
@@ -407,8 +395,7 @@ I originally had custom defuns and bindings to do this, but then I found out it
 :END:
 Don't follow links with mouse-1, so I can select without having to use the keyboard (when I want to).
 #+BEGIN_SRC emacs-lisp
-(unless (equal system-type 'android)
-  (setq mouse-1-click-follows-link nil))
+(setq mouse-1-click-follows-link nil)
 #+END_SRC
 
 *** Buffer looks
@@ -669,9 +656,9 @@ Since =C-u= is =universal-argument=, I put that functionality on =M-'=.
 #+END_SRC
 
 ****** =C-h=
-We already have =F1= for help.
+We already have =F1= for help. Use this setup instead of ~key-translate~ because that doesn't work whun running the daemon.
 #+BEGIN_SRC emacs-lisp
-(keyboard-translate ?\C-h ?\C-?)
+(keymap-set key-translation-map "C-h" "<DEL>")
 #+END_SRC
 
 **** Moving
@@ -786,8 +773,7 @@ When a sexp is complete - that is when parens balance as you type - execute it."
 *** *NIX
 These defuns are here so that I can use doas/sudo over tramp to edit /local/ files requiring root permissions.  Doas for BSD, Sudo for Linux, nothing for Windows.
 #+BEGIN_SRC emacs-lisp
-(unless (or (equal system-type 'windows-nt)
-            (equal system-type 'android))
+(unless (equal system-type 'windows-nt)
   (if(equal system-type 'berkeley-unix)
       (defun doas ()
         "Use TRAMP to reopen the current buffer as root using doas."
@@ -1029,7 +1015,7 @@ Make the =C-c C-j= binding more useful
 #+BEGIN_SRC emacs-lisp
 (setq org-goto-interface 'outline-path-completion
       org-outline-path-complete-in-steps nil
-      org-goto-max-level 3)
+      org-goto-max-level 20)
 #+END_SRC
 
 *** Special keys & subtree yanking