# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1276635737 -10800
# Node ID c7289ca7bfbe8deb0d1a341a11513bf56a4e287e
# Parent  bef33c83b3a04e6ded66ebee07f972a651fb65fa# Parent  c8e90a10c94128aa7378ec7894d9a68ca32a4bce
merged

diff -r bef33c83b3a0 -r c7289ca7bfbe .emacs-my
--- a/.emacs-my	Wed Jun 16 00:02:00 2010 +0300
+++ b/.emacs-my	Wed Jun 16 00:02:17 2010 +0300
@@ -319,10 +319,12 @@
 ;; ======================================================================
 ;; keyboard, mouse.
 
-;; cyrillic-jcuken  for 567 is :,.
-;; russian-computer for 567 is %^&
-(setq default-input-method 'cyrillic-jcuken)
-
+;; cyrillic-jis-russian  for 567 is :,.
+;; cyrillic-jcuken  for SHIFT 567 is :,.
+;; russian-computer for SHIFT 567 is %^&
+(if (>= emacs-major-version 22)
+    (setq default-input-method 'russian-computer)
+  (setq default-input-method 'cyrillic-jcuken))
 ;; (pc-bindings-mode) ; Myself define keybinding, see
 
 ;; ----------------------------------------------------------------------