diff options
| author | Alan Pearce | 2016-10-12 10:32:40 +0200 |
|---|---|---|
| committer | Alan Pearce | 2016-10-12 10:32:40 +0200 |
| commit | 4f23103702f5fed2e34b13aeb9ddda2157e393a5 (patch) | |
| tree | 5269da79cb45a8a6f17bd78aeb5cfdde98625a99 | |
| parent | 9f5adf96d04f246e4f6a081aba2c53c1c8eb47f1 (diff) | |
| parent | b732c0c1071e9b05fda2e5206e5c70b8ffdf1891 (diff) | |
| download | dotfiles-4f23103702f5fed2e34b13aeb9ddda2157e393a5.tar.lz dotfiles-4f23103702f5fed2e34b13aeb9ddda2157e393a5.tar.zst dotfiles-4f23103702f5fed2e34b13aeb9ddda2157e393a5.zip | |
Merge branch 'master' of git.alanpearce.uk:alan/dotfiles
| -rw-r--r-- | tag-emacs/emacs.d/init.org | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org index b1c69e7..0c384ee 100644 --- a/tag-emacs/emacs.d/init.org +++ b/tag-emacs/emacs.d/init.org @@ -155,17 +155,14 @@ because I manage those in my [[file:~/projects/dotfiles/tag-xresources/xresource (variable-pitch-mode) (setq cursor-type 'bar)) - (defun format-font (name style size) - (format "-*-%s-%s-*-*-*-%s-*-*-*-*-*-*" name style size)) - (defun ap/set-fonts (mono-face mono-font-size variable-face variable-font-size) (when mono-face - (let ((default-font (format-font mono-face "normal" mono-font-size))) + (let ((default-font (font-spec :name mono-face :size 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 (format-font variable-face "normal" variable-font-size)))) + (set-face-font 'variable-pitch (font-spec :name variable-face :size variable-font-size)))) (defun ap/set-fonts-according-to-system () (interactive) @@ -178,7 +175,8 @@ because I manage those in my [[file:~/projects/dotfiles/tag-xresources/xresource (ap/set-fonts "SF Mono" 12 "Lucida Grande" 12) (ap/set-fonts "ProggyTiny" 11 "Lucida Grande" 12)))) ((eq window-system 'x) - (ap/set-fonts "Terminus" 10 "Lucida" 10)))) + (set-fontset-font "fontset-default" 'unicode (font-spec :name "Terminus" :size 12)) + (ap/set-fonts "Terminus" 12 "Lucida" 10)))) (ap/set-fonts-according-to-system)) #+END_SRC @@ -594,7 +592,7 @@ that I can sudo on remote machines (not (let ((method (file-remote-p name 'method))) (when (stringp method) (member method '("su" "sudo"))))))) - tramp-shell-prompt-pattern "\\(?:^\\| \\)[^]#$%>\n]*#?[]#$%>❯›] *\\(\\[[0-9;]*[a-zA-Z] *\\)*") + tramp-shell-prompt-pattern "\\(?:^\\| \\)[^]#$%>\n]*#?[]#$%>❯›] *\\(\\[\\??[0-9;]*[a-zA-Z] *\\)*") (add-to-list 'tramp-default-proxies-alist '(nil "\\`root\\'" (concat "/" tramp-default-method ":%h:"))) (add-to-list 'tramp-default-proxies-alist `(,(regexp-quote (system-name)) nil nil)) (add-to-list 'tramp-default-proxies-alist '("localhost" nil nil)) |