From 7459e5ee09bc094fc47c0d03ec031fe2268825b9 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sat, 28 Nov 2015 23:36:02 +0100 Subject: Emacs: Improve coffee-mode configuration --- tag-emacs/emacs.d/init.org | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org index eed4b39..c68dd8c 100644 --- a/tag-emacs/emacs.d/init.org +++ b/tag-emacs/emacs.d/init.org @@ -572,6 +572,7 @@ whitespace-sensitive language, of course. (add-to-list 'auto-indent-disabled-modes-list 'yaml-mode) (add-to-list 'auto-indent-disabled-modes-list 'saltstack-mode) (add-to-list 'auto-indent-disabled-modes-list 'nix-mode) + (add-to-list 'auto-indent-disabled-modes-list 'coffee-mode) (auto-indent-global-mode))) #+END_SRC @@ -1884,7 +1885,9 @@ it though #+BEGIN_SRC emacs-lisp (use-package coffee-mode - :mode ("\\.coffee\\'" . coffee-mode)) + :mode ("\\.coffee\\'" . coffee-mode) + :config (progn + (setq coffee-indent-like-python-mode t))) #+END_SRC *** tern @@ -2308,7 +2311,8 @@ nice as the real version (sp-local-pair "{{" "}}")) (show-smartparens-global-mode t) (smartparens-global-strict-mode t) - (add-hook 'lisp-mode-common-hook #'turn-off-smartparens-mode))) + (add-hook 'lisp-mode-common-hook #'turn-off-smartparens-mode) + (add-hook 'coffee-mode-hook #'turn-off-smartparens-mode))) #+END_SRC ** move-text -- cgit 1.4.1 From b8b160a427b785514c0e016155194bcc86976d62 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sat, 28 Nov 2015 23:36:38 +0100 Subject: Emacs: Specify variable font size in set-fonts --- tag-emacs/emacs.d/init.org | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org index c68dd8c..f107667 100644 --- a/tag-emacs/emacs.d/init.org +++ b/tag-emacs/emacs.d/init.org @@ -283,29 +283,29 @@ Highlighting quasi-quoted expressions in lisps is quite useful. When possible, set up fonts. I don’t have any settings here for X11, because I manage those in my [[file:~/projects/dotfiles/tag-xresources/xresources/main][XResources file]]. #+BEGIN_SRC emacs-lisp -(when (or (display-graphic-p) - (daemonp)) - - (defun use-variable-fonts () - (interactive) - (variable-pitch-mode) - (setq cursor-type 'bar)) - - (defun ap/set-fonts (mono-face variable-face font-size) - (when mono-face - (let ((default-font (concat mono-face "-" (number-to-string font-size)))) - (add-to-list 'default-frame-alist `(font . ,default-font)) - (set-face-font 'fixed-pitch default-font) - (set-frame-font default-font t t))) - (when variable-face - (set-face-font 'variable-pitch (concat variable-face "-" - (number-to-string (1+ font-size)))))) - - (cond - ((eq window-system 'w32) - (ap/set-fonts "Consolas" "Segoe UI" 10)) - ((eq system-type 'darwin) - (ap/set-fonts "Input Mono" "Input Sans Condensed" 13)))) + (when (or (display-graphic-p) + (daemonp)) + + (defun use-variable-fonts () + (interactive) + (variable-pitch-mode) + (setq cursor-type 'bar)) + + (defun ap/set-fonts (mono-face mono-font-size variable-face variable-font-size) + (when mono-face + (let ((default-font (concat mono-face "-" (number-to-string mono-font-size)))) + (add-to-list 'default-frame-alist `(font . ,default-font)) + (set-face-font 'fixed-pitch default-font) + (set-frame-font default-font t t))) + (when variable-face + (set-face-font 'variable-pitch (concat variable-face "-" + (number-to-string variable-font-size))))) + + (cond + ((eq window-system 'w32) + (ap/set-fonts "Consolas" 10 "Segoe UI" 11)) + ((eq system-type 'darwin) + (ap/set-fonts "Hack" 14 "Avenir" 14)))) #+END_SRC Allow font-lock-mode to do background parsing. I’m not really sure if -- cgit 1.4.1