   (interactive)
   (let*
     (
-      (aux-buffer-rgx "^\*.+\*$")
-      (is-aux-buffer (l/buffer-looks-like (buffer-name) `(,aux-buffer-rgx)))
+      (original-bufname (buffer-name))
+      (aux-buffer-rgx "^ *\*.+\*$")
+      (is-aux-buffer (l/buffer-looks-like original-bufname `(,aux-buffer-rgx)))
       (buffers (mapcar 'buffer-name (buffer-list)))
       (primary-buffers-count
         (length

        (if (and is-aux-buffer primary-buffer-exists)
          ; Cycle through previous buffers until we hit a primary
          ; (non-auxiliary) buffer.
          (while (string-match aux-buffer-rgx (buffer-name))
            (previous-buffer))
          (l/gc-views))))))

; Either close the current window, or if only one windw, use the ":q" Evil

          (if (buffer-modified-p)
            ; If there are any unsaved changes, either discard those changes or do
            ; nothing.
            (if (y-or-n-p "l/quit-buffer: Invoke (with-editor-cancel) to cancel the editing of this buffer?")
              (with-editor-cancel t)
              ; Use catch/throw to stop execution.
              (throw 'my-catch (message "l/quit-buffer: Aborting (doing nothing).")))
            (with-editor-finish t)))
        ; Close the current view (or exit the editor entirely), but only if we
        ; originally tried to close a non-"auxiliary" buffer. An "auxiliary"
