Auto commit by The Sugar System.

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 8f200fc20f2a31d065686c0c75149b9b71a6d8cd..1d149cef97fab23eac4b3c9c64d0a60cec9fa30a 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -779,6 +779,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(diff-added ((t (:inherit diff-changed :foreground "medium spring green" :weight extra-bold))))
  '(diff-removed ((t (:foreground "gold3" :weight extra-bold))))
  '(flyspell-incorrect ((t (:foreground "OrangeRed" :overline t))))
+ '(font-lock-function-name-face ((t (:foreground "light steel blue" :weight bold))))
  '(jaspace-highlight-tab-face ((((class color) (background dark)) (:foreground "gray70" :underline t))))
  '(navi2ch-bm-new-unread-face ((t (:foreground "PaleGreen" :weight bold))))
  '(navi2ch-bm-updated-cache-face ((t (:foreground "CornflowerBlue" :weight bold))))

diff --git a/dot-files/_gitconfig b/dot-files/_gitconfig
index 33e376087718543cbe79f8225f77edddb3755882..015551f0e0fdc14f7928152a800f7ccca772a424 100644 (file)
--- a/dot-files/_gitconfig
+++ b/dot-files/_gitconfig
@@ -26,3 +26,5 @@
        default = simple
 [pull]
        rebase = true
+[init]
+       defaultBranch = master