Merge branch 'main' of https://tildegit.org/acdw/emacs into work

1 files changed, 56 insertions, 65 deletions

@@ -210,25 +210,6 @@ This is extremely fiddly and I'd love another option.
   (define-key acdw/map (kbd "M-o") #'crux-other-window-or-switch-buffer)
 #+end_src
 
-*** Visual fill column mode
-
-In reading-intensive views, this mode keeps the text from getting too
-wide.
-
-#+begin_src emacs-lisp :noweb-ref packages
-  (straight-use-package 'visual-fill-column)
-#+end_src
-
-#+begin_src emacs-lisp :noweb-ref settings
-  (setq-default visual-fill-column-center-text t)
-#+end_src
-
-#+begin_src emacs-lisp :noweb-ref hooks
-;  (add-hook 'visual-line-mode-hook #'visual-fill-column-mode)
-
-  (with-eval-after-load 'visual-fill-column
-    (advice-add 'text-scale-adjust :after #'visual-fill-column-adjust))
-#+end_src
 
 *** The *Help* window
 
@@ -415,11 +396,11 @@ But on Windows, I use Consolas.
 #+begin_src emacs-lisp :noweb-ref windows-specific
   (set-face-attribute 'default nil
                       :family "Consolas"
-                      :height 110)
+                      :height 100)
 
   (set-face-attribute 'fixed-pitch nil
                       :family "Consolas"
-                      :height 110)
+                      :height 100)
 #+end_src
 
 *** Underlines
@@ -1294,30 +1275,13 @@ that's the only time I accidentally call it, anyway.
 
 *** Auto-fill vs. Visual-line
 
