Permalink
Browse files

Decided to keep fixup-whitespace over delete-horizontal-space.

  • Loading branch information...
1 parent 847fcbe commit a1645245013f63d9d2a84ee0107f13e4c4dc4c57 @jpr5 jpr5 committed Nov 12, 2010
Showing with 2 additions and 3 deletions.
  1. +2 −3 .emacs.d/keys.el
View
@@ -12,8 +12,9 @@
(global-set-key (kbd "M-g") 'goto-line)
(global-set-key (kbd "C-M-\\") 'indent-region)
(global-set-key (kbd "C-M-/") 'align)
-(global-set-key (kbd "M-SPC") 'delete-horizontal-space)
(global-set-key (kbd "M-j") 'join-line)
+(global-set-key (kbd "M-SPC") 'fixup-whitespace)
+(global-set-key (kbd "C-M-SPC") 'delete-blank-lines)
;; Some settings when we're in a windowed environment.
(when window-system
@@ -40,5 +41,3 @@
(global-set-key (kbd "A-+") '(lambda nil (interactive) (screen-zoom 1)))
(global-set-key (kbd "A--") '(lambda nil (interactive) (screen-zoom -1)))
)
-
-

0 comments on commit a164524

Please sign in to comment.