@@ -155,17 +155,14 @@ (interactive) 	  (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 @@ (if (eq displays 1) 			  (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 @@ (and (normal-backup-enable-predicate name) 												   (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))