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

3 files changed, 48 insertions, 21 deletions

@@ -45,18 +45,6 @@ Stolen from s.el."
         (setq num (1- num)))
       (apply 'concat ss))))
 
-(if (fboundp 's-truncate)
-    (defalias 'truncate-string 's-truncate)
-  (defun truncate-string (len s &optional ellipsis)
-    "If STR is longer than LEN, cut it down and add ELLIPSIS to the end.
-When not specified, ELLIPSIS defaults to '...'."
-    (declare (pure t) (side-effect-free t))
-    (unless ellipsis
-      (setq ellipsis "..."))
-    (if (> (length s) len)
-        (format "%s%s" (substring s 0 (- len (length ellipsis))) ellipsis)
-      s)))
-
 
 ;;; IRC stuff
 
@@ -33,12 +33,16 @@ Otherwise, cdr should be a function that takes two points (see `count-words')."
 
 (defun acdw-modeline/buffer-name ()     ; gonsie
   "Display the buffer name in a face reflecting its modified status."
-  (propertize " %b "
+  (propertize (concat " "
+                      (truncate-string (/ (window-total-width) 2)
+                                       (buffer-name) "~")
+                      " ")
               'face
               (if (buffer-modified-p)
                   'font-lock-warning-face
                 'font-lock-type-face)
-              'help-echo (buffer-file-name)))
+              'help-echo (or (buffer-file-name)
+                             (buffer-name))))
 
 (defun acdw-modeline/erc ()
   "ERC indicator for the modeline."
@@ -151,6 +155,10 @@ is, if point < mark."
                                          (region-bounds))))
                      'font-lock-face 'font-lock-variable-name-face))))
 
+(defun acdw-modeline/reading-mode ()
+  "Display an indicator if currently in reading mode, mine or EWW's."
+  (concat (if reading-mode "R" "") (if eww-readable-p "w" "")))
+
 (defun acdw-modeline/text-scale ()
   "Display the text scaling from the modeline, if scaled."
   ;; adapted from https://github.com/seagle0128/doom-modeline
@@ -54,6 +54,16 @@ ARG).  When called with multiple arguments or a list, it returns
 ;; I don't prefix these because ... reasons.  Honestly I probably should prefix
 ;; them.
 
+(defun truncate-string (len str &optional ellipsis)
+  "If STR is longer than LEN, cut it down and add ELLIPSIS to the end.
+When not specified, ELLIPSIS defaults to '...'."
+  (declare (pure t) (side-effect-free t))
+  (unless ellipsis
+    (setq ellipsis "..."))
+  (if (> (length str) len)
+      (format "%s%s" (substring str 0 (- len (length ellipsis))) ellipsis)
+    str))
+
 ;; Why isn't this a thing???
 (defmacro fbound-and-true-p (func)
   "Return the value of function FUNC if it is bound, else nil."
@@ -366,10 +376,15 @@ first."
           (goto-char (point-min))
           (kill-line)
           (insert extracted-heading))
-        (replace-regexp org-property-drawer-re "") ;Delete properties
-        (replace-regexp org-logbook-drawer-re "") ;Delete logbook
+        ;; Delete property drawers
+        (replace-regexp org-property-drawer-re "")
+        ;; Delete logbook drawers
+        (replace-regexp org-logbook-drawer-re "")
+        ;; Replace list items with their contents, paragraphed
         (replace-regexp org-list-full-item-re "
 \4")
+        ;; Delete comment lines
+        (replace-regexp (concat org-comment-regexp ".*$") "")
         ;; Re-fill text for clipboard
         (unfill-region (point-min) (point-max))
         (flush-lines "^$" (point-min) (point-max)))
@@ -626,12 +641,28 @@ This function is internal.  Use `acdw/make-password-fetcher' instead."
     (setq-local blink-matching-paren nil
                 show-paren-mode nil)))
 
-;;; uh
-(defun 💩 (n)
-  "💩 x N"
+
+;;; 💩
+(defun 💩 (&optional n)
+  "💩 x N."
   (interactive "p")
-  (dotimes (or n 1)
-    (insert "💩")))
+  (let ((n (or n 1)))
+    (while (> n 0)
+      (insert "💩")
+      (setq n (1- n)))))
+
+
+;;; Fat finger solutions
+(defun acdw/fat-finger-exit (&optional prefix)
+  "Delete a frame, or kill Emacs with confirmation.
+When called with PREFIX, just kill Emacs without confirmation."
+  (interactive "P")
+  (if (or prefix
+          (and (= 1 (length (frame-list)))
+               (yes-or-no-p "This is the last frame!  Wanna quit?")))
+      (kill-emacs)
+    (ignore-errors
+      (delete-frame))))
 
 (provide 'acdw)
 ;;; acdw.el ends here