sjl

Threesome is a Vim plugin for resolving conflicts during three-way merges. It's designed to be used as a merge tool for version control systems like Mercurial and Git.

• Basic Usage
• Key Bindings
• Modes
• Configuration
• Contributing
• Changelog

sjl

(defn palindrome? [coll]
      (= coll
         (reverse coll)))

(defn n-digit-ints [n]
      (range (expt 10 (- n 1))
             (expt 10 n)))

(defn p4 [n]

sjl

" folding for Markdown headers, both styles (atx- and setex-)
" http://daringfireball.net/projects/markdown/syntax#header
"
" this code can be placed in file
"   $HOME/.vim/after/ftplugin/markdown.vim

func! Foldexpr_markdown(lnum)
    let l1 = getline(a:lnum)

    if l1 =~ '^\s*$'

sjl

(defn- read-packet-playerpositionlook [bot conn]
  (let [payload (assoc {}
                       :x (-read-double conn)
                       :stance (-read-double conn)
                       :y (-read-double conn)
                       :z (-read-double conn)
                       :yaw (-read-float conn)
                       :pitch (-read-float conn)
                       :onground (-read-bool conn))]
    (dosync (alter (:player bot) merge {:location payload}))

sjl

Allow me to add a link to a "sub data file" into any other data file, along with its password.
That way I can access all the passwords inside with only my own password.

Steve's password                      +-------> Dumbwaiter's Password
       |                              |                   |
       V                              |                   V
Stevelosh.data                        +-------> Dumbwaiter Design.data
   |                                  |             |
   +- Stored passwords                |             +- Stored Passwords
   |                                  |

sjl

[merge-tools]
keepthat.executable = sh
keepthat.args = -c 'cp $local $output.original && cp $other $output'
keepthat.premerge = True

[alias]
merge-preferring-theirs = merge --tool keepthat

sjl

(ns jquerytest.core)

(def jquery (js* "$"))

; Can you not use the short form?
(jquery
   (fn []
     (-> (jquery "div.meat")
         (.html "This is a test.")
         (.append "<div>Look here!</div>"))))

sjl

Pre- OS X

• BBEdit
• Vim
• Emacs

2003/2004

• TextMate
• SubEthaEdit

sjl

class Vi < Plugin
  @mode = 'normal'

  class << self; attr_accessor :mode; end

  def self.normal?
    lambda { return Vi.mode == 'normal'}
  end
  def self.insert?
    lambda { return Vi.mode == 'insert'}

sjl

class Vim < Plugin
  @oldmode = 'n'
  @mode = 'n'
  @maps = {}

  class << self; attr_accessor :mode, :maps, :oldmode; end

  def before
  end