merge

Author: Shawn Hoover

.hgignore

@@ -4,7 +4,7 @@ syntax: glob
 *.~is
 *~
 clojure
-clojure-1.1.0-rc1
+clojure-1.1.0*
 clojure-contrib
 clojure-mode
 emacs

README.rtf

@@ -8,8 +8,8 @@
 \ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 Normal;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\*
 \ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv 
 \ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}{\*\cs15 \additive \ul\cf2 \sbasedon10 \styrsid15554266 Hyperlink;}}
-{\*\rsidtbl \rsid1393697\rsid2033787\rsid4814124\rsid6821360\rsid6821926\rsid8524089\rsid9387819\rsid10817122\rsid12541964\rsid13455212\rsid14491013\rsid14817266\rsid15554266\rsid15682639}{\*\generator Microsoft Word 10.0.6856;}{\info
-{\operator Shawn Hoover}{\creatim\yr2009\mo1\dy31\hr15}{\revtim\yr2009\mo12\dy19\hr18\min46}{\version8}{\edmins148}{\nofpages2}{\nofwords423}{\nofchars2415}{\nofcharsws2833}{\vern16393}{\*\password 00000000}}{\*\xmlnstbl }
+{\*\rsidtbl \rsid72950\rsid1393697\rsid2033787\rsid4618235\rsid4814124\rsid6821360\rsid6821926\rsid8524089\rsid9387819\rsid10817122\rsid12541964\rsid13455212\rsid14491013\rsid14817266\rsid15554266\rsid15682639}{\*\generator Microsoft Word 10.0.6856;}
+{\info{\operator Shawn Hoover}{\creatim\yr2009\mo1\dy31\hr15}{\revtim\yr2009\mo12\dy31\hr11\min41}{\version9}{\edmins149}{\nofpages2}{\nofwords423}{\nofchars2414}{\nofcharsws2832}{\vern16393}{\*\password 00000000}}{\*\xmlnstbl }
 \paperw12240\paperh15840\margl1800\margr1800\margt1440\margb1440\gutter0 \widowctrl\ftnbj\aenddoc\grfdocevents0\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3
 \jcompress\viewkind4\viewscale100\nolnhtadjtbl\rsidroot6821926 \fet0{\*\wgrffmtfilter 013f}\sectd \linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}
 {\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}
@@ -26,50 +26,50 @@
 \par Clojure Box consists of these components:
 \par 
 \par - Clojure
