From 926b0487668dc221d4b971a3749b7f402e9b72f3 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Fri, 10 Feb 2012 17:47:20 +0000 Subject: [PATCH] cleaned up keybindings.el a little bit --- keybindings.el | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/keybindings.el b/keybindings.el index 3f7f859..1e327d0 100644 --- a/keybindings.el +++ b/keybindings.el @@ -12,13 +12,25 @@ ;; Kill-Ring related. (global-set-key (kbd "M-Y") 'yank-pop-forwards) -;; Move to beginning/end of buffer -(global-set-key (kbd "s-") 'beginning-of-buffer) -(global-set-key (kbd "s-") 'end-of-buffer) +;; Mac OS X specific keybindings +(when (eq system-type 'darwin) + + ;; Mac OS X Fullscreen (requires this patch: https://gist.github.com/1012927) + (global-set-key (kbd "s-") 'ns-toggle-fullscreen) + + ;; Undo/Redo (via undo-tree) + (when (require 'undo-tree nil 'noerror) + (global-set-key (kbd "s-z") 'undo-tree-undo) + (global-set-key (kbd "s-Z") 'undo-tree-redo)) + + ;; Move to beginning/end of buffer + (global-set-key (kbd "s-") 'beginning-of-buffer) + (global-set-key (kbd "s-") 'end-of-buffer) + + ;; Move to beginning/end of line + (global-set-key (kbd "s-") 'beginning-of-line) + (global-set-key (kbd "s-") 'end-of-line)) -;; Move to beginning/end of line -(global-set-key (kbd "s-") 'beginning-of-line) -(global-set-key (kbd "s-") 'end-of-line) ;; Window switching (via helpers.el). (global-set-key (kbd "C-x i") 'other-window-reverse) @@ -29,13 +41,6 @@ (when (require 'ibuffer nil 'noerror) (global-set-key (kbd "C-x C-b") 'ibuffer)) -;; Undo/Redo (via undo-tree) -(when (require 'undo-tree nil 'noerror) - ;; Mac OS X GUI - (when (eq system-type 'darwin) - (global-set-key (kbd "s-z") 'undo-tree-undo) - (global-set-key (kbd "s-Z") 'undo-tree-redo))) - ;; eproject related keybindings (when (require 'eproject nil 'noerror) (global-set-key (kbd "C-c C-b") 'eproject-ibuffer) @@ -73,9 +78,6 @@ ;; Align Equal Signs (via helpers.el) ;; (global-set-key (kbd "M-s-‘") 'align-equal-signs) -;; Mac OS X Fullscreen (requires this patch: https://gist.github.com/1012927) -(global-set-key (kbd "s-") 'ns-toggle-fullscreen) - ;; Set/increase/decrease transparency (via helpers.el) (global-set-key (kbd "C-|") 'transparency-set-value) (global-set-key (kbd "C-<") 'transparency-increase)