From eaba2134ff1d1d3fd48d30414fed25d2bc58835a Mon Sep 17 00:00:00 2001
From: Chris Done <chrisdone@gmail.com>
Date: Tue, 8 Feb 2011 20:22:10 +0100
Subject: Require cl

---
 zencoding-mode.el | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'zencoding-mode.el')

diff --git a/zencoding-mode.el b/zencoding-mode.el
index acc1fa9..ea3ca62 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
 
-- 
cgit v1.2.3


From c5f8b1fb4fc7fcb45a355bb4b6a40ca105081f02 Mon Sep 17 00:00:00 2001
From: Chris Done <chrisdone@gmail.com>
Date: Tue, 8 Feb 2011 20:27:19 +0100
Subject: Patch by fgallina to fit zencoding in terminal

---
 zencoding-mode.el | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'zencoding-mode.el')

diff --git a/zencoding-mode.el b/zencoding-mode.el
index ea3ca62..53d5652 100644
--- a/zencoding-mode.el
+++ b/zencoding-mode.el
@@ -548,6 +548,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
@@ -627,6 +628,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))
-- 
cgit v1.2.3