diff options
| author | Ron Panduwana <panduwana@gmail.com> | 2011-02-10 00:17:52 +0700 |
|---|---|---|
| committer | Ron Panduwana <panduwana@gmail.com> | 2011-02-10 00:17:52 +0700 |
| commit | 2c6a80ce4751e8834c9bce5087210312ba516386 (patch) | |
| tree | 8494105661d2920ff6a77776abbc4f1edecf666a | |
| parent | d6783b24529833edb02e2d3d68b9b01123841ffc (diff) | |
| parent | c5f8b1fb4fc7fcb45a355bb4b6a40ca105081f02 (diff) | |
| download | emmet-mode-2c6a80ce4751e8834c9bce5087210312ba516386.tar.lz emmet-mode-2c6a80ce4751e8834c9bce5087210312ba516386.tar.xz emmet-mode-2c6a80ce4751e8834c9bce5087210312ba516386.zip | |
Merge branch 'master' into tag-expansion
| -rw-r--r-- | zencoding-mode.el | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/zencoding-mode.el b/zencoding-mode.el index 175940d..54fcc47 100644 --- a/zencoding-mode.el +++ b/zencoding-mode.el @@ -62,6 +62,8 @@ ;; Include the trie data structure for caching ;(require 'zencoding-trie) +(require 'cl) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Generic parsing macros and utilities @@ -573,6 +575,7 @@ For more information see `zencoding-mode'." nil (progn (setq zencoding-mode-keymap (make-sparse-keymap)) + (define-key zencoding-mode-keymap (kbd "C-j") 'zencoding-expand-line) (define-key zencoding-mode-keymap (kbd "<C-return>") 'zencoding-expand-line))) ;;;###autoload @@ -652,6 +655,7 @@ See also `zencoding-expand-line'." (defvar zencoding-preview-keymap (let ((map (make-sparse-keymap))) + (define-key map (kbd "RET") 'zencoding-preview-accept) (define-key map (kbd "<return>") 'zencoding-preview-accept) (define-key map [(control ?g)] 'zencoding-preview-abort) map)) |