summaryrefslogtreecommitdiffstats
path: root/emacs.d
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2011-03-23 22:40:47 +0100
committerGravatar Tom Willemsen2011-03-23 22:40:47 +0100
commit47a1e52873173aa3f392cc62c23fcba3b9edeceb (patch)
tree2c501dea68a192e8b380708a1840834ce0e2730a /emacs.d
parentd276deee4d29d0363d32a66f23f66629d8a96844 (diff)
downloaddotfiles-47a1e52873173aa3f392cc62c23fcba3b9edeceb.tar.gz
dotfiles-47a1e52873173aa3f392cc62c23fcba3b9edeceb.zip
Minor tweaks
Diffstat (limited to 'emacs.d')
-rw-r--r--emacs.d/10-modules.el2
-rw-r--r--emacs.d/10-settings.el10
-rw-r--r--emacs.d/20-column-marker.el7
3 files changed, 13 insertions, 6 deletions
diff --git a/emacs.d/10-modules.el b/emacs.d/10-modules.el
index 22372b9..8f51c29 100644
--- a/emacs.d/10-modules.el
+++ b/emacs.d/10-modules.el
@@ -16,6 +16,6 @@
(autoload 'lua-mode
"lua-mode" "A Major mode for editing Lua files" t)
(autoload 'php-mode
- "php-mode" "A Major mode for editing PHP files" t)
+ "php-mode-improved" "A Major mode for editing PHP files" t)
(autoload 'graphviz-dot-mode
"graphviz-dot-mode" "A Major mode for editing graphviz dot files" t)
diff --git a/emacs.d/10-settings.el b/emacs.d/10-settings.el
index 45c9601..073e1ef 100644
--- a/emacs.d/10-settings.el
+++ b/emacs.d/10-settings.el
@@ -2,12 +2,14 @@
(set-frame-font "-*-tamsyn-medium-*-*-*-15-*-*-*-*-80-*-*"))
(setq inhibit-startup-message t) ; don't show welcome screen
-(setq require-final-newline t) ; always append a newline to a file, if it doesn't have one
-(setq font-lock-maximum-decoration t) ; denotes my interest in maximum possible fontification
+(setq require-final-newline t) ; always append a newline to a
+ ; file, if it doesn't have one
+(setq font-lock-maximum-decoration t) ; denotes my interest in maximum
+ ; possible fontification
(setq inhibit-default-init t) ; don't load default init
-(setq indent-tabs-mode nil) ; spaces, no tabs
+(setq-default indent-tabs-mode nil) ; spaces, no tabs
-(setq backup-directory-alist `((".*" . ,temporary-file-directory)))
+(setq backup-directory-alist `((".*" . ,temporary-file-directory)))
; backup file location
(setq auto-save-file-name-transforms `((".*" ,temporary-file-directory t)))
; autosave file location
diff --git a/emacs.d/20-column-marker.el b/emacs.d/20-column-marker.el
index 902e8e0..6243d0b 100644
--- a/emacs.d/20-column-marker.el
+++ b/emacs.d/20-column-marker.el
@@ -2,4 +2,9 @@
(add-hook 'c-mode-hook
(lambda ()
- (column-marker-1 80)))
+ (column-marker-1 72)
+ (column-marker-2 80)))
+(add-hook 'html-mode-hook
+ (lambda ()
+ (column-marker-1 72)
+ (column-marker-2 80)))