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

3 files changed, 37 insertions, 14 deletions

@@ -28,5 +28,5 @@
      1))
   "Show faces and variables in `imenu'.")
 
-(provide 'acdw/cus-edit)
+(provide 'acdw-cus-edit)
 ;;; acdw-cus-edit.el ends here
@@ -11,8 +11,17 @@
 ;; - Don't hurt yourself.
 ;; - Make good choices.
 
+;;; Commentary:
+
+;; here is my attempt at a reading mode.
+
 ;;; Code:
 
+(require 'olivetti)
+
+(defvar-local //indicate-empty-lines nil)
+(defvar-local //indicate-buffer-boundaries nil)
+
 ;;;###autoload
 (define-minor-mode reading-mode
   "A mode for reading."
@@ -22,30 +31,37 @@
   (if reading-mode
       (progn ;; turn on
         ;; settings
-        (setq-local orig-indicate-empty-lines indicate-empty-lines
+        (setq-local //indicate-empty-lines indicate-empty-lines
                     indicate-empty-lines nil
-                    orig-indicate-buffer-boundaries indicate-buffer-boundaries
+                    //indicate-buffer-boundaries indicate-buffer-boundaries
                     indicate-buffer-boundaries nil)
         ;; disable modes
-        (dolist (mode '(display-fill-column-indicator-mode))
+        (dolist (mode '(display-fill-column-indicator-mode
+                        blink-cursor-mode))
           (when (fboundp mode)
+            (set (make-local-variable
+                  (intern (format "//%s" mode)))
+                 (symbol-value mode))
             (funcall mode -1)))
         ;; enable modes
         (dolist (mode '(olivetti-mode))
           (when (fboundp mode)
+            (set (make-local-variable
+                  (intern (format "//%s" mode)))
+                 (symbol-value mode))
             (funcall mode +1))))
     ;; turn off
-    ;; settings
-    (setq-local indicate-empty-lines orig-indicate-empty-lines
-                indicate-buffer-boundaries orig-indicate-buffer-boundaries)
-    ;; enable modes
-    (dolist (mode '(display-fill-column-indicator-mode))
-      (when (fboundp mode)
-        (funcall mode +1)))
-    ;; disable modes
-    (dolist (mode '(olivetti-mode))
+    ;; restore settings
+    (setq-local indicate-empty-lines //indicate-empty-lines
+                indicate-buffer-boundaries //indicate-buffer-boundaries)
+    ;; restore modes
+    (dolist (mode '(display-fill-column-indicator-mode
+                    olivetti-mode
+                    blink-cursor-mode))
       (when (fboundp mode)
-        (funcall mode -1)))))
+        (funcall mode (if (symbol-value (intern (format "//%s" mode)))
+                          +1
+                        -1))))))
 
 (provide 'acdw-reading)
 ;;; acdw-reading.el ends here
@@ -11,8 +11,15 @@
 ;; - Don't hurt yourself.
 ;; - Make good choices.
 
+;;; Commentary:
+
+;; setup.el makes defining local macros for `setup' forms quite simple, at
+;; least to my mind.  Here are some of the ones I've defined.
+
 ;;; Code:
 
+(require 'setup)
+
 (setup-define :autoload
   (lambda (func)
     (if (listp func)