Commits

firefly committed 88dc381

Updates to vim config (mostly syntax files)

Comments (0)

Files changed (45)

 !urxvt.font: 7x13
 !urxvt.font: xft:DejaVu Sans Mono-7
 !urxvt.font: xft:DejaVu Sans Mono:size=7
-!urxvt.font: xft:DejaVu Sans Mono:pixelsize=12
+urxvt.font: xft:DejaVu Sans Mono:pixelsize=12
 !urxvt.font: xft:DejaVu Sans Mono:size=7
-urxvt.font: xft:Source Code Pro:size=8
+!urxvt.font: xft:Source Code Pro:size=8
 !urxvt.font: xft:inconsolata:pixelsize=14
 !urxvt.font: xft:mplus 1mn light:size=9
 urxvt.urgentOnBell:    true

herbstluftwm/autostart

 hc rule windowtype~'_NET_WM_WINDOW_TYPE_(DIALOG|UTILITY|SPLASH)' tag=float
 hc rule windowtype='_NET_WM_WINDOW_TYPE_DIALOG' focus=on
 hc rule windowtype~'_NET_WM_WINDOW_TYPE_(NOTIFICATION|DOCK)' manage=off
-hc rule class='Conky' manage=off
-#hc rule class='Steam' manage=off
-hc rule class='Steam' pseudotile=on
+#hc rule class='Steam' pseudotile=on
 
 # unlock, just to be sure
 hc unlock
 hc detect_monitors
 
 # find the panel
-#panel=~/.config/herbstluftwm/panel.sh
+panel=~/.config/herbstluftwm/panel.sh
 #[ -x "$panel" ] || panel=/etc/xdg/herbstluftwm/panel.sh
 for monitor in $(herbstclient list_monitors | cut -d: -f1) ; do
     # start it on each monitor
-    panel.sh $monitor &
+    $panel $monitor &
 done
 
 # Prepare a (virtual) monitor + tag for floating windows (we do this after the

herbstluftwm/panel.sh

 panel_left_width=600
 panel_right_width=$((${geometry[2]} - $panel_left_width))
 
-#font="-*-fixed-medium-*-*-*-10-*-*-*-*-*-*-*"
+#font="-misc-fixed-medium-*-*-*-10-*-*-*-*-*-*-*"
 font="DejaVu Sans Mono:pixelsize=10"
 bgcolor=$(herbstclient get frame_border_normal_color)
 selbg=$(herbstclient get window_border_active_color)
   3> >(dzen2 -fn "$font" -y $y -h $panel_height -fg '#efefef' -bg "$bgcolor" \
              -ta r  -x $panel_left_width  -w $panel_right_width)
 
-
                     w:new_tab(uri, false)
                 else -- Open selection in current tab
                     -- FireFly edit: actually, don't do anything at all.
-                --  uri = luakit.selection.primary
-                --  if uri then w:navigate(w:search_open(uri)) end
+                    -- TODO: Substitute w:navigate with preparing a tabopen?
+
+                 -- uri = luakit.selection.primary
+                 -- -- Ignore multi-line selection contents
+                 -- if uri and not string.match(uri, "\n.+") then
+                 --     w:navigate(w:search_open(uri))
+                 -- end
                 end
             end
         end),
     key({}, "p", [[Open a URL based on the current primary selection contents
         in the current tab.]],
         function (w)
-            local uri = assert(luakit.selection.primary, "Empty selection.")
+         -- local uri = assert(luakit.selection.primary, "Empty selection.")
+            local uri = luakit.selection.primary
+            if not uri then w:notify("No primary selection...") return end
             w:navigate(w:search_open(uri))
         end),
 
     key({}, "P", [[Open a URL based on the current primary selection contents
         in `[count=1]` new tab(s).]],
         function (w, m)
-            local uri = assert(luakit.selection.primary, "Empty selection.")
+         -- local uri = assert(luakit.selection.primary, "Empty selection.")
+            local uri = luakit.selection.primary
+            if not uri then w:notify("No primary selection...") return end
             for i = 1, m.count do w:new_tab(w:search_open(uri)) end
         end, {count = 1}),
 
     -- Yanking
+    -- FireFly edit: (not really an edit, but) keep `yy` and `yt` instead of
+    -- turning `yy` into just `y`.
     buf("^yy$", "Yank current URI to primary selection.",
         function (w)
             local uri = string.gsub(w.view.uri or "", " ", "%%20")
         end),
 
     -- Commands
+    -- FireFly edit: shifted A/X
     key({"Control"}, "A", "Increment last number in URL.",
         function (w) w:navigate(w:inc_uri(1)) end),
 

luakit/globals.lua

     ["schema.sys.kth.se"] = {
         user_stylesheet_uri     = get_userstyle("kth-schedule.css"),
     },
