summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAssaf Gordon <assafgordon@gmail.com>2016-02-23 16:43:22 (GMT)
committerAssaf Gordon <assafgordon@gmail.com>2016-02-23 16:43:22 (GMT)
commit14860460a085324dbe28e824b90556504aa2da95 (patch)
treedcd7b20735b8ec0358963a154b0a8c51921e87e7
parentdc6b838e9c343495f160e218e628fc79368020b3 (diff)
parent20f87fa8731714a20259db3c019cac147a59c2a7 (diff)
downloaddot-files-14860460a085324dbe28e824b90556504aa2da95.zip
dot-files-14860460a085324dbe28e824b90556504aa2da95.tar.gz
dot-files-14860460a085324dbe28e824b90556504aa2da95.tar.bz2
Merge remote-tracking branch 'origin/master'
-rw-r--r--emacs12
1 files changed, 11 insertions, 1 deletions
diff --git a/emacs b/emacs
index 009ebf3..9cff86e 100644
--- a/emacs
+++ b/emacs
@@ -57,7 +57,8 @@
(progn
(if (fboundp 'tool-bar-mode) (tool-bar-mode -1))
(menu-bar-mode -2)
- (scroll-bar-mode -1))
+ (if (fboundp 'scroll-bar-mode) (scroll-bar-mode -1))
+ )
; "Linux" C style by default
; (setq c-default-style "linux")
@@ -96,3 +97,12 @@
; For python files, force a 4-space indentation
(add-hook 'python-mode-hook '(lambda ()
(setq python-indent 4)))
+
+
+;; key bindings
+;; http://www.emacswiki.org/emacs/EmacsForMacOS
+ (when (eq system-type 'darwin) ;; mac specific settings
+ (setq mac-option-modifier 'alt)
+ (setq mac-command-modifier 'control)
+ (global-set-key [kp-delete] 'delete-char) ;; sets fn-delete to be right-delete
+ )