# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1301496274 -10800
# Node ID 0945c23d34b8405d22d3fea53c831b6fc84dae0c
# Parent  0fdb4051446cf4410d157a4bdc22766b61ac3ae4# Parent  596406094fd1bafb5eb346bd868fda87c5377ab6
merged

diff -r 0fdb4051446c -r 0945c23d34b8 .emacs-autogen.sh
--- a/.emacs-autogen.sh	Sat Mar 26 18:52:58 2011 +0200
+++ b/.emacs-autogen.sh	Wed Mar 30 17:44:34 2011 +0300
@@ -25,6 +25,9 @@
         host_distro=unknown
       fi
       ;;
+    Darwin)
+      host_os=darwin
+      ;;
     *)
       host_os=unknown
       ;;
@@ -88,6 +91,9 @@
           ;;
       esac
       ;;
+    darwin)
+      print_aspell
+      ;;
     *)
       :
       ;;
diff -r 0fdb4051446c -r 0945c23d34b8 .emacs-my
--- a/.emacs-my	Sat Mar 26 18:52:58 2011 +0200
+++ b/.emacs-my	Wed Mar 30 17:44:34 2011 +0300
@@ -271,7 +271,7 @@
 
 (setq read-quoted-char-radix 16)
 
-(when (>= emacs-major-version 22)
+(when (and (>= emacs-major-version 22) (not (eq system-type 'darwin)))
   (setq standard-display-table (make-display-table))
   (let ( (i ?\x80) hex hi low )
     (while (<= i ?\xff)
@@ -530,6 +530,9 @@
   (setq x-select-request-type '(UTF8_STRING COMPOUND_TEXT TEXT STRING))
   (modify-coding-system-alist 'process ".*" 'utf-8-unix)
   )
+ ((eq system-type 'darwin)
+  nil
+  )
  (t
   (prefer-coding-system 'cp1251-dos)
   (prefer-coding-system 'utf-8-unix)