Fixup various formatting/indentation issues in init.el

.emacs.d/init.el

@@ -151,8 +151,7 @@
    comint-input-ignoredups t             ; no duplicates in command history
    comint-completion-addsuffix t         ; insert space/slash after file completion
    comint-buffer-maximum-size 20000      ; max length of the buffer in lines
-   comint-get-old-input (lambda () "")   ; what to run when i press enter on a
+   comint-get-old-input (lambda () "")   ; what to run when i press enter on a line above the current prompt
-                                         ; line above the current prompt
    comint-input-ring-size 500)           ; max shell history size
   (add-hook 'comint-mode-hook
             (lambda () (setq-local show-trailing-whitespace nil))))
@@ -170,7 +169,7 @@
                                     global-semantic-idle-local-symbol-highlight-mode)
         semantic-idle-scheduler-idle-time 0.2)
 
-  ; inhibit semantic outside of specific modes
+  ;; inhibit semantic outside of specific modes
   (setq semantic-inhibit-functions
         (lambda () (not (member major-mode '(c-mode cc-mode java-mode)))))
 
@@ -180,7 +179,7 @@
 (use-package term
   :config
   (add-hook 'term-mode-hook
-            ; if this is t, it breaks shell-command
+            ;; if this is t, it breaks shell-command
             (lambda () (setq-local comint-prompt-read-only nil))))
 
 (use-package gud
@@ -283,12 +282,12 @@
 
 (use-package help-mode
   :config
-  ; bind "g" to revert help buffers with no prompt
+  ;; bind "g" to revert help buffers with no prompt
   (bind-key "g" (lambda () (interactive) (revert-buffer t t)) help-mode-map))
 
 (use-package files
   :config
-  ; bind a key to revert buffers with no prompt
+  ;; bind a key to revert buffers with no prompt
   (bind-key "C-x M-v" (lambda () (interactive) (revert-buffer t t t))))
 
 (use-package prog-mode
@@ -328,7 +327,7 @@
   :config
   (setq ns-command-modifier 'hyper)
   (server-start)
-  ; disable focus stealing
+  ;; disable focus stealing
   (defun raise-frame (frame) (interactive) nil))
 
 (use-package yaml-mode
@@ -516,7 +515,7 @@
 
 (use-package hydra :ensure :demand
   :config
-  ;config is in separate file because it is really big
+  ;; config is in separate file because it is really big
   (load-file "~/.emacs.d/hydra-defs.el")
   :bind (("C-c w" . 'hydra-window/body)
          ("C-c s" . 'hydra-shortcuts/body)
@@ -577,7 +576,7 @@
 
 (use-package frames-only-mode :ensure :demand
   :config
-  ; seems to need to be before mode init
+  ;; seems to need to be before mode init
   (add-to-list 'frames-only-mode-use-window-functions 'undo-tree-visualize)
   (setq server-raise-frame nil)
   (defun x-focus-frame (FRAME &optional NOACTIVATE))
@@ -736,7 +735,7 @@
 
 (use-package graphviz-dot-mode
   :config
-  ; don't auto-newline on semicolon
+  ;; don't auto-newline on semicolon
   (defun electric-graphviz-dot-semi ()
     "Terminate line and indent next line."
     (interactive)
@@ -980,9 +979,8 @@
   (defun nm-sticky-tag-and-next (tags)
     (interactive
      (if (or current-prefix-arg (null nm-sticky-tags))
-         (list (notmuch-tag-change-list (split-string
+         (list (notmuch-tag-change-list
-                (read-string
+                (split-string (read-string "tags: " (mapconcat 'identity nm-sticky-tags " ")))))
-                 "tags: " (mapconcat 'identity nm-sticky-tags " ")))))
        (list nm-sticky-tags)))
     (setq nm-sticky-tags tags)
     (nm-tag-and-next tags))
@@ -1000,7 +998,7 @@
 
 (use-package fortune-cookie :demand :if (package-installed-p 'fortune-cookie)
   :config
-  ; change message every time scratch buffer created
+  ;; change message every time scratch buffer created
   (setq initial-major-mode
         (lambda ()
           (setq initial-scratch-message