2 files changed, 10 insertions, 4 deletions

@@ -2117,23 +2117,26 @@ the default is \"/\"."
                   minions)
   (:also-load acdw-modeline)
   (:option simple-modeline-segments
+           ;; Yeah this is laid out like poo.  It's so I can easily change
+           ;; things around if need be.
            '((;; left
               acdw-modeline/winum
               acdw-modeline/modified
               acdw-modeline/buffer-name
               acdw-modeline/vc-branch
-              acdw-modeline/position)
-             (;; right
+              acdw-modeline/position
+              acdw-modeline/wc
+              ) (;; right
               acdw-modeline/track
               simple-modeline-segment-misc-info
-              acdw-modeline/wc
               acdw-modeline/text-scale
               simple-modeline-segment-process
               acdw-modeline/god-mode-indicator
               acdw-modeline/minions
               acdw-modeline/reading-mode
               acdw-modeline/narrowed
-              acdw-modeline/major-mode)))
+              acdw-modeline/major-mode
+              )))
 
   (:option tab-bar-mode t
            tab-bar-show 1)
@@ -317,6 +317,9 @@ instead of the true count."
                    (goto-char (match-end 0)))
                   ;; Ignore source blocks
                   ((org-in-src-block-p) (forward-line))
+                  ;; Ignore blank lines
+                  ((looking-at "^$")
+                   (forward-line))
                   ;; Count everything else
                   (t
                    ;; ... unless it's in a few weird contexts