(defadvice universal-argument-more
  (before stop-by-eight-before-sixteen (arg) activate)
  "Stop by eight before sixteen."
  (let ((num (car arg)))
    (if (> 16 num) (ad-set-arg 0 (list (/ num 2))))))

diff -r f0c59438beaf files/prefpane/sysctl.xml
--- a/files/prefpane/sysctl.xml	Thu Feb 21 11:23:13 2008 +0900
+++ b/files/prefpane/sysctl.xml	Fri Feb 22 16:15:20 2008 +0900
@@ -83,6 +83,12 @@
         <item>
           <name>Enter to Option_L</name>
           <sysctl>keyremap4macbook.remap.enter2optionL</sysctl>
+          <list>
+            <item>
+              <name>Non-modifier Enter to Command_L+Space</name>
+              <sysctl>keyremap4macbook.option.enter2optionL_commandspace</sysctl>
+            </item>
+          </list>
         </item>
         <item>
           <name>Enter to Command_L+Control_L</name>
diff -r f0c59438beaf src/kext/config.cpp
--- a/src/kext/config.cpp	Thu Feb 21 11:23:13 2008 +0900
+++ b/src/kext/config.cpp	Fri Feb 22 16:15:20 2008 +0900
@@ -76,6 +76,9 @@ namespace org_pqrs_KeyRemap4MacBook {
   SYSCTL_INT(_keyremap4macbook_remap, OID_AUTO, enter2optionL, CTLTYPE_INT|CTLFLAG_RW,
              &(config.remap_enter2optionL), 0, "");
 
+  SYSCTL_INT(_keyremap4macbook_option, OID_AUTO, enter2optionL_commandspace, CTLTYPE_INT|CTLFLAG_RW,
+              &(config.option_enter2optionL_commandspace), 0, "");
+ 
   SYSCTL_INT(_keyremap4macbook_remap, OID_AUTO, enter2commandLcontrolL, CTLTYPE_INT|CTLFLAG_RW,
              &(config.remap_enter2commandLcontrolL), 0, "");
 
@@ -370,7 +373,10 @@ namespace org_pqrs_KeyRemap4MacBook {
     sysctl_register_oid(&sysctl__keyremap4macbook_remap_enter2commandL);
     sysctl_register_oid(&sysctl__keyremap4macbook_remap_enter2controlL);
     sysctl_register_oid(&sysctl__keyremap4macbook_remap_enter2fn);
+
     sysctl_register_oid(&sysctl__keyremap4macbook_remap_enter2optionL);
+    sysctl_register_oid(&sysctl__keyremap4macbook_option_enter2optionL_commandspace);
+
     sysctl_register_oid(&sysctl__keyremap4macbook_remap_enter2commandLcontrolL);
     sysctl_register_oid(&sysctl__keyremap4macbook_remap_enter2commandLshiftL);
     sysctl_register_oid(&sysctl__keyremap4macbook_remap_enter2semicolon);
@@ -515,7 +521,10 @@ namespace org_pqrs_KeyRemap4MacBook {
     sysctl_unregister_oid(&sysctl__keyremap4macbook_remap_enter2commandL);
     sysctl_unregister_oid(&sysctl__keyremap4macbook_remap_enter2controlL);
     sysctl_unregister_oid(&sysctl__keyremap4macbook_remap_enter2fn);
+
     sysctl_unregister_oid(&sysctl__keyremap4macbook_remap_enter2optionL);
+    sysctl_unregister_oid(&sysctl__keyremap4macbook_option_enter2optionL_commandspace);
+
     sysctl_unregister_oid(&sysctl__keyremap4macbook_remap_enter2commandLcontrolL);
     sysctl_unregister_oid(&sysctl__keyremap4macbook_remap_enter2commandLshiftL);
     sysctl_unregister_oid(&sysctl__keyremap4macbook_remap_enter2semicolon);
diff -r f0c59438beaf src/kext/config.hpp
--- a/src/kext/config.hpp	Thu Feb 21 11:23:13 2008 +0900
+++ b/src/kext/config.hpp	Fri Feb 22 16:15:20 2008 +0900
@@ -31,7 +31,10 @@ namespace org_pqrs_KeyRemap4MacBook {
     int remap_enter2commandL;
     int remap_enter2controlL;
     int remap_enter2fn;
+
     int remap_enter2optionL;
+    int option_enter2optionL_commandspace;
+
     int remap_enter2commandLcontrolL;
     int remap_enter2commandLshiftL;
     int remap_enter2semicolon;
diff -r f0c59438beaf src/kext/keycode.hpp
--- a/src/kext/keycode.hpp	Thu Feb 21 11:23:13 2008 +0900
+++ b/src/kext/keycode.hpp	Fri Feb 22 16:15:20 2008 +0900
@@ -156,6 +156,7 @@ namespace org_pqrs_KeyRemap4MacBook {
   namespace CharCode {
     enum {
       CONTROL_L = 0,
+      COMMAND_L = 0,
       FN = 0,
       TAB = 9,
       RETURN = 13,
diff -r f0c59438beaf src/kext/remap.cpp
--- a/src/kext/remap.cpp	Thu Feb 21 11:23:13 2008 +0900
+++ b/src/kext/remap.cpp	Fri Feb 22 16:15:20 2008 +0900
@@ -122,7 +122,35 @@ namespace org_pqrs_KeyRemap4MacBook {
   {
     if (! config.remap_enter2optionL) return;
 
-    RemapUtil::keyToModifier(params, RemapUtil::getEnterKeyCode(params), ModifierFlag::OPTION_L);
+    KeyCode::KeyCode enterKeyCode = RemapUtil::getEnterKeyCode(params);
+
+    if (config.option_enter2optionL_commandspace) {
+      static bool useEnterAsOption = false;
+
+      if (params.ex_origKey != enterKeyCode && *(params.eventType) == KeyEvent::DOWN) {
+        useEnterAsOption = true;
+      }
+
+      if (params.ex_origKey == enterKeyCode) {
+        // Enter => OptionL (if type EnterKey only, works as EnterKey)
+        unsigned int origEventType = *(params.eventType);
+        RemapUtil::keyToModifier(params, enterKeyCode, ModifierFlag::OPTION_L);
+
+        if (origEventType == KeyEvent::DOWN) {
+          useEnterAsOption = false;
+
+        } else if (origEventType == KeyEvent::UP) {
+          if (useEnterAsOption == false) {
+            listFireExtraKey.add(FireExtraKey::TYPE_AFTER, KeyEvent::MODIFY, ModifierFlag::COMMAND_L, KeyCode::COMMAND_L, CharCode::COMMAND_L);
+            listFireExtraKey.add(FireExtraKey::TYPE_AFTER, KeyEvent::DOWN,   ModifierFlag::COMMAND_L, KeyCode::SPACE,     CharCode::SPACE);
+            listFireExtraKey.add(FireExtraKey::TYPE_AFTER, KeyEvent::UP,     ModifierFlag::COMMAND_L, KeyCode::SPACE,     CharCode::SPACE);
+            listFireExtraKey.add(FireExtraKey::TYPE_AFTER, KeyEvent::MODIFY, 0,                       KeyCode::COMMAND_L, CharCode::COMMAND_L);
+          }
+        }
+      }
+    } else {
+      RemapUtil::keyToModifier(params, enterKeyCode, ModifierFlag::OPTION_L);
+    }
   }
 
   void

Index: NSStringITerm.m
===================================================================
RCS file: /cvsroot/iterm/iTerm/NSStringITerm.m,v
retrieving revision 1.8
diff -u -r1.8 NSStringITerm.m
--- NSStringITerm.m	13 Nov 2006 08:01:04 -0000	1.8
+++ NSStringITerm.m	6 Nov 2007 09:24:28 -0000
@@ -294,9 +294,92 @@
return [NSString stringWithFormat:@"%d", num];
}
++ (BOOL)isCJKEncoding:(NSStringEncoding)encoding
+{
+    static NSMutableDictionary *isEncodingCJK = nil; // cache for encoding to isCJK mapping
+    static NSStringEncoding previousEncoding = 1; // ASCII
+    static BOOL isCJK = NO;
+    NSNumber *key, *val;
+    const char *lang;
+
+    if (encoding == previousEncoding) {
+        //NSLog(@"encoding[0x%08lx] is %s, again", encoding, isCJK ? "CJK" : "not CJK");
+        return isCJK;
+    }
+
+    previousEncoding = encoding;
+
+    key = [NSNumber numberWithUnsignedInt:encoding];
+
+    if (isEncodingCJK == nil) {
+        isEncodingCJK = [[NSMutableDictionary alloc] init];
+    }
+    else {
+        val = [isEncodingCJK objectForKey:key];
+
+        if (val != nil) {
+            isCJK = [val boolValue];
+            //NSLog(@"encoding[0x%08lx] is %s, IIRC", encoding, isCJK ? "CJK" : "not CJK");
+            return isCJK;
+        }
+    }
+
+    switch (encoding) {
+      // Simplified Chinese
+      case 0x80000019: // Mac
+      case 0x80000421: // Windows
+      case 0x80000631: // GBK
+      case 0x80000632: // GB 18030
+      case 0x80000930: // EUC
+      // Traditional Chinese
+      case 0x80000002: // Mac
+      case 0x80000423: // Windows
+      case 0x80000931: // EUC
+      case 0x80000A03: // Big5
+      case 0x80000A06: // Big5 HKSCS
+      // Japanese
+      case 0x00000003: // EUC
+      case 0x00000008: // Windows
+      case 0x00000015: // ISO-2022-JP
+      case 0x80000001: // Mac
+      case 0x80000628: // Shift JIS X0213
+      case 0x80000A01: // Shift JIS
+      // Korean
+      case 0x80000003: // Mac
+      case 0x80000422: // Windows
+      case 0x80000840: // ISO-2022-KR
+      case 0x80000940: // EUC
+        isCJK = YES;
+        //NSLog(@"0x%08lx is known to be %s", encoding, isCJK ? "CJK" : "not CJK");
+        break;
+
+      case 0x00000004: // UTF-8
+        isCJK = ((lang = getenv("LC_ALL")) != NULL ||
+                 (lang = getenv("LC_CTYPE")) != NULL ||
+                 (lang = getenv("LANG")) != NULL) &&
+            strlen(lang) >= 3 &&
+            (!strncmp(lang, "ja_", 3) ||
+             !strncmp(lang, "kr_", 3) ||
+             !strncmp(lang, "zh_", 3));
+        //NSLog(@"locale[%s] looks %s", lang, isCJK ? "CJK" : "not CJK");
+        break;
+
+      default:
+        isCJK = NO;
+        //NSLog(@"encoding[0x%08lx] is not known to be CJK", encoding);
+        break;
+    }
+
+    // Store in cache
+    val = [NSNumber numberWithBool:isCJK];
+    [isEncodingCJK setObject:val forKey:key];
+
+    return isCJK;
+}
+
+ (BOOL)isDoubleWidthCharacter:(unichar)unicode encoding:(NSStringEncoding) e
{
-	if (unicode <= 0xa0 || (unicode>0x452 && unicode <0x200f))
+	if (unicode <= 0xa0 || (unicode>0x452 && unicode <0x1100))
return NO;
/*
unicode character width check
@@ -325,11 +408,7 @@
/* Ambiguous ones */
-	if ((e)==0x80000019||(e)==0x80000421||(e)==0x80000631||(e)==0x80000632||(e)==0x80000930 || //GB
-		(e)==0x80000002||(e)==0x80000423||(e)==0x80000931||(e)==0x80000a03||(e)==0x80000a06 || //BIG5
-		(e)==0x80000001||(e)==0x8||(e)==0x15 || //JP
-		(e)==0x80000628||(e)==0x80000a01 || //SJIS
-		(e)==0x80000422||(e)==0x80000003||(e)==0x80000840||(e)==0x80000940) //KR
+	if ([self isCJKEncoding:e])
{
if ((unicode >=0xfe00 && unicode <=0xfe0f) ||
(unicode >=0x2776 && unicode <=0x277f) ||

Index: PTYTextView.m
===================================================================
RCS file: /cvsroot/iterm/iTerm/PTYTextView.m,v
retrieving revision 1.307
diff -u -r1.307 PTYTextView.m
--- PTYTextView.m	17 Jun 2007 01:56:31 -0000	1.307
+++ PTYTextView.m	6 Nov 2007 02:07:04 -0000
@@ -963,7 +963,7 @@
 					//draw underline
 					if (theLine[j].fg_color & UNDER_MASK && theLine[j].ch) {
 						[[self colorForCode:(fgcode & 0x1ff)] set];
-						NSRectFill(NSMakeRect(curX,curY-2,charWidth,1));
+						NSRectFill(NSMakeRect(curX,curY-2,double_width?charWidth*2:charWidth,1));
 					}
 				}
 			}

Index: NSStringITerm.m
===================================================================
RCS file: /cvsroot/iterm/iTerm/NSStringITerm.m,v
retrieving revision 1.8
diff -u -r1.8 NSStringITerm.m
--- NSStringITerm.m	13 Nov 2006 08:01:04 -0000	1.8
+++ NSStringITerm.m	5 Nov 2007 14:04:20 -0000
@@ -286,6 +286,8 @@
 	0xfffd,
 };
 
+static int isJapaneseEnvironment = -1;
+
 
 @implementation NSString (iTerm)
 
@@ -296,8 +298,22 @@
 
 + (BOOL)isDoubleWidthCharacter:(unichar)unicode encoding:(NSStringEncoding) e
 {
-	if (unicode <= 0xa0 || (unicode>0x452 && unicode <0x200f))
-		return NO;
+    if (unicode <= 0xa0 || (unicode>0x452 && unicode <0x200f))
+        return NO;
+
+    if (isJapaneseEnvironment < 0) {
+        const char ja_JP[] = "ja_JP.";
+        const char *lang = getenv("LANG");
+
+        if (lang != NULL && strlen(lang) > sizeof(ja_JP) - 1 && !strncmp(lang, ja_JP, sizeof(ja_JP) - 1))
+            isJapaneseEnvironment = YES;
+        else
+            isJapaneseEnvironment = NO;
+    }
+
+    if (isJapaneseEnvironment && unicode >= 0x2000)
+        return YES;
+
     /*
      unicode character width check
      see. http://www.unicode.org

Index: iTermApplication.m
===================================================================
RCS file: /cvsroot/iterm/iTerm/iTermApplication.m,v
retrieving revision 1.10
diff -u -r1.10 iTermApplication.m
--- iTermApplication.m	7 Nov 2006 08:03:08 -0000	1.10
+++ iTermApplication.m	5 Nov 2007 13:51:06 -0000
@@ -43,6 +43,10 @@
 	id aWindow;
 	PseudoTerminal *currentTerminal;
 	PTYSession *currentSession;
+	unsigned int modflag;
+	unichar unicode;
+	NSString *keystr;
+	NSEvent *newEvent;
 
 
 	if([anEvent type] == NSKeyDown)
@@ -57,16 +61,42 @@
 			currentSession = [currentTerminal currentSession];
 
 			if([currentSession hasKeyMappingForEvent: anEvent highPriority: YES])
+			{
 				[currentSession keyDown: anEvent];
-			else
-				[super sendEvent: anEvent];
-		}
-		else
-		   [super sendEvent: anEvent];
+				return;
+			}
+
+			modflag = [anEvent modifierFlags];
+
+			if ((modflag & NSCommandKeyMask)) {
+				keystr  = [anEvent characters];
+				unicode = [keystr length] > 0 ? [keystr characterAtIndex : 0] : 0;
 
+				switch (unicode)
+				{
+					case 0x20:						// Switch Input Source
+					case NSCarriageReturnCharacter:	// Enter Full Screen
+						break;
+
+					default:
+						newEvent = [NSEvent keyEventWithType: [anEvent type]
+											location: [anEvent locationInWindow]
+											modifierFlags: ((modflag - NSCommandKeyMask) | NSAlternateKeyMask)
+											timestamp: [anEvent timestamp]
+											windowNumber: [anEvent windowNumber]
+											context: [anEvent context]
+											characters: keystr
+											charactersIgnoringModifiers: [anEvent charactersIgnoringModifiers]
+											isARepeat: [anEvent isARepeat]
+											keyCode: [anEvent keyCode]];
+						[currentSession keyDown: newEvent];
+						return;
+				}
+			}
+		}
 	}
-	else
-		[super sendEvent: anEvent];
+
+	[super sendEvent: anEvent];
 }
 
 @end

Index: vc-svk.el
===================================================================
--- vc-svk.el	(revision 2557)
+++ vc-svk.el	(working copy)
@@ -768,17 +768,20 @@
   (let ((config "~/.svk/config")
         mtime)
     (when (file-readable-p config)
-      (setq mtime (nth 5 (file-attributes "~/.svk/config")))
+      (setq mtime (nth 5 (file-attributes config)))
       (unless (and vc-svk-co-paths           ; has not it been loaded?
-                   (vc-svk-time-less-p mtime ; is it unmodified since?
-                                       (car vc-svk-co-paths)))
+                   (not                      ; is it unmodified since?
+                    (vc-svk-time-less-p (car vc-svk-co-paths) mtime)))
         ;; (re)load
-        (setq vc-svk-co-paths (list mtime))
         (with-temp-buffer
           (vc-svk-command t 0 nil "checkout" "--list")
+          ;; `svk checkout --list' modifies ~/.svk/config somehow, so
+          ;; you have to stat it again.
+          (setq mtime (nth 5 (file-attributes config)))
+          (setq vc-svk-co-paths (list mtime))
           (goto-char (point-min))
           (when (search-forward "==========\n" nil t)
-            (while (re-search-forward "^ +\\(.+\\) *\t\\(.+\\)$" nil t)
+            (while (re-search-forward "^ +\\(.+?\\) *\t\\(.+\\)$" nil t)
               (add-to-list 'vc-svk-co-paths
                            (list (match-string-no-properties 2)
                                  (match-string-no-properties 1))))))