Skip to content
Browse files

Added shortcut to join line. Removed scroll bar

  • Loading branch information...
1 parent fa1bdbe commit b7e7aa4267c1f42dcc725dc096be83b79e7df924 @habib committed Feb 9, 2013
Showing with 5 additions and 7 deletions.
  1. +5 −7 init.el
View
12 init.el
@@ -17,6 +17,9 @@
(byte-recompile-directory user-emacs-directory 0)
+;; Keyboard shortcuts
+(global-set-key [(control j)] 'join-line)
+
;; Reliable way to maximize the window on startup on Ubuntu. Sorta successful on a Mac with Emacs 24.
(require 'maxframe)
(add-hook 'window-setup-hook 'maximize-frame t)
@@ -26,17 +29,12 @@
;; Trailing whitespace should be banned
(add-hook 'before-save-hook 'delete-trailing-whitespace)
-
(setq whitespace-style '(trailing space-before-tab indentation space-after-tab))
;; Use spaces for indentation
(setq indent-tabs-mode nil)
(setq-default indent-tabs-mode nil)
-;; Remove the toolbar
-(if (fboundp 'tool-bar-mode)
- (tool-bar-mode -1))
-
;; I don't like to type yes. y should suffice
(fset 'yes-or-no-p 'y-or-n-p)
@@ -158,7 +156,7 @@
'(mouse-yank-at-point t)
'(recentf-mode 1)
'(save-place t nil (saveplace))
- '(scroll-bar-mode (quote right))
+ '(scroll-bar-mode nil)
'(show-paren-mode t)
'(size-indication-mode t)
'(text-mode-hook (quote (turn-on-auto-fill text-mode-hook-identify)))
@@ -222,7 +220,7 @@
(autoload 'sass-mode "sass-mode" nil t)
;; Load up Ruby and its related settings
- (require 'ruby-settings)
+(require 'ruby-settings)
;; Load up JavaScript settings
(require 'javascript-settings)

0 comments on commit b7e7aa4

Please sign in to comment.
Something went wrong with that request. Please try again.