+    ["rapp.csc.kth.se"] = {
+        user_stylesheet_uri     = get_userstyle("kth-rapp.css"),
+    },
     ["youtube.com"] = {
         enable_scripts = true,
     --  enable_plugins = true,
     enter = function (w)
         w:set_prompt("-- INSERT --")
         w:set_input()
+        w.view:focus()
     end,
     -- Send key events to webview
     passthrough = true,
     activate = function (w, text)
         w:set_mode()
         local cmd = string.sub(text, 2)
+
         -- Ignore blank commands
-        if string.match(cmd, "^%s*$") then return end
-        local success, match = pcall(w.match_cmd, w, cmd)
-        if not success then
-            w:error("In command call: " .. match)
-        elseif not match then
+        if not string.find(cmd, "%S") then return end
+
+        local success, match = xpcall(
+            function () return w:match_cmd(cmd) end,
+            function (err) w:error(debug.traceback(err, 3)) end)
+
+        if success and not match then
             w:error(string.format("Not a browser command: %q", cmd))
         end
     end,

luakit/window.lua

     key_press_match = function (w)
         w.win:add_signal("key-press", function (_, mods, key)
             -- Match & exec a bind
-            local success, match = pcall(w.hit, w, mods, key)
-            if not success then
-                w:error("In bind call: " .. match)
-            elseif match then
+         -- local success, match = pcall(w.hit, w, mods, key)
+         -- if not success then
+         --     w:error("In bind call: " .. match)
+         -- elseif match then
+            local success, match = xpcall(
+                function () return w:hit(mods, key) end,
+                function (err) w:error(debug.traceback(err, 3)) end)
+
+            if success and match then
                 return true
             end
         end)
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =9
-let g:netrw_dirhist_1='/home/firefly/.ncmpcpp'
-let g:netrw_dirhist_2='/usr/share/doc/rfc/txt'
-let g:netrw_dirhist_3='/home/firefly/music'
-let g:netrw_dirhist_4='/home/firefly/.ncmpcpp'
-let g:netrw_dirhist_5='/home/firefly/.config/herbstluftwm'
-let g:netrw_dirhist_6='/home/firefly/.ncmpcpp'
-let g:netrw_dirhist_7='/home/firefly/Dropbox/prog/repos/pangoterm/pkg-pangoterm'
-let g:netrw_dirhist_8='/home/firefly/a'
-let g:netrw_dirhist_9='/home/firefly/.config/herbstluftwm'
+let g:netrw_dirhist_cnt =2
+let g:netrw_dirhist_1='/home/firefly/Dropbox/prog/repos/dotfiles/vim/syntax/note-sub'
+let g:netrw_dirhist_2='/home/firefly/annat/hardware/np350u2b'

vim/after/syntax/j.vim

+"syn match jOperator "+\."   conceal cchar=∨
+"syn match jOperator "\*\."  conceal cchar=∧
+"syn match jOperator "+:"    conceal cchar=⊽
+"syn match jOperator "\*:"   conceal cchar=⊼
+
+syn match jOperator "<\."   conceal cchar=⌈
+syn match jOperator ">\."   conceal cchar=⌊
+syn match jOperator "%:"    conceal cchar=√
+"syn match jOperator "-\."   conceal cchar=∖
+
+syn match jOperator "\<i\." conceal cchar=⍳
+syn match jOperator "\<e\." conceal cchar=∈
+syn match jOperator "\<a:"  conceal cchar=⬜
+
+
+syn match jOperator "_[_0-9]\@=" conceal cchar=⁻
+syn match jOperator "_[^.0-9]\@="   conceal cchar=∞

vim/bundle/minimap-vim/.git/HEAD

+ref: refs/heads/master

vim/bundle/minimap-vim/.git/config

+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+[remote "origin"]
+	url = https://github.com/koron/minimap-vim
+	fetch = +refs/heads/*:refs/remotes/origin/*
+[branch "master"]
+	remote = origin
+	merge = refs/heads/master

vim/bundle/minimap-vim/.git/description

+Unnamed repository; edit this file 'description' to name the repository.

vim/bundle/minimap-vim/.git/hooks/applypatch-msg.sample

+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/commit-msg" &&
+	exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:

vim/bundle/minimap-vim/.git/hooks/commit-msg.sample

+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}

vim/bundle/minimap-vim/.git/hooks/post-update.sample

+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info

vim/bundle/minimap-vim/.git/hooks/pre-applypatch.sample

+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+	exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
+:

vim/bundle/minimap-vim/.git/hooks/pre-commit.sample

+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+# If you want to allow non-ascii filenames set this variable to true.
+allownonascii=$(git config hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ascii filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+	echo "Error: Attempt to add a non-ascii file name."
+	echo
+	echo "This can cause problems if you want to work"
+	echo "with people on other platforms."
+	echo
+	echo "To be portable it is advisable to rename the file ..."
+	echo
+	echo "If you know what you are doing you can disable this"
+	echo "check using:"
+	echo
+	echo "  git config hooks.allownonascii true"
+	echo
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --

vim/bundle/minimap-vim/.git/hooks/pre-rebase.sample

+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up-to-date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+exit 0
+
+################################################################
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".

vim/bundle/minimap-vim/.git/hooks/prepare-commit-msg.sample

+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples.  The first comments out the
+# "Conflicts:" part of a merge commit.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+case "$2,$3" in
+  merge,)
+    /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+
+# ,|template,)
+#   /usr/bin/perl -i.bak -pe '
+#      print "\n" . `git diff --cached --name-status -r`
+#	 if /^#/ && $first++ == 0' "$1" ;;
+
+  *) ;;
+esac
+
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"

vim/bundle/minimap-vim/.git/hooks/update.sample

+#!/bin/sh
+#
+# An example hook script to blocks unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+	echo "Usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --bool hooks.allowunannotated)
+allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --bool hooks.denycreatebranch)
+allowdeletetag=$(git config --bool hooks.allowdeletetag)
+allowmodifytag=$(git config --bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero="0000000000000000000000000000000000000000"
+if [ "$newrev" = "$zero" ]; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if [ "$allowunannotated" != "true" ]; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if [ "$allowdeletetag" != "true" ]; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0

vim/bundle/minimap-vim/.git/index

Binary file added.

vim/bundle/minimap-vim/.git/info/exclude

+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

vim/bundle/minimap-vim/.git/logs/HEAD

+0000000000000000000000000000000000000000 eb257e53f9b99e38eba04040078079c63c708ada Jonas Höglund <firefly@firefly.nu> 1361657316 +0100	clone: from https://github.com/koron/minimap-vim

vim/bundle/minimap-vim/.git/logs/refs/heads/master

+0000000000000000000000000000000000000000 eb257e53f9b99e38eba04040078079c63c708ada Jonas Höglund <firefly@firefly.nu> 1361657316 +0100	clone: from https://github.com/koron/minimap-vim

vim/bundle/minimap-vim/.git/logs/refs/remotes/origin/HEAD

+0000000000000000000000000000000000000000 eb257e53f9b99e38eba04040078079c63c708ada Jonas Höglund <firefly@firefly.nu> 1361657316 +0100	clone: from https://github.com/koron/minimap-vim

vim/bundle/minimap-vim/.git/objects/pack/pack-67bec3a72047cdc589d88b7b743b90d1b1272534.idx

Binary file added.

vim/bundle/minimap-vim/.git/objects/pack/pack-67bec3a72047cdc589d88b7b743b90d1b1272534.pack

Binary file added.

vim/bundle/minimap-vim/.git/packed-refs

+# pack-refs with: peeled 
+d3408d83fbe552fc146114e83f7bb214031be8d5 refs/remotes/origin/lazy-apply
+e859c0c7fe92b76f27c50d74e6b0233ef135f764 refs/remotes/origin/lazy-receiver
+7536a80cd1e8d5b532f4c093a9f5e2b6951a1a81 refs/remotes/origin/lazy-redraw
+eb257e53f9b99e38eba04040078079c63c708ada refs/remotes/origin/master
+09887311a024821aa1e282d8fb449bb82179bd55 refs/remotes/origin/reverse_protocol
+a314a8580acf7980b3c7bc4ed979d0f3449c58c2 refs/remotes/origin/without_feedkeys
+82664656cd0024911064b53596b165b25a5e3ff3 refs/tags/vimjp_issues_273
+^14c4770d7dc1050227d65899ba4ef3d57bfbfc91

vim/bundle/minimap-vim/.git/refs/heads/master

+eb257e53f9b99e38eba04040078079c63c708ada

vim/bundle/minimap-vim/.git/refs/remotes/origin/HEAD

+ref: refs/remotes/origin/master

vim/bundle/minimap-vim/.gitignore

+VIM_AUTO_RTP
+tmp/

vim/bundle/minimap-vim/README.mkd

+# minimap plugin for Vim
+
+## 使い方
+
+  1. runtimepath にこのディレクトリを加えるなどしてインストール
+  2. gvimを起動する (香り屋版推奨というかそれしかテストしてない)
+  2. 適当なファイルを開く `:e $VIM/README.txt`
+  3. `:MinimapSync` を実行する
+
+ワオ!
+
+## 注意事項
+
+まだ実験段階なので、環境によっては動かないかも。許せ。

vim/bundle/minimap-vim/autoload/minimap.vim

+" vim:set ts=8 sts=2 sw=2 tw=0 et nowrap:
+"
+" minimap.vim - Autoload of minimap plugin for Vim.
+"
+" License: THE VIM LICENSE
+"
+" Copyright:
+"   - (C) 2012 MURAOKA Taro (koron.kaoriya@gmail.com)
+
+scriptencoding utf-8
+
+let s:minimap_id = 'MINIMAP'
+let s:minimap_mode = get(s:, 'minimap_mode', 0)
+
+function! minimap#_is_open(id)
+  let servers = split(serverlist(), '\n', 0)
+  return len(filter(servers, 'v:val ==? a:id')) > 0 ? 1 : 0
+endfunction
+
+function! minimap#_open(id, ack)
+  if has('gui_macvim')
+    call minimap#_open_macvim(a:id, a:ack)
+  elseif has('win32') || has('win64')
+    call minimap#_open_win(a:id, a:ack)
+  else
+    call minimap#_open_others(a:id, a:ack)
+  endif
+endfunction
+
+function! minimap#_open_macvim(id, ack)
+  let macvim_dir = $VIM . '/../../../..'
+  let cmd_args = [
+        \ macvim_dir . '/MacVim.app/Contents/MacOS/Vim',
+        \ '-g',
+        \ '--servername', a:id,
+        \ '-c', printf("\"let g:minimap_ack=\'%s\'\"", a:ack),
+        \ ]
+  silent execute '!'.join(cmd_args, ' ')
+endfunction
+
+function! minimap#_open_win(id, ack)
+  let args = [
+        \ 'gvim',
+        \ '--servername', a:id,
+        \ '-c', printf("\"let g:minimap_ack=\'%s\'\"", a:ack),
+        \ ]
+  silent execute '!start '.join(args, ' ')
+endfunction
+
+function! minimap#_open_others(id, ack)
+  let args = [
+        \ 'gvim',
+        \ '--servername', a:id,
+        \ '-c', printf("\"let g:minimap_ack=\'%s\'\"", a:ack),
+        \ '&',
+        \ ]
+  silent execute '!'.join(args, ' ')
+endfunction
+
+function! minimap#_capture()
+  return {
+        \ 'sender': v:servername,
+        \ 'path': minimap#_get_current_path(),
+        \ 'line': line('.'),
+        \ 'col': col('.'),
+        \ 'start': line('w0'),
+        \ 'end': line('w$'),
+        \ }
+endfunction
+
+function! minimap#_send(id)
+  let data = minimap#_capture()
+  let expr = printf('minimap#_on_recv("%s")', string(data))
+  call remote_expr(a:id, expr)
+endfunction
+
+function! minimap#_on_open()
+  " setup view parameters.
+  call minimap#_set_small_font()
+  set guioptions= laststatus=0 cmdheight=1 nowrap
+  set columns=80 foldcolumn=0
+  set scrolloff=0
+  set cursorline
+  hi clear CursorLine
+  hi link CursorLine Cursor
+  winpos 0 0
+  set lines=999
+
+  " send ACK for open.
+  if exists('g:minimap_ack')
+    let expr = printf(':call minimap#_ack_open("%s")<CR>', v:servername)
+    call remote_send(g:minimap_ack, expr)
+    if !has('gui_macvim')
+      call remote_foreground(g:minimap_ack)
+    endif
+    unlet g:minimap_ack
+  endif
+endfunction
+
+function! minimap#_set_small_font()
+  if has('gui_macvim')
+    set noantialias
+    set guifont=Osaka-Mono:h3
+  elseif has('gui_win32')
+    set guifont=MS_Gothic:h3:cSHIFTJIS
+  elseif has('gui_gtk2')
+    set guifont=Monospace\ 3
+  else
+    " TODO: for other platforms.
+  endif
+endfunction
+
+function! minimap#_get_current_path()
+  return substitute(expand('%:p'), '\\', '/', 'g')
+endfunction
+
+let s:cached_sync_data = ''
+
+function! minimap#_sync_data()
+  return s:cached_sync_data
+endfunction
+
+function! minimap#_remote_pull_sync(id)
+  let s:cached_sync_data = string(minimap#_capture())
+  let keys = printf(':call minimap#_pull_sync("%s")<CR>', v:servername)
+  call remote_send(a:id, keys)
+endfunction
+
+function! minimap#_pull_sync(id)
+  "echo printf('minimap: update required by %s', a:id)
+  let data = eval(remote_expr(a:id, 'minimap#_sync_data()'))
+  if len(data)
+    call minimap#_apply(data)
+  endif
+endfunction
+
+function! minimap#_on_recv(data)
+  call minimap#_apply(eval(a:data))
+endfunction
+
+function! minimap#_apply(data)
+  let path = a:data['path']
+  if len(path) == 0
+    return
+  endif
+  if path !=# minimap#_get_current_path()
+    execute 'view! ' . path
+  endif
+  if path ==# minimap#_get_current_path()
+    call minimap#_set_view_range(a:data['line'], a:data['col'],
+          \ a:data['start'], a:data['end'])
+  endif
+endfunction
+
+function! minimap#_set_view_range(line, col, start, end)
+  " ensure to show view range.
+  if a:start < line('w0')
+    silent execute printf('normal! %dGzt', a:start)
+  endif
+  if a:end > line('w$')
+    silent execute printf('normal! %dGzb', a:end)
+  endif
+  " mark view range.
+  let p1 = printf('\%%>%dl\%%<%dl', a:start - 1, a:line)
+  let p2 = printf('\%%>%dl\%%<%dl', a:line, a:end + 1)
+  silent execute printf('match Search /\(%s\|%s\).*/', p1, p2)
+  " move cursor
+  call cursor(a:line, a:col)
+  "redraw
+endfunction
+
+function! minimap#_set_autosync()
+  let s:minimap_mode = 1
+  augroup minimap_auto
+    autocmd!
+    autocmd CursorMoved * call minimap#_lazysync()
+    autocmd CursorMovedI * call minimap#_lazysync()
+  augroup END
+endfunction
+
+function! minimap#_unset_autosync()
+  let s:minimap_mode = 0
+  augroup minimap_auto
+    autocmd!
+  augroup END
+endfunction
+
+function! minimap#_send_and_enter_minimap_mode(id)
+  "call minimap#_send(a:id)
+  call minimap#_remote_pull_sync(a:id)
+  if s:minimap_mode == 0
+    call minimap#_enter_minimap_mode()
+  endif
+endfunction
+
+function! minimap#_sync()
+  let id = s:minimap_id
+  if minimap#_is_open(id) == 0
+    call minimap#_open(id, v:servername)
+  else
+    call minimap#_send_and_enter_minimap_mode(id)
+  endif
+endfunction
+
+let s:lazysync_count = get(s:, 'lazysync_count', 0)
+
+function! minimap#_lazysync()
+  let s:lazysync_count += 1
+  call feedkeys("\<Plug>(lazysync-do)", 'm')
+endfunction
+
+function! minimap#_lazysync_do()
+  if s:lazysync_count > 0
+    let s:lazysync_count -= 1
+    if s:lazysync_count == 0
+      call minimap#_sync()
+    endif
+  endif
+  return ''
+endfunction
+
+function! minimap#_ack_open(id)
+  if has('gui_macvim')
+    call foreground()
+  endif
+  call minimap#_send_and_enter_minimap_mode(a:id)
+endfunction
+
+function! minimap#_delete_command(cmd)
+  if exists(':' . a:cmd)
+    execute 'delcommand ' . a:cmd
+  endif
+endfunction
+
+function! minimap#_enter_minimap_mode()
+  call minimap#_set_autosync()
+  call minimap#_delete_command('MinimapSync')
+  command! MinimapStop call minimap#_leave_minimap_mode()
+endfunction
+
+function! minimap#_leave_minimap_mode()
+  call minimap#_unset_autosync()
+  call minimap#_delete_command('MinimapStop')
+  command! MinimapSync call minimap#_sync()
+endfunction
+
+function! minimap#init()
+  if v:servername =~? s:minimap_id
+    call minimap#_on_open()
+  else
+    command! MinimapSync call minimap#_sync()
+    nnoremap <silent> <Plug>(lazysync-do) :call minimap#_lazysync_do()<CR>
+    inoremap <silent> <Plug>(lazysync-do) <C-R>=minimap#_lazysync_do()<CR>
+  endif
+endfunction

vim/bundle/minimap-vim/plugin/minimap_loader.vim

+" vim:set ts=8 sts=2 sw=2 tw=0 et nowrap:
+"
+" minimap_loader.vim - Loader of minimap plugin for Vim.
+"
+" License: THE VIM LICENSE
+"
+" Copyright:
+"   - (C) 2012 MURAOKA Taro (koron.kaoriya@gmail.com)
+
+scriptencoding utf-8
+
+augroup minimap_loader
+  autocmd!
+  autocmd VimEnter * call minimap#init()
+augroup END

vim/syntax/catena.vim

+" Vim syntax file
+
+if exists("b:current_syntax")
+  finish
+endif
+
+
+"""" Syntax rules """""""""""""""""""""""""""""""""""""""""
+syn match   catenaWord        "[^ \t\n\[\]]\+"
+syn match   catenaDefnName    "\<\S\+\ze\s*:="
+
+syn match   catenaNumber      "\d\+\%(\.\d\+\)\?"
+
+let s:builtinWords =
+\  ["copy", "swap", "drop", "wrap", "unwrap", "clean", "apply", "bind",
+\   "partial-results", "pop", "push", "concat", "choose", "dip",
+\   '+', '-', '\*', "/", "="]
+
+exe "syn match catenaBuiltinWord '\\%(" . join(s:builtinWords, '\|')
+\                                       . '\)\%(^\|$\|[\[\] \t;]\)\@=' . "'"
+
+syn match   catenaDefinition  "\s\zs:=\ze\s"
+syn match   catenaSeparator   ";"
+
+syn region  catenaBraceBlock          matchgroup=catenaBraces  transparent
+\           start="\["  end="\]"      contains=TOP
+
+syn match   catenaLineComment "#.*"
+syn keyword catenaCommentTodo TODO XXX FIXME
+\           contained containedin=catenaLineComment
+
+
+
+"""" Highlight links """"""""""""""""""""""""""""""""""""""
+hi def link catenaBraces              Structure
+hi def link catenaSeparator           Operator
+hi def link catenaDefinition          Operator
+
+hi def link catenaDefnName            Function
+hi def link catenaWord                Identifier
+hi def link catenaBuiltinWord         Statement
+
+hi def link catenaLineComment         Comment
+hi def link catenaCommentTodo         Todo
+
+hi def link catenaNumber              Number
+
+
+let b:current_syntax = "catena"

vim/syntax/lecnote-sub/linalg.vim

-" Vim syntax file
-" Language:     Linear algebra lecture notes
-" Maintainer:   Jonas Höglund <firefly@firefly.nu>
-" Last Change:  2012-09-16
-
-
-"""" Other general-purpose formatting """""""""""""""""""""""""""""""
-"syn match   lectureMathMode        ".*"  contained
-"\           contains=@lectureMathMode
-
-"syn region  lectureMathMode        matchgroup=Conceal concealends oneline
-"\           start="\$" end="\$"    contains=@lectureMathMode
-
-"syn cluster lectureMathMode        contains=@lectureMathOperator
-"syn cluster lectureMathOperator
-"\           contains=lectureMathMacroOperator,lectureMathMatrixTranspose
-
-syn match   lectureMathMatrixTranspose "\^T" contained conceal cchar=ᵀ
-
-"syn match   lectureMathVector      "_[A-Za-z0]"
-"\           contains=lectureMathVectorSubsts contained
-
-"syn match   lectureMathMacroOperator  "<=\+>\|<=\+\|=\+>"  contains=lectureMathArrowPart
-"syn match   lectureMathMacroOperator  "<-\+>\|<-\+\|-\+>"  contains=lectureMathArrowPart
-
-"syn match   lectureMathArrowPart   "-"  contained conceal cchar=―
-"syn match   lectureMathArrowPart   "="  contained conceal cchar=═
-"syn match   lectureMathArrowPart   ">"  contained conceal cchar=❭
-"syn match   lectureMathArrowPart   "<"  contained conceal cchar=❬
-
-"syn match   lectureHorizontalBrace   "`-\+ [-+*/^A-Za-z0-9.]\+ -\+´"
-"syn match   lectureHorizontalBrace   "`- [-+*/^A-Za-z0-9.] -´"
-
-syn match   lectureHorizontalBrace   "`-"
-\           contains=lectureHoriontalBracePart
-syn match   lectureHorizontalBracePart  "`"  contained conceal cchar=⌎
-syn match   lectureHorizontalBracePart  "´"  contained conceal cchar=⌏
-syn match   lectureHorizontalBracePart  "-"  contained conceal cchar=―
-
-
-"""" Matrices """""""""""""""""""""""""""""""""""""""""""""""""""""""
-syn match   lectureParenTopLeft    "/"  contained conceal cchar=⎛"⎡
-syn match   lectureParenTopRight   "\\" contained conceal cchar=⎞"⎤
-syn match   lectureParenBtmLeft    "\\" contained conceal cchar=⎝"⎣
-syn match   lectureParenBtmRight   "/"  contained conceal cchar=⎠"⎦
-
-syn match   lectureParenBar        "|"  contained conceal cchar=⎪
-syn match   lectureParenEdgeLeft   "\%(| \+[-().a-z0-9]\+ [-() .a-z0-9]*\)\@<!|"
-\           contained conceal cchar=⎜
-syn match   lectureParenEdgeRight  "\%(| \+[-().a-z0-9]\+ [-() .a-z0-9]*\)\@!|"
-\           contained conceal cchar=⎟
-
-syn match   lectureParenTop        "/ [-+*/() .a-z0-9]\+ \%(| \+[-+*/() .a-z0-9]\+ \+\)*\\"
-\           contains=lectureParenTopLeft,lectureParenTopRight,lectureParenBar
-
-"syn match   lectureParenMiddle    "| [-+*/() .a-z0-9]\+ \%(| \+[-+*/().a-z0-9]\+ \+\)*|"
-syn match   lectureParenMiddle     "\%(|\%( \+[-().a-z0-9]\+\)\+ \+\)\+|"
-\           contains=lectureParenEdgeLeft,lectureParenEdgeRight,lectureParenBar
-
-syn match   lectureParenBtm        "\\ [-+*/() .a-z0-9]\+ \%(| \+[-+*/() .a-z0-9]\+ \+\)*/"
-\           contains=lectureParenBtmLeft,lectureParenBtmRight,lectureParenBar
-
-
-"""" Equation systems """""""""""""""""""""""""""""""""""""""""""""""
-syn match  lectureEqSysTopChar    "/"  contained conceal cchar=⎧
-syn match  lectureEqSysBtmChar    "\\" contained conceal cchar=⎩
-syn match  lectureEqSysMiddleChar "{"  contained conceal cchar=⎨
-syn match  lectureEqSysBarChar    "|"  contained conceal cchar=⎪
-
-syn match  lectureEqSysTop        "/ \+\%([-+*/() a-z0-9]\+ = \+[-a-z0-9]\+\|--\)"
-\          contains=lectureEqSysTopChar
-syn match  lectureEqSysBtm        "\\ \+\%([-+*/() a-z0-9]\+ = \+[-a-z0-9]\+\|--\)"
-\          contains=lectureEqSysBtmChar
-syn match  lectureEqSysMiddle     "{ \+\%([-+*/() a-z0-9]\+ = \+[-a-z0-9]\+\|--\)"
-\          contains=lectureEqSysMiddleChar
-syn match  lectureEqSysBar        "| \+\%([-+*/() a-z0-9]\+ = \+[-a-z0-9]\+\|--\)"
-\          contains=lectureEqSysBarChar
-
-
-"""" Highlighting """""""""""""""""""""""""""""""""""""""""""""""""""
-"hi           markdownHeading           cterm=bold
-"hi           markdownItalic            cterm=italic
-"hi           markdownBold              cterm=bold
-"hi           lectureListMarker         cterm=bold    ctermfg=yellow
-
-"hi def link  markdownHeadingRule       PreProc
-"hi def link  lectureUnderline          Underlined
-"hi def link  lectureListMarker         Character
-"hi def link  lectureProperty           Statement
-
-"hi def link  lectureMathMode           Identifier
-"hi def link  lectureMathMacroOperator  Operator
-

vim/syntax/lecnote-sub/logic.vim

-
-"""" Logic expressions """"""""""""""""""""""""""""""""""""""""""""""
-" Operators
-syn match  logicAnd          "\*"   contained conceal cchar=∧
-syn match  logicOr           "+"    contained conceal cchar=∨
-syn match  logicNot          "\~"   contained conceal cchar=¬
-syn match  logicImplies      "->"   contained contains=logicImpliesPart
-syn match  logicImpliesPart  "-"    contained conceal cchar=─
-syn match  logicImpliesPart  ">"    contained conceal cchar=›"⦒>⋗
-"syn match  logicImplies      "->"   contained conceal cchar=→
-syn match  logicEquivalent   "<->"  contained conceal cchar=↔
-"syn match  logicTurnstile    "|-"   contained conceal cchar=⊢
-"syn match  logicDblTurnstile "|="   contained conceal cchar=⊨
-syn match  logicTurnstile    "|[-=]" contained contains=logicTurnstilePart
-syn match  logicTurnstilePart "|"   contained conceal cchar= 
-syn match  logicTurnstilePart "-"   contained conceal cchar=⊢
-syn match  logicTurnstilePart "="   contained conceal cchar=⊨
-"syn match  logicBottom       "_|_"  contained conceal cchar=⊥
-syn match  logicBottom       "_|_"  contained contains=logicBottomPart
-syn match  logicBottomPart   "_"    contained conceal cchar= 
-syn match  logicBottomPart   "|"    contained conceal cchar=⊥
-
-" Subscripts (special, for logic)
-syn match  logicSubscript  "[ie]\@<=1"  contained conceal cchar=₁
-syn match  logicSubscript  "[ie]\@<=2"  contained conceal cchar=₂
-
-" Subscripts (digits)
-syn match  logicSubscript  "_0"   contained conceal cchar=₀
-syn match  logicSubscript  "_1"   contained conceal cchar=₁
-syn match  logicSubscript  "_2"   contained conceal cchar=₂
-syn match  logicSubscript  "_3"   contained conceal cchar=₃
-syn match  logicSubscript  "_4"   contained conceal cchar=₄
-syn match  logicSubscript  "_5"   contained conceal cchar=₅
-syn match  logicSubscript  "_6"   contained conceal cchar=₆
-syn match  logicSubscript  "_7"   contained conceal cchar=₇
-syn match  logicSubscript  "_8"   contained conceal cchar=₈
-syn match  logicSubscript  "_9"   contained conceal cchar=₉
-
-" Subscripts (characters)
-syn match  logicSubscript  "_a"   contained conceal cchar=ₐ
-syn match  logicSubscript  "_e"   contained conceal cchar=ₑ
-syn match  logicSubscript  "_o"   contained conceal cchar=ₒ
-syn match  logicSubscript  "_x"   contained conceal cchar=ₓ
-syn match  logicSubscript  "_h"   contained conceal cchar=ₕ
-syn match  logicSubscript  "_k"   contained conceal cchar=ₖ
-syn match  logicSubscript  "_l"   contained conceal cchar=ₗ
-syn match  logicSubscript  "_m"   contained conceal cchar=ₘ
-syn match  logicSubscript  "_n"   contained conceal cchar=ₙ
-syn match  logicSubscript  "_p"   contained conceal cchar=ₚ
-syn match  logicSubscript  "_s"   contained conceal cchar=ₛ
-syn match  logicSubscript  "_t"   contained conceal cchar=ₜ
-
-" Cluster
-syn cluster logicExpression
-\ contains=logicAnd,logicOr,logicNot,logicImplies,logicEquivalent,logicTurnstile,logicBottom,logicSubscript
-
-" a logic expression may not contain two adjacent whitespace characters
-"syn match  logicExpressionFiller "\%(\S\|\s\s\@!\)\+"  contained contains=@logicExpression
-syn match  logicExpressionFiller ".*"  contained contains=@logicExpression,logicKeyword,logicDeductionNumber
-
-" Inline expression syntax
-syn region  logicInlineExpression  concealends  matchgroup=Conceal  oneline
-\           start="\$" end="\$"    contains=@logicExpression
-
-
-"""" Logic natural deduction proofs
-syn match  logicDeductionSeparator  "^\s*-\+$" contains=logicDeductionSeparatorChar
-syn match  logicDeductionSeparatorChar "-"  contained conceal cchar=─
-
-syn match  logicDeductionBoxLine    "^\s*\(|*\)\([|'.+]\)-\+\2\1"
-\          contains=logicDeductionBoxMarkerChar,logicDeductionBoxMarkerVert
-syn region logicDeductionBoxLine   start="|" skip="|[-=]" end="|"  oneline
-\          contains=logicKeyword,@logicExpression,logicDeductionBoxMarkerVert,logicDeductionNumber
-
-syn match  logicDeductionBoxMarkerChar "-"       contained conceal cchar=─
-syn match  logicDeductionBoxMarkerVert "|"       contained conceal cchar=│
-
-syn match  logicDeductionBoxMarkerChar "'-\@="   contained conceal cchar=└
-syn match  logicDeductionBoxMarkerChar "-\@<='"  contained conceal cchar=┘
-syn match  logicDeductionBoxMarkerChar "\.-\@="  contained conceal cchar=┌
-syn match  logicDeductionBoxMarkerChar "-\@<=\." contained conceal cchar=┐
-syn match  logicDeductionBoxMarkerChar "+-\@="   contained conceal cchar=├
-syn match  logicDeductionBoxMarkerChar "-\@<=+"  contained conceal cchar=┤
-
-"syn match  logicDeductionNumber "^\s*\d\+\s*" nextgroup=logicDeductionBoxLine,logicExpressionFiller
-syn match  logicDeductionLeadingNumber "^\s*\d\+\s*"
-\          nextgroup=logicDeductionBoxLine,logicExpressionFiller
-
-syn match  logicDeductionNumber        "\<\d\+\>"
-
-syn keyword logicKeyword  assumption premise
-
-
-"""" Highlighting """""""""""""""""""""""""""""""""""""""""""""""""""
-hi link     logicDeductionLeadingNumber logicDeductionNumber
-"hi link logicHeading markdownHeading
-hi def link logicInlineExpression      Identifier
-hi def link logicKeyword               Statement
-hi def link logicDeductionNumber       Number

vim/syntax/note-sub/linalg.vim

+" Vim syntax file
+" Language:     Linear algebra lecture notes
+" Maintainer:   Jonas Höglund <firefly@firefly.nu>
+" Last Change:  2012-09-16
+
+
+"""" Other general-purpose formatting """""""""""""""""""""""""""""""
+"syn cluster lectureMathMode        contains=@lectureMathOperator
+"syn cluster lectureMathOperator
+"\           contains=lectureMathMacroOperator,lectureMathMatrixTranspose
+
+syn match   lectureMathMatrixTranspose "\^T" contained conceal cchar=ᵀ
+
+"syn match   lectureMathVector      "_[A-Za-z0]"
+"\           contains=lectureMathVectorSubsts contained
+
+"syn match   lectureMathMacroOperator  "<=\+>\|<=\+\|=\+>"  contains=lectureMathArrowPart
+"syn match   lectureMathMacroOperator  "<-\+>\|<-\+\|-\+>"  contains=lectureMathArrowPart
+
+"syn match   lectureHorizontalBrace   "`-\+ [-+*/^A-Za-z0-9.]\+ -\+´"
+"syn match   lectureHorizontalBrace   "`- [-+*/^A-Za-z0-9.] -´"
+
+syn match   lectureHorizontalBrace   "`-"
+\           contains=lectureHoriontalBracePart
+syn match   lectureHorizontalBracePart  "`"  contained conceal cchar=⌎
+syn match   lectureHorizontalBracePart  "´"  contained conceal cchar=⌏
+syn match   lectureHorizontalBracePart  "-"  contained conceal cchar=―
+
+
+"""" Matrices """""""""""""""""""""""""""""""""""""""""""""""""""""""
+syn match   lectureParenTopLeft    "/"  contained conceal cchar=⎛"⎡
+syn match   lectureParenTopRight   "\\" contained conceal cchar=⎞"⎤
+syn match   lectureParenBtmLeft    "\\" contained conceal cchar=⎝"⎣
+syn match   lectureParenBtmRight   "/"  contained conceal cchar=⎠"⎦
+
+syn match   lectureParenBar        "|"  contained conceal cchar=⎪
+syn match   lectureParenEdgeLeft   "\%(| \+[-().a-z0-9]\+ [-() .a-z0-9]*\)\@<!|"
+\           contained conceal cchar=⎜
+syn match   lectureParenEdgeRight  "\%(| \+[-().a-z0-9]\+ [-() .a-z0-9]*\)\@!|"
+\           contained conceal cchar=⎟
+
+syn match   lectureParenTop        "/ [-+*/() .a-z0-9]\+ \%(| \+[-+*/() .a-z0-9]\+ \+\)*\\"
+\           contains=lectureParenTopLeft,lectureParenTopRight,lectureParenBar
+
+"syn match   lectureParenMiddle    "| [-+*/() .a-z0-9]\+ \%(| \+[-+*/().a-z0-9]\+ \+\)*|"
+syn match   lectureParenMiddle     "\%(|\%( \+[-().a-z0-9]\+\)\+ \+\)\+|"
+\           contains=lectureParenEdgeLeft,lectureParenEdgeRight,lectureParenBar
+
+syn match   lectureParenBtm        "\\ [-+*/() .a-z0-9]\+ \%(| \+[-+*/() .a-z0-9]\+ \+\)*/"
+\           contains=lectureParenBtmLeft,lectureParenBtmRight,lectureParenBar
+
+
+"""" Equation systems """""""""""""""""""""""""""""""""""""""""""""""
+syn match  lectureEqSysTopChar    "/"  contained conceal cchar=⎧
+syn match  lectureEqSysBtmChar    "\\" contained conceal cchar=⎩
+syn match  lectureEqSysMiddleChar "{"  contained conceal cchar=⎨
+syn match  lectureEqSysBarChar    "|"  contained conceal cchar=⎪
+
+syn match  lectureEqSysTop        "/ \+\%([-+*/() a-z0-9]\+ = \+[-a-z0-9]\+\|--\)"
+\          contains=lectureEqSysTopChar
+syn match  lectureEqSysBtm        "\\ \+\%([-+*/() a-z0-9]\+ = \+[-a-z0-9]\+\|--\)"
+\          contains=lectureEqSysBtmChar
+syn match  lectureEqSysMiddle     "{ \+\%([-+*/() a-z0-9]\+ = \+[-a-z0-9]\+\|--\)"
+\          contains=lectureEqSysMiddleChar
+syn match  lectureEqSysBar        "| \+\%([-+*/() a-z0-9]\+ = \+[-a-z0-9]\+\|--\)"
+\          contains=lectureEqSysBarChar

vim/syntax/note-sub/logic.vim

+
+"""" Logic expressions """"""""""""""""""""""""""""""""""""""""""""""
+" Operators
+syn match  logicAnd          "\*"   contained conceal cchar=∧
+syn match  logicOr           "+"    contained conceal cchar=∨
+syn match  logicNot          "\~"   contained conceal cchar=¬
+syn match  logicImplies      "->"   contained contains=logicImpliesPart
+syn match  logicImpliesPart  "-"    contained conceal cchar=─
+syn match  logicImpliesPart  ">"    contained conceal cchar=›"⦒>⋗
+"syn match  logicImplies      "->"   contained conceal cchar=→
+syn match  logicEquivalent   "<->"  contained conceal cchar=↔
+"syn match  logicTurnstile    "|-"   contained conceal cchar=⊢
+"syn match  logicDblTurnstile "|="   contained conceal cchar=⊨
+syn match  logicTurnstile    "|[-=]" contained contains=logicTurnstilePart
+syn match  logicTurnstilePart "|"   contained conceal cchar= 
+syn match  logicTurnstilePart "-"   contained conceal cchar=⊢
+syn match  logicTurnstilePart "="   contained conceal cchar=⊨
+"syn match  logicBottom       "_|_"  contained conceal cchar=⊥
+syn match  logicBottom       "_|_"  contained contains=logicBottomPart
+syn match  logicBottomPart   "_"    contained conceal cchar= 
+syn match  logicBottomPart   "|"    contained conceal cchar=⊥
+
+" Subscripts (special, for logic)
+syn match  logicSubscript  "[ie]\@<=1"  contained conceal cchar=₁
+syn match  logicSubscript  "[ie]\@<=2"  contained conceal cchar=₂
+
+" Subscripts (digits)
+syn match  logicSubscript  "_0"   contained conceal cchar=₀
+syn match  logicSubscript  "_1"   contained conceal cchar=₁
+syn match  logicSubscript  "_2"   contained conceal cchar=₂
+syn match  logicSubscript  "_3"   contained conceal cchar=₃
+syn match  logicSubscript  "_4"   contained conceal cchar=₄
+syn match  logicSubscript  "_5"   contained conceal cchar=₅
+syn match  logicSubscript  "_6"   contained conceal cchar=₆
+syn match  logicSubscript  "_7"   contained conceal cchar=₇
+syn match  logicSubscript  "_8"   contained conceal cchar=₈
+syn match  logicSubscript  "_9"   contained conceal cchar=₉
+
+" Subscripts (characters)
+syn match  logicSubscript  "_a"   contained conceal cchar=ₐ
+syn match  logicSubscript  "_e"   contained conceal cchar=ₑ
+syn match  logicSubscript  "_o"   contained conceal cchar=ₒ
+syn match  logicSubscript  "_x"   contained conceal cchar=ₓ
+syn match  logicSubscript  "_h"   contained conceal cchar=ₕ
+syn match  logicSubscript  "_k"   contained conceal cchar=ₖ
+syn match  logicSubscript  "_l"   contained conceal cchar=ₗ
+syn match  logicSubscript  "_m"   contained conceal cchar=ₘ
+syn match  logicSubscript  "_n"   contained conceal cchar=ₙ
+syn match  logicSubscript  "_p"   contained conceal cchar=ₚ
+syn match  logicSubscript  "_s"   contained conceal cchar=ₛ
+syn match  logicSubscript  "_t"   contained conceal cchar=ₜ
+
+" Cluster
+syn cluster logicExpression
+\ contains=logicAnd,logicOr,logicNot,logicImplies,logicEquivalent,logicTurnstile,logicBottom,logicSubscript
+
+" a logic expression may not contain two adjacent whitespace characters
+"syn match  logicExpressionFiller "\%(\S\|\s\s\@!\)\+"  contained contains=@logicExpression
+syn match  logicExpressionFiller ".*"  contained contains=@logicExpression,logicKeyword,logicDeductionNumber
+
+" Inline expression syntax
+syn region  logicInlineExpression  concealends  matchgroup=Conceal  oneline
+\           start="\$" end="\$"    contains=@logicExpression
+
+
+"""" Logic natural deduction proofs
+syn match  logicDeductionSeparator  "^\s*-\+$" contains=logicDeductionSeparatorChar
+syn match  logicDeductionSeparatorChar "-"  contained conceal cchar=─
+
+syn match  logicDeductionBoxLine    "^\s*\(|*\)\([|'.+]\)-\+\2\1"
+\          contains=logicDeductionBoxMarkerChar,logicDeductionBoxMarkerVert
+syn region logicDeductionBoxLine   start="|" skip="|[-=]" end="|"  oneline
+\          contains=logicKeyword,@logicExpression,logicDeductionBoxMarkerVert,logicDeductionNumber
+
+syn match  logicDeductionBoxMarkerChar "-"       contained conceal cchar=─
+syn match  logicDeductionBoxMarkerVert "|"       contained conceal cchar=│
+
+syn match  logicDeductionBoxMarkerChar "'-\@="   contained conceal cchar=└
+syn match  logicDeductionBoxMarkerChar "-\@<='"  contained conceal cchar=┘
+syn match  logicDeductionBoxMarkerChar "\.-\@="  contained conceal cchar=┌
+syn match  logicDeductionBoxMarkerChar "-\@<=\." contained conceal cchar=┐
+syn match  logicDeductionBoxMarkerChar "+-\@="   contained conceal cchar=├
+syn match  logicDeductionBoxMarkerChar "-\@<=+"  contained conceal cchar=┤
+
+"syn match  logicDeductionNumber "^\s*\d\+\s*" nextgroup=logicDeductionBoxLine,logicExpressionFiller
+syn match  logicDeductionLeadingNumber "^\s*\d\+\s*"
+\          nextgroup=logicDeductionBoxLine,logicExpressionFiller
+
+syn match  logicDeductionNumber        "\<\d\+\>"
+
+syn keyword logicKeyword  assumption premise
+
+
+"""" Highlighting """""""""""""""""""""""""""""""""""""""""""""""""""
+hi link     logicDeductionLeadingNumber logicDeductionNumber
+"hi link logicHeading markdownHeading
+hi def link logicInlineExpression      Identifier
+hi def link logicKeyword               Statement
+hi def link logicDeductionNumber       Number

vim/syntax/note-sub/todo.vim

+"""" TODOs and other checklists """""""""""""""""""""""""""""""""""""
+syn match   todoChecked     "\[x\]"
+syn match   todoUnchecked   "\[ \]"         nextgroup=todoUncheckedTrail
+syn match   todoHalfway     "\[[-.1234]\]"  nextgroup=todoHalfwayTrail
+
+syn match   todoUncheckedTrail  ".*$"       contained contains=TOP
+syn match   todoHalfwayTrail    ".*$"       contained contains=TOP
+
+
+"""" Highlighting """""""""""""""""""""""""""""""""""""""""""""""""""
+hi def link todoChecked         Special
+hi def link todoUnchecked       Todo
+hi def link todoUncheckedTrail  Constant
+hi def link todoHalfwayTrail    Function

vim/syntax/note.vim

 
 "syn match   noteEnDash   "--"   conceal cchar=-
 
+syn match   todoTodo            "\<TODO\>"
+
 """ Block """""""""""""""""""""""""""""""""""""""
 syn region  noteQuoteBlock      matchgroup=Ignore  oneline
 \           start="^>" end="$"                     contains=TOP
 
 syn match   noteListMarker      "^\s*\zs\*\ze " conceal cchar=•
 \                               skipwhite nextgroup=noteDefnList
+syn match   noteListMarker      "^\s*\zs(\*)\ze " conceal cchar=⍟
+\                               skipwhite nextgroup=noteDefnList
 syn match   noteListMarker      "^\s*\zs+\ze "  conceal cchar=◦
 \                               skipwhite nextgroup=noteDefnList
 syn match   noteListMarker      "^\s*\zs-\ze "  conceal cchar=‒
 \                               skipwhite nextgroup=noteDefnList
 syn match   noteListMarker      "^\s*\zs\d\+\.\ze "
 
-syn match   noteDefnList        "^\s*\zs\w\+[):]\ze "
-syn match   noteDefnList        ".*[):]"        contained
+syn match   noteListMarker      "^\s*\zs\w\+)\ze "
+
+syn match   noteDefnList        "^\s*\zs\w\+:\ze "
+syn match   noteDefnList        ".*:"           contained contains=TOP
+
+
+"""" Mathmode things """"""""""""""""""""""""""""""""""""""""""""""""
+syn match   noteMathLatexFunc   "\\[:lower:]\+"
+syn match   noteMathLatexFunc   "\\in[:lower:]\@!"        contained conceal cchar=∈
+
+syn match   noteMathLatexFunc   "\\int[:lower:]\@!"       contained conceal cchar=∫
+syn match   noteMathLatexFunc   "\\sum[:lower:]\@!"       contained conceal cchar=∑
+syn match   noteMathLatexFunc   "\\union[:lower:]\@!"     contained conceal cchar=⋃
+
+syn match   noteMathLatexFunc   "\\CC[:lower:]\@!"        contained conceal cchar=ℂ
+syn match   noteMathLatexFunc   "\\NN[:lower:]\@!"        contained conceal cchar=ℕ
+syn match   noteMathLatexFunc   "\\RR[:lower:]\@!"        contained conceal cchar=ℝ
+syn match   noteMathLatexFunc   "\\QQ[:lower:]\@!"        contained conceal cchar=ℚ
+syn match   noteMathLatexFunc   "\\ZZ[:lower:]\@!"        contained conceal cchar=ℤ
+
+syn cluster noteMathMode add=noteMathLatexFunc
 
 
 """" Highlight links """"""""""""""""""""""""""""""""""""""""""""""""
 hi     link noteMathBlock       noteMathMode
 hi     link noteDefnList        noteListMarker
-hi     link noteQuoteBlock      Special
 
+hi def link todoTodo            Todo
 hi def link noteHeading         Title
 hi def link noteListMarker      Function
+hi def link noteQuoteBlock      Special
+hi def link noteMathLatexFunc   Function
 hi def link noteMathMode        markdownCode
 
 hi          noteItalic          cterm=italic

vim/syntax/om.vim

+" FireFly's Om vim syntax file.
+
+" Check that a syntax file hasn't been loaded already.
+if exists("b:current_syntax")
+  finish
+endif
+
+syn sync minlines=100
+
+syn match   omOperator "\%(`.\|[^`{} \t\n]\)\+"
+
+syn match   omCommentInitiator "--"
+\           nextgroup=omCommentBlock  skipwhite
+
+syn keyword omCommentInitiator drop
+\           nextgroup=omCommentBlock  skipwhite
+
+syn region  omCommentBlock            contained
+\           start="{" end="}"         contains=omCommentBlock
+
+syn keyword omCommentTodo TODO XXX FIXME  contained containedin=omCommentBlock
+
+let s:builtinOperators =
+\  ["->expression", "->lexicon", "->literal", "->operator", "<-characters",
+\   "<-code` points", "<-elements", "<-forms", "<-pairs", "<-terms", "=",
+\   "characters->", "choose", "code` points->", "copy", "decode", "define",
+\   "dequote", "do", "drop", "elements->", "elements->operand",
+\   "elements->operator", "elements->separator", "encode", "environment",
+\   "evaluate", "expression", "expression<-", "fill", "find", "forms->",
+\   "inject", "lexicon", "lexicon<-", "literal<-", "normalize", "operand",
+\   "operand<-elements", "operator", "operator<-", "operator<-elements",
+\   "pairs->", "quote", "rearrange", "separator", "separator<-elements", "skip",
+\   "substitute", "swap", "system", "terms->" ]
+
+exe "syn match omBuiltinOperator '\\%(" . join(s:builtinOperators, '\|')
+\                                       . '\)\%(^\|$\|[`{} \t]\)\@=' . "'"
+
+syn region  omBraceBlock              matchgroup=omBraces  transparent
+\           start="{"  end="}"        contains=TOP
+
+hi     link omCommentInitiator  omBuiltinOperator
+
+hi def link omBraces            Structure
+hi def link omCommentBlock      Comment
+hi def link omCommentTodo       Todo
+
+"hi          omOperator          term=underline cterm=underline
+hi def link omOperator          Identifier
+hi def link omBuiltinOperator   Statement

vim/syntax/z80.vim

+syn case ignore
+
+set isk=a-z,A-Z,48-57,',.,_
+
+syn sync fromstart
+
+"Common Z80 Assembly instructions
+syn keyword z80Inst adc add and bit call ccf cp cpd cpdr cpi cpir cpl
+syn keyword z80Inst daa dec di djnz ei ex exx halt im in
+syn keyword z80Inst inc ind ini indr inir jp jr ld ldd lddr ldi ldir
+syn keyword z80Inst neg nop or otdr otir out outd outi push pop
+syn keyword z80Inst res ret reti retn rl rla rlc rlca rld
+syn keyword z80Inst rr rra rrc rrca rrd rst sbc scf set sl1 sla slia sll sra
+syn keyword z80Inst srl sub xor
+
+" sjasmplus inst
+syn keyword z80Inst sli exa 
+
+"Grab the condition too
+syn match z80Inst "\s\+jp\s\+n\=[covz]\>" "Match Z C O V NZ NC NO NV
+syn match z80Inst "\s\+jp\s\+p[elo]\=\>" "Match P PE PO PL
+syn match z80Inst "\s\+jp\s\+mi\=\>" "Match M MI
+syn match z80Inst "\s\+jp\s\+eq\>" "Match EQ
+syn match z80Inst "\s\+jp\s\+[gn]e\>" "Match NE GE
+syn match z80Inst "\s\+jp\s\+lt\>" "Match LT
+syn match z80Inst "\s\+jp\s\+sn\=f\>" "Match SF SNF
+
+syn match z80Inst "\s\+jr\s\+n\=[zc]\>" "Match Z C NZ NC
+syn match z80Inst "\s\+jr\s\+eq\>" "Match EQ
+syn match z80Inst "\s\+jr\s\+[gn]e\>" "Match NE GE
+syn match z80Inst "\s\+jr\s\+lt\>" "Match LT
+
+syn match z80Inst "\s\+call\s\+n\=[covz]\>" "Match Z C O V NZ NC NO NV
+syn match z80Inst "\s\+call\s\+p[elo]\=\>" "Match P PE PO PL
+syn match z80Inst "\s\+call\s\+mi\=\>" "Match M MI
+syn match z80Inst "\s\+call\s\+eq\>" "Match EQ
+syn match z80Inst "\s\+call\s\+[gn]e\>" "Match NE GE
+syn match z80Inst "\s\+call\s\+lt\>" "Match LT
+syn match z80Inst "\s\+call\s\+sn\=f\>" "Match SF SNF
+
+syn match z80Inst "\s\+ret\s\+n\=[covz]\>" "Match Z C O V NZ NC NO NV
+syn match z80Inst "\s\+ret\s\+p[elo]\=\>" "Match P PE PO PL
+syn match z80Inst "\s\+ret\s\+mi\=\>" "Match M MI
+syn match z80Inst "\s\+ret\s\+eq\>" "Match EQ
+syn match z80Inst "\s\+ret\s\+[gn]e\>" "Match NE GE
+syn match z80Inst "\s\+ret\s\+lt\>" "Match LT
+syn match z80Inst "\s\+ret\s\+sn\=f\>" "Match SF SNF
+
+" Registers
+syn keyword z80Reg af af' bc de hl ix ixh ixl iy iyh iyl
+syn keyword z80Reg sp a b c d e f h i l r
+"sjasmplus
+syn keyword z80Reg lx xl ly yl xh hx yh hy
+
+" Directives
+syn keyword z80PreProc .emptyfill .export .outname .asc .background .bank
+syn keyword z80PreProc .byt .rombanksize .db .dbcos .dbrnd .dbsin .define .def
+syn keyword z80PreProc .ds .dsb .dstruct .dsw .dw .dwcos .dwrnd .dwsin .else
+syn keyword z80PreProc .ende .endif .endm .endme .endr .endro .ends .endst
+syn keyword z80PreProc .enum .equ .fail .fclose .fopen .fread .fsize .if .ifdef
+syn keyword z80PreProc .ifdefm .ifeq .ifexists .ifgr .ifgreq .ifle .ifleeq .ifndef
+syn keyword z80PreProc .ifndefm .ifneq .incbin .incdir .include .input .macro
+syn keyword z80PreProc .memorymap .org .orga .printt .printv .ramsection .redefine
+syn keyword z80PreProc .redef .repeat .rept .rombankmap .rombanks .seed .section
+syn keyword z80PreProc .slot .struct .unbackground .undefine .undef .word
+syn keyword z80PreProc .shift .sym .symbol
+
+syn keyword z80PreProc align data db ds dsb dsw dw fsize instanceof read skip slot swap
+syn keyword z80PreProc defaultslot slotsize bankstotal banksize banks free force
+syn keyword z80PreProc semifree size superfree
+
+
+" sjasmplus directives
+syn keyword z80PreProc DEVICE ABYTE ABYTEC ABYTEZ ALIGN ASSERT BINARY BLOCK BYTE
+syn keyword z80PreProc DB DC DD DEFARRAY DEPHASE DEFB DEFD DEFDEVICE DEFINE
+syn keyword z80PreProc DEFM DEFS DEFW DEVICE DISP DISPLAY DM DS DUP DW DWORD 
+syn keyword z80PreProc DZ EMPTYTRD ENCODING END ENDLUA ENDMOD ENDT ENT EQU
+syn keyword z80PreProc ENDMODULE EXPORT FIELD FPOS INCBIN INCHOB INCLUDE INCLUDELUA 
+syn keyword z80PreProc INCTRD INSERT LABELSLIST LUA MAP MEMORYMAP MODULE ORG
+syn keyword z80PreProc OUTPUT PAGE PHASE REPT SAVEBIN SAVEHOB SAVESNA SAVETRD SHELLEXEC 
+syn keyword z80PreProc SIZE SLOT TEXTAREA UNPHASE WORD IF IFN IFDEF IFNDEF ELSE ENDIF
+syn keyword z80PreProc MACRO ENDM D24 
+
+
+" Strings
+syn region z80String start=/"/ skip=/\\"/ end=/"/ oneline
+syn region z80String start=/'/ end=/'/ oneline
+
+" Labels
+syn match z80Lbl "[A-Z_.?][A-Z_.?0-9]*:\="
+syn region z80Lbl2 start="(" end=")" oneline contains=z80Number,z80Lbl,z80Lbl2,z80Other
+
+" Operators
+syn match z80Other "[~+\-*/%^&=!<>]"
+
+" Numbers
+syn match z80Number "\<\$\>"
+syn match z80Number "\<[01]\+b\>"
+syn match z80Number "\<\d\x*h\>"
+syn match z80Number "\<\d\+\>"
+syn match z80Number "\<%[01]\+\>"
+syn match z80Number "\$[0-9a-fA-F]\+"
+
+" Indirect register access
+syn region z80Reg start=/(ix/ end=/)/ keepend oneline contains=z80Lbl,z80Number,z80Reg,z80Other
+syn region z80Reg start=/(iy/ end=/)/ keepend oneline contains=z80Lbl,z80Number,z80Reg,z80Other
+syn match z80Reg "(b\=c)"
+syn match z80Reg "(de)"
+syn match z80Reg "(hl)"
+syn match z80Reg "(sp)"
+
+" Comments
+syn match z80Comment ";.*$"
+syn match z80Comment "^\*$"
+syn region z80Comment2 start="\<\.endasm\>" skip="\n" end="\<\.asm\>" keepend contains=z80Comment,z80Comment2 
+syn region z80Comment start="\/\*" end="\*\/"
+
+" Define the default highlighting.
+" For version 5.7 and earlier: only when not done already
+" For version 5.8 and later: only when an item doesn't have highlighting yet
+if version >= 508 || !exists("did_z80_syntax_inits")
+if version < 508
+let did_z80_syntax_inits = 1
+command -nargs=+ HiLink hi link <args>
+else
+command -nargs=+ HiLink hi def link <args>
+endif
+
+HiLink z80Reg Constant
+HiLink z80Lbl Identifier
+HiLink z80Lbl2 Identifier
+HiLink z80Comment Comment
+HiLink z80Comment2 Comment
+HiLink z80Inst Statement
+HiLink z80Include Include
+HiLink z80PreProc PreProc
+HiLink z80Number Number
+HiLink z80String String
+HiLink z80Other Normal
+
+delcommand HiLink
+endif
+
+let b:current_syntax = "z80"
 set history=500                 " Long ex-command & search history is nice.
 set cpoptions+=M                " Makes % not skip over \( and \)
 
-set tildeop
+set tildeop                     " Makes tilde an operator instead of a command.
 
 " Use persistent undo if available
 if version >= 703
 cnoremap <C-k> <Up>
 
 " Fast shortcut for opening files
-nnoremap <C-a> :e 
+nnoremap <C-e> :e 
 
 " Headerify current line
 nnoremap <Leader>== yypv$r=A==<Esc>Vk:center<CR>
 \ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<"
 \ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
 
+" 'Dual-head mode'--split the window vertically and scrollbind the rightern
+" buffer at exactly one screenful below the left one.
+map <Leader>v :set noscb<CR>:botright vsplit<CR><C-f>:set scb<CR><C-w>h:set scb<CR>
+
 
 """" Buffer management mappings """""""
 " Switch to last (alternate) buffer with <Leader><Leader>, and reload current
 syntax on                       " Use syntax highlighting
 
 " In case I end up in the GUI, make it behave more like shell vim.
-set go-=mT gcr+=a:blinkon0
+set go= gcr+=a:blinkon0
 
 
 " Add a few custom filetypes
 au BufRead,BufNewFile {*.selfml}             setf selfml
 au BufRead,BufNewFile {*.todo,todo}          setf todo
 au BufRead,BufNewFile {*.ijx}                setf j
+au BufRead,BufNewFile {*.om}                 setf om
 au BufRead            {*/xchatlogs/*.log}    setf irclog | set ro noma
 
 " Add custom filetype-dependent metadata
 "end
 
 "color Tomorrow-Night-Bright-ff
-let g:jellybeans_background_color_256="16"
+let g:jellybeans_background_color_256 = "16"
+let g:jellybeans_background_color     = "000"
 let g:jellybeans_overrides =
-\     { 'CursorLine'   : { '256ctermbg' : '233'  }
-\     , 'StatusLine'   : {
-\                          '256ctermfg' : '3'
-\                        , '256ctermbg' : '236'  }
-\     , 'StatusLineNC' : { '256ctermfg' : '242'
-\                        , '256ctermbg' : '234'  }
-\     , 'ColorColumn'  : { '256ctermbg' : '233'  }
+\     { 'CursorLine'   : { '256ctermbg' : '233', 'guibg': '090909' }
+\     , 'StatusLine'   : { '256ctermfg' : '3',   'guifg': 'C93',
+\                          '256ctermbg' : '236', 'guibg': '222'    }
+\     , 'StatusLineNC' : { '256ctermfg' : '242', 'guifg': '999',
+\                          '256ctermbg' : '234', 'guibg': '111'    }
+\     , 'ColorColumn'  : { '256ctermbg' : '233', 'guibg': '090909' }
 \     , 'LineNr'       : { '256ctermfg' : '238'  }
 \     , 'Folded'       : { '256ctermbg' : '234'  }
 \     , 'CursorLineNr' : { '256ctermfg' : '3'
 \                        , '256ctermbg' : '234'  }
 \     , 'Conceal'      : { '256ctermfg' : '14'
 \                        , '256ctermbg' : 'NONE' }
-\     , 'ModeMsg'      : { 'attr'       : 'bold'
-\                        , '256ctermfg' : '2'    }
+\     , 'ModeMsg'      : { 'attr'       : 'bold',
+\                          '256ctermfg' : '2',   'guifg': '9C3'    }
 \
 \     , 'Operator'     : { '256ctermfg' : '73'   }
 \     , 'markdownCode' : { '256ctermfg' : '175'  }
 # ~/.xinitrc
 #
 
-#(sleep 10 && dropboxd) &			# launch dropboxd as user.
-#(sleep 5 && xbindkeys) &            # xbindkeys (bind fn keys)
-#xcape                               # lets Ctrl act as Esc if not held.
-pulseaudio --start                  # mmm, pulseaudio
+#(sleep 10 && dropboxd) &          # launch dropboxd as user.
+#(sleep 5 && xbindkeys) &          # xbindkeys (bind fn keys)
+#xcape                             # lets Ctrl act as Esc if not held.
+pulseaudio --start                 # mmm, pulseaudio
 #(sleep 5 && xcape) &
 
 xbacklight = 0