Mark merge point of coffee-mode.

diff --cc externals-list
index e2b7504daf99a6082c02adc34d4e7a784c2e5536,0000000000000000000000000000000000000000..ef40b34bd7fac4306b1e5e443d6ec532a6701926
mode 100644,000000..100644
--- 1/externals-list
--- /dev/null
+++ b/externals-list
@@@ -1,36 -1,0 +1,35 @@@
-  ;; In need of serious manual sync as well.
 +;; -*- emacs-lisp -*-
 +
 +;; List of packages that are maintained externally.
 +;; The list is made of elements of the form (NAME KIND URL).
 +;;
 +;; Where NAME is the name of the package;
 +;;
 +;; KIND can be one of:
 +;;  :subtree  = a "git subtree" in the `master' branch.
 +;;  :external = kept in a separate `externals/<name>' branch.
 +;;
 +;; And URL is the URL of the remote git repository that we want to track.
 +;; It can be nil, in which case we don't track anything (useless for
 +;; :subtree, but not for :external).
 +
 +;; The FIXMEs indicate that the branch can't be merged as is because it needs
 +;; some manual intervention (typically, because the two branches have
 +;; diverged).
 +
 +(("ack"                       :subtree "https://github.com/leoliu/ack-el")
 + ;;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")
 + ("dismal"            :external nil)
 + ("eldoc-eval"                :subtree "https://github.com/thierryvolpiatto/eldoc-eval.git")
 + ("enwc"              :subtree "bzr::bzr://bzr.savannah.nongnu.org/enwc/trunk")
 + ("f90-interface-browser" :subtree "http://github.com/wence-/f90-iface")
 + ("ggtags"            :subtree "https://github.com/leoliu/ggtags")
 + ("ioccur"            :subtree "https://github.com/thierryvolpiatto/ioccur.git")
 + ("js2-mode"          :subtree "https://github.com/mooz/js2-mode.git")
 + ;;FIXME:("org"               :external ??) ;; Need to introduce snapshots!!
 + ;;FIXME:("vlf"               :subtree ??)
 + ("websocket"         :subtree "https://github.com/ahyatt/emacs-websocket.git")
 + ;;FIXME:("yasnippet" :subtree "https://github.com/capitaomorte/yasnippet.git")
 + )

diff --cc packages/coffee-mode/coffee-mode.el
index 4420ab9425e5cf131916d77df4b8a0006fddb5a8,87a95e7bbb6606166441971c160c7a54c9d436e0..427c0472135770dd3b87ade7a48d09bb9b8c4584
--- 1/packages/coffee-mode/coffee-mode.el
--- 2/coffee-mode.el
+++ b/packages/coffee-mode/coffee-mode.el
@@@ -24,55 -25,34 +24,68 @@@
  
  ;;; Commentary
  
 -;; For commentary please see the README.md or
 -;; http://github.com/defunkt/coffee-mode#readme
 +;; CoffeeScript mode is an Emacs major mode for [CoffeeScript][cs],
 +;; unfancy JavaScript.  It provides syntax highlighting, indentation
 +;; support, imenu support, a menu bar, and a few cute commands.
  
 -;;; Installation
 +;; Installing this package enables CoffeeScript mode for file named
 +;; *.coffee and Cakefile.
  
 -;; In your shell:
 +;; Commands:
  
 -;;     $ cd ~/.emacs.d/vendor
 -;;     $ git clone git://github.com/defunkt/coffee-mode.git
 -
 -;; In your emacs config:
 -
 -;;     (add-to-list 'load-path "~/.emacs.d/vendor/coffee-mode")
 -;;     (require 'coffee-mode)
 +;; M-x coffee-compile-file compiles the current file as a JavaScript
 +;; file.  Operating on "basic.coffee" and running this command will
 +;; save a "basic.js" in the same directory.  Subsequent runs will
 +;; overwrite the file.
 +;;
 +;; If there are compilation errors and we the compiler have returned a
 +;; line number to us for the first error, the point is moved to that
 +;; line, so you can investigate.  If this annoys you, you can set
 +;; `coffee-compile-jump-to-error` to `nil`.
 +;;
 +;; M-x coffee-compile-buffer compiles the current buffer to JavaScript
 +;; using the command specified by the `coffee-command` variable, and
 +;; opens the contents in a new buffer using the mode configured for
 +;; ".js" files.
 +;;
 +;; M-x coffee-compile-region compiles the selected region to
 +;; JavaScript using the same configuration variables as
 +;; `coffee-compile-buffer`.
 +;;
 +;; `C-c C-o C-s' (coffee-cos-mode) toggles a minor mode implementing
 +;; "compile-on-save" behavior.
 +;;
 +;; M-x coffee-repl starts a repl via `coffee-command` in a new buffer.
  
 -;;; Thanks
 +;; Options:
 +;;
 +;; `coffee-tab-width' - Tab width to use when indenting.
 +;; `coffee-command'   - CoffeeScript command for evaluating code.
 +;;                      Must be in your path.
 +;; `coffee-args-repl' - Command line arguments for `coffee-command'
 +;;                      when starting a REPL.
 +;; `coffee-args-compile'          - Arguments for `coffee-command'
 +;;                                  when compiling a file.
 +;; `coffee-compiled-buffer-name'  - Name of the scratch buffer used
 +;;                                  when compiling CoffeeScript.
 +;; `coffee-compile-jump-to-error' - Whether to jump to the first error
 +;;                                  if compilation fails.
 +
 +;; 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)