-I've mostly been using visual-line mode, and it's been pretty good.
-There are some times, however, when lines are just ... really long,
-and they wrap weird or whatever.  Not to mention, in Org mode,
-=visual-line-mode= screws up the bindings for line movement.  So
-here's what I'm going to do.
-
-1. Enable =visual-line-mode= with =text-mode=, but /not/ with
-   =org-mode=.
-
-   #+begin_src emacs-lisp :noweb-ref hooks
-     (defun hook--visual-line-mode ()
-       (unless (eq major-mode 'org-mode)
-         (visual-line-mode +1)))
-
-     (add-hook 'text-mode-hook #'hook--visual-line-mode)
-   #+end_src
-
-2. Enable =auto-fill-mode= with text modes.
+1. Enable =auto-fill-mode= with text modes.
 
    #+begin_src emacs-lisp :noweb-ref hooks
      (add-hook 'text-mode-hook #'auto-fill-mode)
    #+end_src
 
-3. /Just/ in case ... let's "fix" =visual-line-mode= if we're in =org-mode=.
+2. /Just/ in case ... let's "fix" =visual-line-mode= if we're in =org-mode=.
 
    #+begin_src emacs-lisp :noweb-ref hooks
      (defun hook--visual-line-fix-org-keys ()
@@ -1334,6 +1298,26 @@ I think that'll work -- I only care about line aesthetics with text.
 Programming modes should be /allowed/ to have long lines, regardless
 of how /terrible/ it is to have them.
 
+*** Visual fill column mode
+
+In reading-intensive views, this mode keeps the text from getting too
+wide.
+
+#+begin_src emacs-lisp :noweb-ref packages
+  (straight-use-package 'visual-fill-column)
+#+end_src
+
+#+begin_src emacs-lisp :noweb-ref settings
+  (setq-default visual-fill-column-center-text t)
+#+end_src
+
+#+begin_src emacs-lisp :noweb-ref hooks
+  (add-hook 'visual-fill-column-mode-hook #'visual-line-mode)
+
+  (with-eval-after-load 'visual-fill-column
+    (advice-add 'text-scale-adjust :after #'visual-fill-column-adjust))
+#+end_src
+
 *** Stay snappy with long-lined files
 
 #+begin_src emacs-lisp :noweb-ref modes
@@ -1421,6 +1405,9 @@ It manages my whitespace for me, anyway.
 
 ** The Mark
 
+see also
+- [[https://spwhitton.name/blog/entry/transient-mark-mode/][Gnu Emacs' Transient Mark mode]], Sean Whitton
+
 *** Repeat popping the mark without repeating the prefix argument
 
 #+begin_src emacs-lisp :noweb-ref settings
@@ -1973,7 +1960,9 @@ See [[https://github.com/redguardtoo/mastering-emacs-in-one-year-guide/blob/mast
 
 #+begin_src emacs-lisp :noweb-ref settings
   (setq elfeed-feeds
-        `(("https://rachelbythebay.com/w/atom.xml" blags tech)
+        `(
+          ("https://atthis.link/rss.xml" blags tech)
+          ("https://rachelbythebay.com/w/atom.xml" blags tech)
           ("https://notes.neeasade.net/rss_full.xml" blags tech)
           ("https://www.uninformativ.de/blog/feeds/en.atom" blags tech)
           ("http://blog.z3bra.org/rss/feed.xml" blags tech)
@@ -1997,35 +1986,37 @@ See [[https://github.com/redguardtoo/mastering-emacs-in-one-year-guide/blob/mast
           (,(concat ; long-ass url
              "https://tilde.news/rss?token="
              "FvdFj8rQkhrBy9j1yON1t6RYKDdcuG1MoUlyvRICmbgDGCf2JTWAEObDhdgt")
-            news tilde tech)
+            news tildes tech)
           ("https://www.acdw.net/atom.xml" fwends)
           ("https://envs.net/~lucidiot/rsrsss/feed.xml" fwends)
           ("https://planet.emacslife.com/atom.xml" emacs)
-          ("http://tilde.town/~lucidiot/fridaypostcard.xml" tilde art)
-          ("https://quasivoid.net/feed.atom" tilde)
-          ("https://benjaminwil.info/feed.xml" tilde fwends)
-          ("https://benjaminwil.info/antisocial/feed.xml" tilde)
-          ("https://blog.ryliejamesthomas.net/feed/" tilde)
-          ("https://p1k3.com/feed" tilde)
-          ("https://cosmic.voyage/rss.xml" tilde fiction sci-fi)
-          ("https://jackreid.xyz/index.xml" tilde)
-          ("http://lambdacreate.com/static/feed.rss" tilde fwends)
-          ("https://gaffen.co.uk/feed.xml" tilde)
-          ("https://gmb.21x2.net/rss.xml" tilde)
-          ("https://www.insom.me.uk/feed.xml" tilde)
-          ("https://invisibleup.com/atom.xml" tilde)
-          ("https://m455.casa/feed.rss" tilde fwends)
-          ("https://petras.space/index.xml" tilde)
-          ("https://www.benovermyer.com/post/index.xml" tilde)
-          ("https://tilde.town/~trm/blog/atom.xml" tilde)
-          ("https://tilde.team/feed.rss" tilde)
-          ("http://ajroach42.com/feed.xml" tilde)
-          ("http://tilde.town/~mroik/blog/rss.xml" tilde)
-          ("https://hamster.dance/blog/rss/" tilde)
-          ("https://m455.neocities.org/feed.rss" tilde fwends)
-          ("https://eli.li/feed.rss" tilde fwends)
+          ("http://tilde.town/~lucidiot/fridaypostcard.xml" tildes art)
+          ("https://quasivoid.net/feed.atom" tildes)
+          ("https://benjaminwil.info/feed.xml" tildes fwends)
+          ("https://benjaminwil.info/antisocial/feed.xml" tildes)
+          ("https://blog.ryliejamesthomas.net/feed/" tildes)
+          ("https://p1k3.com/feed" tildes)
+          ("https://cosmic.voyage/rss.xml" tildes fiction sci-fi)
+          ("https://jackreid.xyz/index.xml" tildes)
+          ("http://lambdacreate.com/static/feed.rss" tildes fwends)
+          ("https://gaffen.co.uk/feed.xml" tildes)
+          ("https://gmb.21x2.net/rss.xml" tildes)
+          ("https://www.insom.me.uk/feed.xml" tildes)
+          ("https://invisibleup.com/atom.xml" tildes)
+          ("https://m455.casa/feed.rss" tildes fwends)
+          ("https://petras.space/index.xml" tildes)
+          ("https://www.benovermyer.com/post/index.xml" tildes)
+          ("https://tilde.town/~trm/blog/atom.xml" tildes)
+          ("https://tilde.team/feed.rss" tildes)
+          ("http://ajroach42.com/feed.xml" tildes)
+          ("http://tilde.town/~mroik/blog/rss.xml" tildes)
+          ("https://hamster.dance/blog/rss/" tildes)
+          ("https://m455.neocities.org/feed.rss" tildes fwends)
+          ("https://eli.li/feed.rss" tildes fwends)
           ("https://aiweirdness.com/rss" tech)
           ("http://tilde.town/~m455/javapool.rss" tilde)
+          ("https://spwhitton.name/blog/index.rss" blags)
+          ("https://www.theadvocate.com/search/?f=rss&t=article&l=50" news)
           ))
 #+end_src