Mark merge point of coffee-mode.

diff --git a/externals-list b/externals-list
index e2b7504daf99a6082c02adc34d4e7a784c2e5536..ef40b34bd7fac4306b1e5e443d6ec532a6701926 100644 (file)
--- a/externals-list
+++ b/externals-list
@@ -18,7 +18,6 @@
 ;; diverged).
 
 (("ack"                        :subtree "https://github.com/leoliu/ack-el")
- ;; In need of serious manual sync as well.
  ;;FIXME:("auctex"     :subtree "git://git.sv.gnu.org/auctex.git")
  ("coffee-mode"                :subtree "https://github.com/defunkt/coffee-mode")
  ("company"            :subtree "https://github.com/company-mode/company-mode.git")

diff --git a/packages/coffee-mode/coffee-mode.el b/packages/coffee-mode/coffee-mode.el
index 4420ab9425e5cf131916d77df4b8a0006fddb5a8..427c0472135770dd3b87ade7a48d09bb9b8c4584 100644 (file)
--- a/packages/coffee-mode/coffee-mode.el
+++ b/packages/coffee-mode/coffee-mode.el
@@ -73,6 +73,19 @@
 
 ;; Please file bugs at <http://github.com/defunkt/coffee-mode/issues>
 
+;; Thanks:
+
+;; Major thanks to http://xahlee.org/emacs/elisp_syntax_coloring.html
+;; the instructions.
+
+;; Also thanks to Jason Blevins's markdown-mode.el and Steve Yegge's
+;; js2-mode for guidance.
+
+;; TODO:
+;; - Execute {buffer,region,line} and show output in new buffer
+;; - Make prototype accessor assignments like `String::length: -> 10` pretty.
+;; - mirror-mode - close brackets and parens automatically
+
 ;;; Code:
 
 (require 'comint)