summary refs log tree commit diff stats
path: root/emacs
diff options
context:
space:
mode:
authorAlan Pearce2017-06-26 08:56:52 +0200
committerAlan Pearce2017-06-26 08:56:52 +0200
commit62633dc0fe80f734dc33673c0960905e22fae92b (patch)
tree3d4c9686527039573c76099559a88bca8d429c26 /emacs
parent61953fab3d89f33468a854d512a4a8e3c36e258d (diff)
parentf25836751e28eb56bf9df6e6b3cc5b08a6e1215b (diff)
downloadnixfiles-62633dc0fe80f734dc33673c0960905e22fae92b.tar.lz
nixfiles-62633dc0fe80f734dc33673c0960905e22fae92b.tar.zst
nixfiles-62633dc0fe80f734dc33673c0960905e22fae92b.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.emacs.d/init.org10
1 files changed, 9 insertions, 1 deletions
diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 3d3cb5e0..aa2ea28d 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -214,7 +214,7 @@ because I manage those in my [[file:~/projects/dotfiles/tag-xresources/xresource
   (defun use-variable-fonts ()
     (interactive)
     (variable-pitch-mode)
-    (setq cursor-type 'bar))
+    (setq cursor-type '(bar . 1)))
 
   (defun ap/set-fonts (mono-face mono-font-size variable-face variable-font-size antialias &optional new-line-spacing)
     (if (boundp 'ns-antialias-text)
@@ -1807,6 +1807,14 @@ I can use this to keep a journal.  I should use it.
   :config (progn
             (setq org-journal-date-format "%A, %d %B %Y"
                   org-journal-dir "~/Sync/Default/Documents/journal")
+
+            (define-hook-helper org-journal-mode ()
+              (use-variable-fonts)
+              (text-scale-adjust 4)
+              (if smartparens-strict-mode
+                  (smartparens-strict-mode -1))
+              (if show-smartparens-mode
+                  (show-smartparens-mode -1)))
             (defun org-journal-display-entry-yesterday ()
               "Show org-journal entry for yesterday"
               (interactive)