Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ivan Malison 2016-11-03 17:30:08 -07:00
commit 5d4114f095
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8

View File

@ -1423,6 +1423,10 @@ proced is an top like utility that runs inside of emacs. The following sets auto
:config :config
(progn (eyebrowse-mode +1))) (progn (eyebrowse-mode +1)))
#+END_SRC #+END_SRC
** stream
#+BEGIN_SRC emacs-lisp
(use-package stream)
#+END_SRC
** tile ** tile
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(imalison:use-package tile (imalison:use-package tile
@ -4507,7 +4511,7 @@ load-theme hook (See the heading below).
(progn (progn
(condition-case error (condition-case error
(set-face-attribute 'default nil :font "source code pro") (set-face-attribute 'default nil :font "source code pro")
('error (message "Error: %s, when setting font"))) ('error (message "Error: %s, when setting font" error)))
(set-face-attribute 'default nil :weight 'semi-bold) (set-face-attribute 'default nil :weight 'semi-bold)
(set-face-attribute (set-face-attribute
'default nil :height imalison:default-font-size-pt)) 'default nil :height imalison:default-font-size-pt))