changeset 490:f064197f160d

Merge.
author edogawaconan <me@myconan.net>
date Fri, 08 Nov 2013 15:13:41 +0900
parents 6ef30abe29f9 (diff) 347e30690879 (current diff)
children c3c2353044ad
files rc/hgrc
diffstat 3 files changed, 15 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/bin/cek.rb	Fri Nov 01 17:22:24 2013 +0900
+++ b/bin/cek.rb	Fri Nov 08 15:13:41 2013 +0900
@@ -3,12 +3,12 @@
 
 block = 1048576
 ARGV.each do |filename|
-	crc = 0
-	file = File.open(filename, 'rb')
-	currentbyte = 0
-	while (line = file.read(block)) do
-		crc = Zlib.crc32(line,crc)
-	end
-	file.close
-	printf("%s %08X\n", filename, crc.to_i)
+  crc = 0
+  file = File.open(filename, 'rb')
+  currentbyte = 0
+  while (line = file.read(block)) do
+    crc = Zlib.crc32(line,crc)
+  end
+  file.close
+  printf("%s %08X\n", filename, crc.to_i)
 end
--- a/rc/bashrc	Fri Nov 01 17:22:24 2013 +0900
+++ b/rc/bashrc	Fri Nov 08 15:13:41 2013 +0900
@@ -240,7 +240,7 @@
 
 if command -v less > /dev/null 2>&1; then
   export PAGER=less
-  export LESS='-MRXginsz-2'
+  export LESS=-FMRXginsz-2
 fi
 
 # Test if we have GNU rm prefixed by g (esp if on non-GNU system).
--- a/rc/hgrc	Fri Nov 01 17:22:24 2013 +0900
+++ b/rc/hgrc	Fri Nov 08 15:13:41 2013 +0900
@@ -19,6 +19,8 @@
 graphlog =
 color =
 record =
+pager =
+purge =
 
 [hostfingerprints]
 bitbucket.org = 24:9c:45:8b:9c:aa:ba:55:4e:01:6d:58:ff:e4:28:7d:2a:14:ae:3b
@@ -29,6 +31,10 @@
 [alias]
 ll = log --style default
 
+[pager]
+pager = LESS=FRX less
+attend = annotate, cat, diff, export, glog, log, qdiff, heads
+
 [bookmarks]
 track.current = true