Remove comments

2 files changed, 53 insertions, 61 deletions

@@ -2,40 +2,41 @@
 ;; This file is automatically tangled from config.org.
 ;; Hand edits will be overwritten!
 
-;;  Disable loading of =package.el=
-
-;; I use =straight.el= instead.
-
-
-;; [[file:~/.emacs.d/config.org::*Disable loading of =package.el=][Disable loading of =package.el=:1]]
 (setq package-enable-at-startup nil)
-;; Disable loading of =package.el=:1 ends here
-
-;; Don't resize the frame when loading fonts
-
-
-;; [[file:~/.emacs.d/config.org::*Don't resize the frame when loading fonts][Don't resize the frame when loading fonts:1]]
-(setq frame-inhibit-implied-resize t)
-;; Don't resize the frame when loading fonts:1 ends here
-
-;; Resize frame by pixels
-
-
-;; [[file:~/.emacs.d/config.org::*Resize frame by pixels][Resize frame by pixels:1]]
-(setq frame-resize-pixelwise t)
-;; Resize frame by pixels:1 ends here
-
-;; Shoe-horned from elsewhere in =config.org=
-
-;; A fundamental tension of literal programming is logical versus
-;; programmatic ordering.  I understand that's a problem it's meant to
-;; solve but hey, maybe I'm not quite there yet.  I feel that having this
-;; weird shoe-horning of other bits of my config here, in a backwater
-;; heading in an appendix, isn't quite the future I wanted.  But it's
-;; what I have for now.
-
+(defun acdw/bootstrap-straight ()
+  "Bootstrap straight.el."
+  (defvar bootstrap-version)
+  (let ((bootstrap-file
+         (expand-file-name
+          "straight/repos/straight.el/bootstrap.el"
+          user-emacs-directory))
+        (bootstrap-version 5))
+    (unless (file-exists-p bootstrap-file)
+      (with-current-buffer
+          (url-retrieve-synchronously
+           (concat
+            "https://raw.githubusercontent.com/"
+            "raxod502/straight.el/develop/install.el")
+           'silent 'inhibit-cookies)
+        (goto-char (point-max))
+        (eval-print-last-sexp)))
+    (load bootstrap-file nil 'nomessage)))
+(unless (ignore-errors (acdw/bootstrap-straight))
+  (let ((msg "Straight.el didn't bootstrap correctly.  Cloning directly"))
+    (message "%s..." msg)
+    (call-process "git" nil
+                  (get-buffer-create "*bootstrap-straight-messages*") nil
+                  "clone"
+                  "https://github.com/raxod502/straight.el"
+                  (expand-file-name "straight/repos/straight.el"
+                                    user-emacs-directory))
+    (message "%s...Done." msg)
+    (acdw/bootstrap-straight)))
+
+(setq-default frame-inhibit-implied-resize t)
+
+(setq-default frame-resize-pixelwise t)
 
-;; [[file:~/.emacs.d/config.org::*Shoe-horned from elsewhere in =config.org=][Shoe-horned from elsewhere in =config.org=:1]]
 (add-to-list 'default-frame-alist
              '(tool-bar-lines . 0))
 
@@ -50,4 +51,3 @@
 
 (scroll-bar-mode -1)
 (horizontal-scroll-bar-mode -1)
-;; Shoe-horned from elsewhere in =config.org=:1 ends here
@@ -2,36 +2,28 @@
 ;; This file is automatically tangled from config.org.
 ;; Hand edits will be overwritten!
 
-;; Prefer newer files to older files
+(setq-default load-prefer-newer t)
 
-
-;; [[file:~/.emacs.d/config.org::*Prefer newer files to older files][Prefer newer files to older files:1]]
-(setq load-prefer-newer t)
-;; Prefer newer files to older files:1 ends here
-
-;; Load the config
-
-;; I keep most of my config in =config.el=, which is tangled directly
-;; from this file.  This init just loads that file, either from lisp or
-;; directly from Org if it's newer.
-
-
-;; [[file:~/.emacs.d/config.org::*Load the config][Load the config:1]]
 (let* (;; Speed up init
        (gc-cons-threshold most-positive-fixnum)
        (file-name-handler-alist nil)
        ;; Config file names
-       (conf (expand-file-name "config"
-                               user-emacs-directory))
-       (conf-el (concat conf ".el"))
-       (conf-org (concat conf ".org")))
-  (unless (and (file-newer-than-file-p conf-el conf-org)
-               (load conf 'no-error))
-    ;; A plain require here just loads the older `org'
-    ;; in Emacs' install dir.  We need to add the newer
-    ;; one to the `load-path', hopefully that's all.
-    (add-to-list 'load-path (expand-file-name "straight/build/org"
-                                              user-emacs-directory))
-    (require 'org)
-    (org-babel-load-file conf-org)))
-;; Load the config:1 ends here
+       (config (expand-file-name "config"
+                                 user-emacs-directory))
+       (config.el (concat config ".el"))
+       (config.org (concat config ".org"))
+       (straight-org-dir (expand-file-name "straight/build/org"
+                                           user-emacs-directory)))
+       ;; Unless config.org is /newer/ than config.el, *or* the config
+       ;; is able to be loaded without errors, load the config from
+       ;; config.org.
+       (unless (or (file-newer-than-file-p config.org config.el)
+                   (load config 'no-error))
+         ;; A plain require here just loads the older `org'
+         ;; in Emacs' install dir.  We need to add the newer
+         ;; one to the `load-path', hopefully that's all.
+         (when (file-exists-p straight-org-dir)
+           (add-to-list 'load-path straight-org-dir))
+         ;; Load config.org
+         (require 'org)
+         (org-babel-load-file config.org)))