[nongnu] elpa/yaml-mode 5f92179 035/124: Merge pull request #15 from barrkel/master

[ELPA Syncer]

branch: elpa/yaml-mode
commit 5f92179798bde48e3e2142e8805496566820c095
Merge: 6d40a1d 737c7fc
Author: Yoshiki Kurihara <clouder@gmail.com>
Commit: Yoshiki Kurihara <clouder@gmail.com>

    Merge pull request #15 from barrkel/master
    
    Remove default C-j binding
---
 yaml-mode.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/yaml-mode.el b/yaml-mode.el
index 66ea331..9d3afcc 100644
--- a/yaml-mode.el
+++ b/yaml-mode.el
@@ -194,8 +194,7 @@ that key is pressed to begin a block literal."
   (define-key yaml-mode-map ">" 'yaml-electric-bar-and-angle)
   (define-key yaml-mode-map "-" 'yaml-electric-dash-and-dot)
   (define-key yaml-mode-map "." 'yaml-electric-dash-and-dot)
-  (define-key yaml-mode-map [backspace] 'yaml-electric-backspace)
-  (define-key yaml-mode-map "\C-j" 'newline-and-indent))
+  (define-key yaml-mode-map [backspace] 'yaml-electric-backspace))
 
 (defvar yaml-mode-syntax-table nil
   "Syntax table in use in `yaml-mode' buffers.")