Header and mode lines.

Commit
6e3eb5e3e221c6f30a49825d6d7b0c752719b52c
Author
Blendoit <blendoit@gmail.com>
Author date
Committer
Blendoit <blendoit@gmail.com>
Committer date
Changed files
custom.el
index 83bb3887..8e105f2d 100644..100644
@@ -15,7 +15,8 @@
15 15 '(company-quickhelp-color-foreground "#DCDCCC")
16 16 '(custom-enabled-themes nil)
17 17 '(custom-safe-themes
18 Removed: '("e479b796a220addcd20678fbb95018e4945ca574ba9900b54d107ed1569c704c" "46d1602c1e28e6223fec2bcd008312bc57a08e5ccc8c2ac35c40e6a5d2a20244" "57c9cc95433eb236e74a3b501d3bebb2716e1988cf633c47384d33d8a83a7940" "1229a1fe390f71ddeec71efd61129af285d032364a1957f9954845a6c5f617a1" "42350b596ca9d6a283ce13efb9bbb7774064d917e04ea3220ebf32b95a677d60" "07b0edb4d75390504029f7905ca8add46af2c8bb13cec46efb0d880de014464c" "884b3999dfeff6d4f45859239a46b84399ab1b3602dd2ee6d11f3a3e39fe088d" "0c5c0078062fafd063a227b4cebb49b65434ea6e9557e3aaf8bc3212ba986512" "469032293efae7c0c86a95c39cab8b0ff8883cf4af3f2c292313cf6a71195b40" "8fb0949f4229860cf19034b924eb99c664327c9250fb92a2633bdf4b4abaf060" "c3a2a37e84e474c73c2b468553f9b5b73341419f72bbc1f4a4bcc1230ef86c85" "6495716176be0ced4142593b94a410135e0b373b686a869637824260d2f1ca11" "4467b1c8d7cc78fe98345c9c63eb62cf37844dc6868630add365494bde455715" "faeef63cb31f796b4bdf22f38e614934ab34d7deacaeb89b3e9cccf70aac5a85" "370fb305168fea1614535dc9ca30f496918eaca754b6c8969dd77fa872bec695" "e9f0c0c3397d07eb1c6c3551d67fd151e24bc6d72ec678841623ed572677c97a" "5c32236ef318adafe4102f627f330fa8f448046dfd838eef5cc09c7f682cf71f" "e343fecfb8d681186d594002c9b44ce48c2061599d7e4ec635cf1ca2a277a47a" "302dc61dc55600c7424f945dce9e74fba7df19f4a7bfb72aefd93193fa82ede4" "58f1f85248ba913387d1e7ed02a867161b315cfb5acff0c234e013ffd2577d22" "a256abf590bbc3257cc11d91a312e9fe8487dc1b95a5b7b732dd2f96a7fe5a45" "30368d6195cae9298304e6ac0534b90c85b1655965f1206c5c624270f0f46002" "311aa5df3223b5b4a7c638aad3befb4de9c7f46360d52acd1fa2cd2232b1dcbd" default))
18 Added: '("6dd0e1980e88c5bc5c4c9ab1e8b16b13287a4fa5a2e11970c0d26dfbcf2d62f3" "e479b796a220addcd20678fbb95018e4945ca574ba9900b54d107ed1569c704c" "46d1602c1e28e6223fec2bcd008312bc57a08e5ccc8c2ac35c40e6a5d2a20244" "57c9cc95433eb236e74a3b501d3bebb2716e1988cf633c47384d33d8a83a7940" "1229a1fe390f71ddeec71efd61129af285d032364a1957f9954845a6c5f617a1" "42350b596ca9d6a283ce13efb9bbb7774064d917e04ea3220ebf32b95a677d60" "07b0edb4d75390504029f7905ca8add46af2c8bb13cec46efb0d880de014464c" "884b3999dfeff6d4f45859239a46b84399ab1b3602dd2ee6d11f3a3e39fe088d" "0c5c0078062fafd063a227b4cebb49b65434ea6e9557e3aaf8bc3212ba986512" "469032293efae7c0c86a95c39cab8b0ff8883cf4af3f2c292313cf6a71195b40" "8fb0949f4229860cf19034b924eb99c664327c9250fb92a2633bdf4b4abaf060" "c3a2a37e84e474c73c2b468553f9b5b73341419f72bbc1f4a4bcc1230ef86c85" "6495716176be0ced4142593b94a410135e0b373b686a869637824260d2f1ca11" "4467b1c8d7cc78fe98345c9c63eb62cf37844dc6868630add365494bde455715" "faeef63cb31f796b4bdf22f38e614934ab34d7deacaeb89b3e9cccf70aac5a85" "370fb305168fea1614535dc9ca30f496918eaca754b6c8969dd77fa872bec695" "e9f0c0c3397d07eb1c6c3551d67fd151e24bc6d72ec678841623ed572677c97a" "5c32236ef318adafe4102f627f330fa8f448046dfd838eef5cc09c7f682cf71f" "e343fecfb8d681186d594002c9b44ce48c2061599d7e4ec635cf1ca2a277a47a" "302dc61dc55600c7424f945dce9e74fba7df19f4a7bfb72aefd93193fa82ede4" "58f1f85248ba913387d1e7ed02a867161b315cfb5acff0c234e013ffd2577d22" "a256abf590bbc3257cc11d91a312e9fe8487dc1b95a5b7b732dd2f96a7fe5a45" "30368d6195cae9298304e6ac0534b90c85b1655965f1206c5c624270f0f46002" "311aa5df3223b5b4a7c638aad3befb4de9c7f46360d52acd1fa2cd2232b1dcbd" default))
19 Added: '(electric-indent-mode nil)
19 20 '(fci-rule-color "#383838")
20 21 '(fringe-mode 0 nil (fringe))
21 22 '(indicate-empty-lines t)
init.el
index 695891bb..ceffb356 100644..100644
@@ -10,11 +10,13 @@
10 10
11 11 ;; Emacs will startup faster next time, because it will load
12 12 ;; a byte-compiled version of our literate configuration file.
13 Removed: (cond ((file-exists-p (concat my/literate-config ".el"))
14 Removed: (load my/literate-config))
15 Removed: ((file-exists-p (concat my/literate-config ".org"))
16 Removed: (org-babel-load-file (concat my/literate-config ".org")))
17 Removed: (t (message "No literate configuration file detected.")))
13 Added: ;; (cond ((file-exists-p (concat my/literate-config ".el"))
14 Added: ;; (load my/literate-config))
15 Added: ;; ((file-exists-p (concat my/literate-config ".org"))
16 Added: ;; (org-babel-load-file (concat my/literate-config ".org")))
17 Added: ;; (t (message "No literate configuration file detected.")))
18 Added:
19 Added: (org-babel-load-file (concat my/literate-config ".org"))
18 20
19 21 (provide 'init)
20 22
smart-documents.org
index 965da6a2..7682532f 100644..100644
@@ -446,6 +446,33 @@
446 446 (global-set-key (kbd "C-+") 'text-scale-increase)
447 447 #+END_SRC
448 448
449 Added:
450 Added: ** Navigation
451 Added:
452 Added: *** Move down one line
453 Added:
454 Added: #+BEGIN_SRC emacs-lisp :tangle yes
455 Added: (global-set-key (kbd "M-j") 'next-line)
456 Added: #+END_SRC
457 Added:
458 Added: *** Move up one line
459 Added:
460 Added: #+BEGIN_SRC emacs-lisp :tangle yes
461 Added: (global-set-key (kbd "M-k") 'previous-line)
462 Added: #+END_SRC
463 Added:
464 Added: *** Move left one character
465 Added:
466 Added: #+BEGIN_SRC emacs-lisp :tangle yes
467 Added: (global-set-key (kbd "M-h") 'left-char)
468 Added: #+END_SRC
469 Added:
470 Added: *** Move right one character
471 Added:
472 Added: #+BEGIN_SRC emacs-lisp :tangle yes
473 Added: (global-set-key (kbd "M-l") 'right-char)
474 Added: #+END_SRC
475 Added:
449 476 ** Customizing the editor
450 477
451 478 *** Customize a variable
@@ -588,8 +615,10 @@
588 615 org-edit-src-content-indentation 0)
589 616 #+END_SRC
590 617
591 Removed: #+BEGIN_SRC emacs-lisp :tangle yes
618 Added: We enable the dynamic numbering of headlines in an Org buffer.
592 619
620 Added: #+BEGIN_SRC emacs-lisp :tangle no
621 Added: ; (add-hook 'org-mode-hook 'org-num-mode)
593 622 #+END_SRC
594 623
595 624 *** Languages executable in smart documents
@@ -1073,31 +1102,59 @@
1073 1102
1074 1103 ** Frame
1075 1104
1076 Removed: *** TODO Header & mode line
1077 Removed: Complete mode line rewrite. Might require new package.
1105 Added: *** TODO Header & mode lines
1078 1106
1079 Removed: Top of the buffer is more intuitive for buffer info, bottom is more intuitive
1080 Removed: for buffer action.
1107 Added: # Top of the buffer is more intuitive for buffer info, bottom is more intuitive
1108 Added: # for buffer action.
1081 1109
1082 Removed: This is pretty much a gutted out powerline.
1110 Added: First, we create a function to calculate available width between left and right
1111 Added: portions of the header and mode line.
1083 1112
1084 Removed: **** Header line
1085 Removed:
1113 Added: #+NAME: sd-mode-line-render
1086 1114 #+BEGIN_SRC emacs-lisp :tangle yes
1115 Added: (defun sd-mode-line-render (left right)
1116 Added: "Return a string of `window-width' length
1117 Added: containing LEFT, and RIGHT aligned respectively."
1118 Added: (let* ((available-width (- (window-width) (length left) 2)))
1119 Added: (format (format " %%s %%%ds " available-width) left right)))
1120 Added: #+END_SRC
1121 Added:
1122 Added: **** TODO Header line
1123 Added:
1124 Added: In Org mode, the document header line will be the title of the document we are
1125 Added: working on currently.
1126 Added:
1127 Added: #+BEGIN_SRC emacs-lisp :tangle no
1087 1128 (add-hook org-mode-hook
1088 Removed: '(lambda ()
1089 Removed: "Set the header line to show `org-document-title'."
1129 Added: (lambda ()
1130 Added: "Set the header line to show #+TITLE and #+DATE."
1090 1131 (setq header-line-format
1091 Removed: (save-excursion
1092 Removed: (goto-char (point-min))
1093 Removed: (when (re-search-forward "^[[:space:]]*#\\+TITLE:[[:space:]]*\\(.*?\\)[[:space:]]*$" nil t)
1094 Removed: (match-string 1))))
1132 Added: (concat (save-excursion
1133 Added: (goto-char (point-min))
1134 Added: (when (re-search-forward
1135 Added: "^[[:space:]]*#\\+TITLE:[[:space:]]*\\(.*?\\)[[:space:]]*$"
1136 Added: nil t)
1137 Added: (match-string 1)))
1138 Added: (save-excursion
1139 Added: (goto-char (point-min))
1140 Added: (when (re-search-forward
1141 Added: "^[[:space:]]*#\\+DATE:[[:space:]]*\\(.*?\\)[[:space:]]*$"
1142 Added: nil t)
1143 Added: (match-string 1)))))))
1095 1144 #+END_SRC
1096 1145
1097 1146 **** Mode line
1098 1147
1148 Added: Then, we use the previously declared function to set up our mode line.
1149 Added:
1150 Added: #+NAME: mode-line-format
1099 1151 #+BEGIN_SRC emacs-lisp :tangle yes
1100 Removed: (setq mode-line-format )
1152 Added: (setq-default mode-line-format
1153 Added: '((:eval (sd-mode-line-render
1154 Added: ;; left
1155 Added: (format-mode-line "[%*] %b")
1156 Added: ;; right
1157 Added: (format-mode-line "Line: %l ")))))
1101 1158 #+END_SRC
1102 1159
1103 1160 ** Window
themes/blendoit-light-theme.el
index c780c07b..6d19a221 100644..100644
@@ -16,7 +16,7 @@
16 16 '(trailing-whitespace ((((class color) (background light)) (:background "red1")) (((class color) (background dark)) (:background "red1")) (t (:inverse-video t))))
17 17 '(font-lock-builtin-face ((t (:foreground "dark slate blue"))))
18 18 '(font-lock-comment-delimiter-face ((t (:foreground "dim gray" :inherit font-lock-comment-face))))
19 Removed: '(font-lock-comment-face ((t (:foreground "slate gray" :slant italic :height 1.1))))
19 Added: '(font-lock-comment-face ((t (:foreground "slate gray" :slant italic))))
20 20 '(font-lock-constant-face ((t (:foreground "dark cyan"))))
21 21 '(font-lock-function-name-face ((((class color) (min-colors 88) (background light)) (:foreground "Blue1")) (((class color) (min-colors 88) (background dark)) (:foreground "LightSkyBlue")) (((class color) (min-colors 16) (background light)) (:foreground "Blue")) (((class color) (min-colors 16) (background dark)) (:foreground "LightSkyBlue")) (((class color) (min-colors 8)) (:weight bold :foreground "blue")) (t (:weight bold :inverse-video t))))
22 22 '(font-lock-keyword-face ((t (:foreground "slate blue"))))