-\par   }{\field{\*\fldinst {\f2\fs20\insrsid15554266  HYPERLINK "http://clojure.org" }{\f2\fs20\insrsid14817266\charrsid15554266 {\*\datafield 
-00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b4000000068007400740070003a002f002f0063006c006f006a007500720065002e006f00720067002f000000795881f43b1d7f48af2c825dc485276300000000a5ab0000000000}}}{\fldrslt {
+\par   }{\field{\*\fldinst {\f2\fs20\insrsid15554266  HYPERLINK "http://clojure.org" }{\f2\fs20\insrsid4618235\charrsid15554266 {\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b4000000068007400740070003a002f002f0063006c006f006a007500720065002e006f00720067002f000000795881f43b1d7f48af2c825dc485276300000000a5ab000000000000}}}{\fldrslt {
 \cs15\f2\fs20\ul\cf2\insrsid6821926\charrsid15554266 http://clojure.org}}}\sectd \linex0\sectdefaultcl\sftnbj {\f2\fs20\insrsid6821926 
 \par - Clojure Contrib
-\par   }{\field{\*\fldinst {\f2\fs20\insrsid15554266  HYPERLINK "http://clojure.org" }{\f2\fs20\insrsid14817266\charrsid15554266 {\*\datafield 
-00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b4000000068007400740070003a002f002f0063006c006f006a007500720065002e006f00720067002f000000795881f43b1d7f48af2c825dc485276300000000a5ab0000000000}}}{\fldrslt {
+\par   }{\field{\*\fldinst {\f2\fs20\insrsid15554266  HYPERLINK "http://clojure.org" }{\f2\fs20\insrsid4618235\charrsid15554266 {\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b4000000068007400740070003a002f002f0063006c006f006a007500720065002e006f00720067002f000000795881f43b1d7f48af2c825dc485276300000000a5ab000000000000}}}{\fldrslt {
 \cs15\f2\fs20\ul\cf2\insrsid15554266\charrsid15554266 http://clojure.org}}}\sectd \linex0\sectdefaultcl\sftnbj {\f2\fs20\insrsid6821926 
 \par - Emacs, via EmacsW32
-\par   }{\field{\*\fldinst {\f2\fs20\insrsid15554266  HYPERLINK "http://ourcomments.org/Emacs/EmacsW32.html" }{\f2\fs20\insrsid14817266\charrsid15554266 {\*\datafield 
+\par   }{\field{\*\fldinst {\f2\fs20\insrsid15554266  HYPERLINK "http://ourcomments.org/Emacs/EmacsW32.html" }{\f2\fs20\insrsid4618235\charrsid15554266 {\*\datafield 
 00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b6e00000068007400740070003a002f002f006f007500720063006f006d006d0065006e00740073002e006f00720067002f0045006d006100630073002f0045006d006100630073005700330032002e00680074006d00
-6c000000795881f43b1d7f48af2c825dc485276300000000a5ab0000000000}}}{\fldrslt {\cs15\f2\fs20\ul\cf2\insrsid6821926\charrsid15554266 http://ourcomments.org/Emacs/EmacsW32.html}}}\sectd \linex0\sectdefaultcl\sftnbj {\f2\fs20\insrsid6821926 
+6c000000795881f43b1d7f48af2c825dc485276300000000a5ab000000000000}}}{\fldrslt {\cs15\f2\fs20\ul\cf2\insrsid6821926\charrsid15554266 http://ourcomments.org/Emacs/EmacsW32.html}}}\sectd \linex0\sectdefaultcl\sftnbj {\f2\fs20\insrsid6821926 
 \par - clojure-mode
-\par   }{\field{\*\fldinst {\f2\fs20\insrsid4814124  HYPERLINK "}{\f2\fs20\insrsid4814124\charrsid4814124 http://github.com/technomancy/clojure-mode}{\f2\fs20\insrsid4814124 " }{\f2\fs20\insrsid14817266\charrsid12541964 {\*\datafield 
+\par   }{\field{\*\fldinst {\f2\fs20\insrsid4814124  HYPERLINK "}{\f2\fs20\insrsid4814124\charrsid4814124 http://github.com/technomancy/clojure-mode}{\f2\fs20\insrsid4814124 " }{\f2\fs20\insrsid4618235\charrsid12541964 {\*\datafield 
 00d0c9ea79f9bace118c8200aa004ba90b02000000170000002b00000068007400740070003a002f002f006700690074006800750062002e0063006f006d002f0074006500630068006e006f006d0061006e00630079002f0063006c006f006a007500720065002d006d006f00640065000000e0c9ea79f9bace118c8200aa
-004ba90b6e00000068007400740070003a002f002f006700690074006800750062002e0063006f006d002f0074006500630068006e006f006d0061006e00630079002f0063006c006f006a007500720065002d006d006f00640065000000795881f43b1d7f48af2c825dc485276300000000a5ab00000000}}}{\fldrslt {
-\cs15\f2\fs20\ul\cf2\insrsid4814124\charrsid12541964 http://github.com/technomancy/clojure-mode}}}\sectd \linex0\sectdefaultcl\sftnbj {\f2\fs20\insrsid6821926 
+004ba90b6e00000068007400740070003a002f002f006700690074006800750062002e0063006f006d002f0074006500630068006e006f006d0061006e00630079002f0063006c006f006a007500720065002d006d006f00640065000000795881f43b1d7f48af2c825dc485276300000000a5ab0000000000}}}{\fldrslt 
+{\cs15\f2\fs20\ul\cf2\insrsid4814124\charrsid12541964 http://github.com/technomancy/clojure-mode}}}\sectd \linex0\sectdefaultcl\sftnbj {\f2\fs20\insrsid6821926 
 \par - swank-clojure
-\par   }{\field{\*\fldinst {\f2\fs20\insrsid4814124  HYPERLINK "}{\f2\fs20\insrsid4814124\charrsid4814124 http://github.com/technomancy/swank-clojure}{\f2\fs20\insrsid4814124 " }{\f2\fs20\insrsid14817266\charrsid12541964 {\*\datafield 
+\par   }{\field{\*\fldinst {\f2\fs20\insrsid4814124  HYPERLINK "}{\f2\fs20\insrsid4814124\charrsid4814124 http://github.com/technomancy/swank-clojure}{\f2\fs20\insrsid4814124 " }{\f2\fs20\insrsid4618235\charrsid12541964 {\*\datafield 
 00d0c9ea79f9bace118c8200aa004ba90b02000000170000002c00000068007400740070003a002f002f006700690074006800750062002e0063006f006d002f0074006500630068006e006f006d0061006e00630079002f007300770061006e006b002d0063006c006f006a007500720065000000e0c9ea79f9bace118c82
-00aa004ba90b7000000068007400740070003a002f002f006700690074006800750062002e0063006f006d002f0074006500630068006e006f006d0061006e00630079002f007300770061006e006b002d0063006c006f006a007500720065000000795881f43b1d7f48af2c825dc485276300000000a5ab00000000}}
+00aa004ba90b7000000068007400740070003a002f002f006700690074006800750062002e0063006f006d002f0074006500630068006e006f006d0061006e00630079002f007300770061006e006b002d0063006c006f006a007500720065000000795881f43b1d7f48af2c825dc485276300000000a5ab0000000000}}
 }{\fldrslt {\cs15\f2\fs20\ul\cf2\insrsid4814124\charrsid12541964 http://github.com/technomancy/swank-clojure}}}\sectd \linex0\sectdefaultcl\sftnbj {\f2\fs20\insrsid6821926 
 \par - Slime
-\par   }{\field{\*\fldinst {\f2\fs20\insrsid15554266  HYPERLINK "http://common-lisp.net/project/slime/" }{\f2\fs20\insrsid14817266\charrsid15554266 {\*\datafield 
+\par   }{\field{\*\fldinst {\f2\fs20\insrsid15554266  HYPERLINK "http://common-lisp.net/project/slime/" }{\f2\fs20\insrsid4618235\charrsid15554266 {\*\datafield 
 00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b6400000068007400740070003a002f002f0063006f006d006d006f006e002d006c006900730070002e006e00650074002f00700072006f006a006500630074002f0073006c0069006d0065002f000000795881f43b1d
-7f48af2c825dc485276300000000a5ab0000000000}}}{\fldrslt {\cs15\f2\fs20\ul\cf2\insrsid6821926\charrsid15554266 http://common-lisp.net/project/slime/}}}\sectd \linex0\sectdefaultcl\sftnbj {\f2\fs20\insrsid6821926 
+7f48af2c825dc485276300000000a5ab000000000000}}}{\fldrslt {\cs15\f2\fs20\ul\cf2\insrsid6821926\charrsid15554266 http://common-lisp.net/project/slime/}}}\sectd \linex0\sectdefaultcl\sftnbj {\f2\fs20\insrsid6821926 
 \par }{\f2\fs20\insrsid15554266 - Paredit}{\f2\fs20\insrsid6821926 
-\par }{\f2\fs20\insrsid15554266   }{\field{\*\fldinst {\f2\fs20\insrsid15554266  HYPERLINK "http://mumble.net/~campbell/emacs/paredit.el" }{\f2\fs20\insrsid14817266\charrsid9387819 {\*\datafield 
+\par }{\f2\fs20\insrsid15554266   }{\field{\*\fldinst {\f2\fs20\insrsid15554266  HYPERLINK "http://mumble.net/~campbell/emacs/paredit.el" }{\f2\fs20\insrsid4618235\charrsid9387819 {\*\datafield 
 00d0c9ea79f9bace118c8200aa004ba90b02000000170000002d00000068007400740070003a002f002f006d0075006d0062006c0065002e006e00650074002f007e00630061006d007000620065006c006c002f0065006d006100630073002f0070006100720065006400690074002e0065006c000000e0c9ea79f9bace11
 8c8200aa004ba90b7200000068007400740070003a002f002f006d0075006d0062006c0065002e006e00650074002f007e00630061006d007000620065006c006c002f0065006d006100630073002f0070006100720065006400690074002e0065006c000000795881f43b1d7f48af2c825dc485276300000000a5ab000000
-0000}}}{\fldrslt {\cs15\f2\fs20\ul\cf2\insrsid15554266\charrsid9387819 http://mumble.net/~campbell/emacs/paredit.el}}}\sectd \linex0\sectdefaultcl\sftnbj {\f2\fs20\insrsid15554266 
+000000}}}{\fldrslt {\cs15\f2\fs20\ul\cf2\insrsid15554266\charrsid9387819 http://mumble.net/~campbell/emacs/paredit.el}}}\sectd \linex0\sectdefaultcl\sftnbj {\f2\fs20\insrsid15554266 
 \par }\pard \ql \li245\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin245\itap0\pararsid15554266 {\f2\fs20\insrsid15554266 Paredit is included for your convenience, but you\rquote ll have to activate   it in ~/.emacs. See }{\field{\*\fldinst {
-\f2\fs20\insrsid15554266  HYPERLINK "}{\f2\fs20\insrsid15554266\charrsid15554266 http://kyle-burton.tumblr.com/post/86984817/clojure-box-paredit}{\f2\fs20\insrsid15554266 " }{\f2\fs20\insrsid14817266\charrsid9387819 {\*\datafield 
+\f2\fs20\insrsid15554266  HYPERLINK "}{\f2\fs20\insrsid15554266\charrsid15554266 http://kyle-burton.tumblr.com/post/86984817/clojure-box-paredit}{\f2\fs20\insrsid15554266 " }{\f2\fs20\insrsid4618235\charrsid9387819 {\*\datafield 
 00d0c9ea79f9bace118c8200aa004ba90b02000000170000004000000068007400740070003a002f002f006b0079006c0065002d0062007500720074006f006e002e00740075006d0062006c0072002e0063006f006d002f0070006f00730074002f00380036003900380034003800310037002f0063006c006f006a007500
 720065002d0062006f0078002d0070006100720065006400690074000000e0c9ea79f9bace118c8200aa004ba90b9800000068007400740070003a002f002f006b0079006c0065002d0062007500720074006f006e002e00740075006d0062006c0072002e0063006f006d002f0070006f00730074002f0038003600390038
-0034003800310037002f0063006c006f006a007500720065002d0062006f0078002d0070006100720065006400690074000000795881f43b1d7f48af2c825dc485276300000000a5ab0000000000}}}{\fldrslt {\cs15\f2\fs20\ul\cf2\insrsid15554266\charrsid9387819 
+0034003800310037002f0063006c006f006a007500720065002d0062006f0078002d0070006100720065006400690074000000795881f43b1d7f48af2c825dc485276300000000a5ab000000000000}}}{\fldrslt {\cs15\f2\fs20\ul\cf2\insrsid15554266\charrsid9387819 
 http://kyle-burton.tumblr.com/post/86984817/clojure-box-paredit}}}\sectd \linex0\sectdefaultcl\sftnbj {\f2\fs20\insrsid15554266 .
 \par }\pard \ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\f2\fs20\insrsid15554266\charrsid15554266 
 \par }{\f2\fs20\insrsid6821926 Thanks to all the developers of these excellent packages!
 \par 
 \par }{\f2\fs20\ul\insrsid6821926 Customization
 \par 
 \par }\pard \ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid6821926 {\f2\fs20\insrsid6821926\charrsid6821926 Clojure Box's startup is controlled by default.el in the}{\f2\fs20\insrsid6821926  }{\f2\fs20\insrsid6821926\charrsid6821926 emacs
-\\site-start}{\f2\fs20\insrsid6821926  }{\f2\fs20\insrsid6821926\charrsid6821926 directory under the installation. You can put}{\f2\fs20\insrsid6821926  }{\f2\fs20\insrsid6821926\charrsid6821926 your own }{\f2\fs20\insrsid6821926 customizations }{
-\f2\fs20\insrsid6821926\charrsid6821926 in}{\f2\fs20\insrsid6821926  your }{\f2\fs20\insrsid6821926\charrsid6821926 .emacs}{\f2\fs20\insrsid6821926  file}{\f2\fs20\insrsid10817122 
+\\site-}{\f2\fs20\insrsid72950 lisp}{\f2\fs20\insrsid6821926  }{\f2\fs20\insrsid6821926\charrsid6821926 directory under the installation. You can put}{\f2\fs20\insrsid6821926  }{\f2\fs20\insrsid6821926\charrsid6821926 your own }{\f2\fs20\insrsid6821926 
+customizations }{\f2\fs20\insrsid6821926\charrsid6821926 in}{\f2\fs20\insrsid6821926  your }{\f2\fs20\insrsid6821926\charrsid6821926 .emacs}{\f2\fs20\insrsid6821926  file}{\f2\fs20\insrsid10817122 
  (these customizations will not be overwritten by future Clojure Box or Emacs installations)}{\f2\fs20\insrsid6821926\charrsid6821926 . Type C-x C-f and enter ~/.emacs. Edit the}{\f2\fs20\insrsid6821926  }{\f2\fs20\insrsid6821926\charrsid6821926 
 file and save it with C-x C-s. ~ }{\f2\fs20\insrsid4814124 is }{\f2\fs20\insrsid10817122 the same as your HOME environment variable, or }{\f2\fs20\insrsid6821926\charrsid6821926 the application data directory under your user}{\f2\fs20\insrsid6821926  }{
 \f2\fs20\insrsid6821926\charrsid6821926 profile}{\f2\fs20\insrsid10817122  if you have no HOME}{\f2\fs20\insrsid6821926\charrsid6821926 .}{\f2\fs20\insrsid6821926 

clojure-box-setup.iss

@@ -2,7 +2,7 @@
 AllowNoIcons=yes
 AppId={{8BECBEE2-A1EF-4326-B1C6-8B4515E21916}
 AppName=Clojure Box
-AppVerName=Clojure Box 1.1RC1-2
+AppVerName=Clojure Box 1.1.0-1
 AppPublisher=Clojure Box
 AppPublisherURL=http://clojure.bighugh.com
 AppSupportURL=http://http://www.bitbucket.org/shoover/clojure-box
@@ -13,7 +13,7 @@ DefaultGroupName=Clojure Box
 InfoBeforeFile=README.rtf
 InfoAfterFile=post-install.txt
 OutputDir=C:\Documents and Settings\Shawn\Desktop\clojure-box-setup
-OutputBaseFilename=clojure-box-1.1RC1-2-setup
+OutputBaseFilename=clojure-box-1.1.0-1-setup
 Compression=lzma
 SolidCompression=yes
 
@@ -26,13 +26,13 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip
 
 [Files]
 ; Clojure from the official download zip
-Source: "clojure-1.1.0-rc1\*"; Excludes: ".git*,\classes,*.jar"; DestDir: "{app}\clojure"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "clojure-1.1.0\*"; Excludes: ".git*,\classes,*.jar"; DestDir: "{app}\clojure"; Flags: ignoreversion recursesubdirs createallsubdirs
 
 ; contrib from github/richhickey
 Source: "clojure-contrib\*"; Excludes: ".git*,*.class,*.jar,\DLR_Main,bin,obj"; DestDir: "{app}\clojure-contrib"; Flags: ignoreversion recursesubdirs createallsubdirs
 
 ; jars need to be in a dir for swank-clojure-jar-home
-Source: "clojure-1.1.0-rc1\clojure.jar"; DestDir: "{app}\lib"; Flags: ignoreversion
+Source: "clojure-1.1.0\clojure.jar"; DestDir: "{app}\lib"; Flags: ignoreversion
 Source: "clojure-contrib\clojure-contrib.jar"; DestDir: "{app}\lib"; Flags: ignoreversion
 
 ; Emacs from emacsw32 install

default.el

@@ -30,12 +30,34 @@
   (add-to-list 'load-path (concat clojure-home "clojure-mode/"))
   (require 'clojure-mode)
 
+  ;; swank-clojure-project expects every dependency to live under the
+  ;; project. Clojure Box users may not be up to speed with Leiningen
+  ;; so we append whatever the initial classpath was onto what
+  ;; swank-clojure-project thinks the classpath should be. Project
+  ;; jars and dirs come first, then initial swank-clojure-classpath
+  ;; stuff, so the project can always override the Clojure version or
+  ;; swank or anything else.
+  (defvar clojure-box-initial-classpath nil)
+  (defadvice swank-clojure-project (before init-clojure-box-classpath)
+    (setq clojure-box-initial-classpath swank-clojure-classpath))
+  (add-hook 'swank-clojure-project-hook
+	    (lambda ()
+	      (setq swank-clojure-classpath
+		    (append swank-clojure-classpath
+			    clojure-box-initial-classpath))))
+
   (add-to-list 'load-path (concat clojure-home "swank-clojure/"))
   (setq swank-clojure-jar-home (concat clojure-home "lib"))
   (require 'swank-clojure)
 
-  ;; The user may setq this in ~/.emacs. By now it's either defined there
-  ;; or in the require call above, so it's safe to add.
+  ;; Classpath hackery. The user may setq this in ~/.emacs for
+  ;; personal jars and dirs. If not, swank-clojure sets up the
+  ;; defaults. Here we make sure the defaults are added to the end if
+  ;; the user set the variable, in case they didn't add everything we
+  ;; need.
+  (dolist (item (swank-clojure-default-classpath))
+    (add-to-list 'swank-clojure-classpath item 'append))
+  ;; And of course we need our swank sources in there.
   (add-to-list 'swank-clojure-classpath
 	       (concat clojure-home "swank-clojure/src"))
 

post-install.txt

@@ -2,16 +2,23 @@ The first thing you'll see when you launch Clojure Box is the read-eval-print
 loop (REPL). Start typing Clojure expressions and you're on your way!
 
 If you're new to Emacs, check out the built in tutorial by typing C-h t
-(Control+h and then t). Here are some of the most useful commands to get you
-started:
+(Control+h and then t). Emacs has all kinds of commands. You can run any
+command by typing M-x (Alt-x) and typing the name. Here are some of the most
+useful commands to get you started:
 
 Open a file (find-file is the Emacs function): C-x C-f
 Save a file (save-buffer): C-x C-s
 Switch to another open buffer (iswitchb): C-x b
 Close Emacs (kill-emacs): C-x C-c
-Execute any Emacs function by name: M-x (Alt+x)
 Restart the REPL with src, classes, and lib/*.jar on the classpath: M-x
 swank-clojure-project
+Keyboard help: C-h k
 
 In the REPL you can use M-p and M-n to cycle up and down across previous
 expressions.
+
+Once you start typing code in .clj files instead of the REPL, you'll want to
+evaluate code in the REPL from the files' buffers. Have a look at the Slime
+menu or check the keyboard help for C-x C-e, C-M-x, and C-c C-l. You can
+quickly switch to the REPL buffer with C-c C-z. Be sure to check out M-. to
+jump to the source definition of the symbol under the cursor!