# HG changeset patch
# User Tomas Zeman <tzeman@volny.cz>
# Date 1319441873 -7200
# Node ID c61439c91a8a39de527f150e110d64f0476c4887
# Parent  5b37cf0009bd6ca5481294f93a33fc66a27bf1af# Parent  090b5c8705765b1d3f70af26fbac603eb43730bd
branch merge (.ctags)

diff -r 090b5c870576 -r c61439c91a8a config/.ctags
--- a/config/.ctags	Wed Oct 12 12:39:47 2011 +0200
+++ b/config/.ctags	Mon Oct 24 09:37:53 2011 +0200
@@ -15,5 +15,6 @@
 --regex-scala=/^[ \t]*object[ \t]+([a-zA-Z0-9_]+)/\1/o,objects/
 --regex-scala=/^[ \t]*case object[ \t]+([a-zA-Z0-9_]+)/\1/o,objects/
 --regex-scala=/^[ \t]*private def[ \t]+([a-zA-Z0-9_]+)/\1/pd,defs/
+--regex-scala=/^[ \t]*protected def[ \t]+([a-zA-Z0-9_]+)/\1/pd,defs/
 --regex-scala=/^[ \t]*implicit def[ \t]+([a-zA-Z0-9_]+)/\1/id,implicit defs/
 
diff -r 090b5c870576 -r c61439c91a8a config/.hgrc
--- a/config/.hgrc	Wed Oct 12 12:39:47 2011 +0200
+++ b/config/.hgrc	Mon Oct 24 09:37:53 2011 +0200
@@ -6,6 +6,7 @@
 
 [ui]
 username = Tomas Zeman <tzeman@volny.cz>
+editor = hgeditor
 
 [diff]
 git = 1
diff -r 090b5c870576 -r c61439c91a8a scripts/hgeditor
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/hgeditor	Mon Oct 24 09:37:53 2011 +0200
@@ -0,0 +1,56 @@
+#!/bin/sh
+#
+# This is an example of using HGEDITOR to create of diff to review the
+# changes while commiting.
+
+# If you want to pass your favourite editor some other parameters
+# only for Mercurial, modify this:
+case "${EDITOR}" in
+    "")
+        EDITOR="vi"
+        ;;
+    emacs)
+        EDITOR="$EDITOR -nw"
+        ;;
+    gvim|vim)
+        EDITOR="$EDITOR -f -o"
+        ;;
+esac
+
+
+HGTMP=""
+cleanup_exit() {
+    rm -rf "$HGTMP"
+}
+
+# Remove temporary files even if we get interrupted
+trap "cleanup_exit" 0 # normal exit
+trap "exit 255" HUP INT QUIT ABRT TERM
+
+HGTMP=$(mktemp -d ${TMPDIR-/tmp}/hgeditor.XXXXXX)
+[ x$HGTMP != x -a -d $HGTMP ] || {
+  echo "Could not create temporary directory! Exiting." 1>&2
+  exit 1
+}
+
+(
+    grep '^HG: changed' "$1" | cut -b 13- | while read changed; do
+        "$HG" diff "$changed" >> "$HGTMP/diff"
+    done
+)
+
+cat "$1" > "$HGTMP/msg"
+
+MD5=$(which md5sum 2>/dev/null) || \
+    MD5=$(which md5 2>/dev/null)
+[ -x "${MD5}" ] && CHECKSUM=`${MD5} "$HGTMP/msg"`
+if [ -s "$HGTMP/diff" ]; then
+    $EDITOR "$HGTMP/msg" "$HGTMP/diff" || exit $?
+else
+    $EDITOR "$HGTMP/msg" || exit $?
+fi
+[ -x "${MD5}" ] && (echo "$CHECKSUM" | ${MD5} -c >/dev/null 2>&1 && exit 13)
+
+mv "$HGTMP/msg" "$1"
+
+exit $?