keybinding for expand-region

frankee · Feb 25, 2012 · d83cdc8 · d83cdc8
1 parent 21ee8f3
commit d83cdc8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/init-misc.el b/init-misc.el
@@ -174,9 +174,17 @@
 
 (track-closed-files-mode)
 
-(global-set-key (kbd "C-@") 'er/expand-region)
-(global-set-key (kbd "C-M-@") 'er/contract-region)
-(global-set-key (kbd "M-SPC") 'set-mark-command) ;borrowed from ergoemacs
+; if emacs-nox, use C-@, else, use C-2;
+(if window-system
+ (progn
+   (define-key global-map (kbd "C-2") 'er/expand-region)
+   (define-key global-map (kbd "C-M-2") 'er/contract-region)
+   )
+ (progn
+   (define-key global-map (kbd "C-@") 'er/expand-region)
+   (define-key global-map (kbd "C-M-@") 'er/contract-region)
+ )
+)
 
 (define-key global-map (kbd "C-c SPC") 'ace-jump-mode)
 

diff --git a/init.el b/init.el
@@ -85,7 +85,6 @@
   (require 'init-spelling))
 
 (require 'init-marmalade)
-(require 'init-misc)
 
 ;; Finally set up themes, after most possibly-customised faces have been defined
 (require 'init-themes) ; color-themes 6.6.1 has some problem
@@ -114,6 +113,7 @@
 (require 'init-undo-tree)
 (require 'init-moz)
 
+(require 'init-misc)
 ;;----------------------------------------------------------------------------
 ;; Allow access from emacsclient
 ;;----------------------------------------------------------------------------