summaryrefslogtreecommitdiffstats
path: root/emacs.d
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2011-04-26 11:04:25 +0200
committerGravatar Tom Willemsen2011-04-26 11:04:25 +0200
commit4ec8f35b04eea1f7c96190635fd10fdf4fa74f14 (patch)
tree35fba3a18ec6ab2a9e3a0727d8cd6b23ac7427a8 /emacs.d
parente5bc4544eb1251f8bb5709e062ca1662ee3cc766 (diff)
parent2f17b5e6bcedaed4b14d1a5c527ec5dd1577599d (diff)
downloaddotfiles-4ec8f35b04eea1f7c96190635fd10fdf4fa74f14.tar.gz
dotfiles-4ec8f35b04eea1f7c96190635fd10fdf4fa74f14.zip
Merge branch 'master' of git://gitorious.org/ryuslash/dotfiles
Diffstat (limited to 'emacs.d')
-rw-r--r--emacs.d/10-settings.el2
-rw-r--r--emacs.d/20-php-mode-improved.el3
2 files changed, 4 insertions, 1 deletions
diff --git a/emacs.d/10-settings.el b/emacs.d/10-settings.el
index c149997..ac0db1c 100644
--- a/emacs.d/10-settings.el
+++ b/emacs.d/10-settings.el
@@ -1,4 +1,4 @@
-(add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-10"))
+(add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-10:antialias=true"))
(setq inhibit-startup-message t) ; don't show welcome screen
(setq require-final-newline t) ; always append a newline to a
diff --git a/emacs.d/20-php-mode-improved.el b/emacs.d/20-php-mode-improved.el
new file mode 100644
index 0000000..c26c152
--- /dev/null
+++ b/emacs.d/20-php-mode-improved.el
@@ -0,0 +1,3 @@
+(add-hook 'php-mode-hook
+ (lambda ()
+ (setq php-warn-if-mumamo-off nil)))