From 779a06009887201ca50ade43feda540fbaa690b5 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sun, 2 Oct 2016 18:22:06 +0200
Subject: Emacs: Use builtin function to create font-spec

---
 tag-emacs/emacs.d/init.org | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'tag-emacs/emacs.d')

diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index 405ef131..562d275b 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,7 @@ 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))))
+		(ap/set-fonts "Terminus" 12 "Lucida" 10))))
 
 	(ap/set-fonts-according-to-system))
 #+END_SRC
-- 
cgit 1.4.1


From 43781516414d2b4fdfca49025da9832ccfc57686 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sun, 2 Oct 2016 18:22:34 +0200
Subject: Emacs: Fix oversized euro sign on X11

Set fallback font as Terminus
---
 tag-emacs/emacs.d/init.org | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tag-emacs/emacs.d')

diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index 562d275b..4401ef08 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -175,6 +175,7 @@ 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)
+		(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))
-- 
cgit 1.4.1


From b732c0c1071e9b05fda2e5206e5c70b8ffdf1891 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 4 Oct 2016 19:26:22 +0200
Subject: Emacs: Fix tramp prompt regexp for FreeBSD hosts

---
 tag-emacs/emacs.d/init.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tag-emacs/emacs.d')

diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index 4401ef08..4c4603d0 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -600,7 +600,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))
-- 
cgit 1.4.1