diff -r 1c59e45f5358 -r 1e7314bb84bc .emacs-my
--- a/.emacs-my	Wed Mar 23 20:50:41 2011 +0200
+++ b/.emacs-my	Wed Mar 23 20:54:00 2011 +0200
@@ -276,18 +276,20 @@
 
 (setq read-quoted-char-radix 16)
 
-(setq standard-display-table (make-display-table))
-(let ( (i ?\x80) hex hi low )
-  (while (<= i ?\xff)
-    (setq hex (format "%x" i))
-    (setq hi (elt hex 0))
-    (setq low (elt hex 1))
-    (aset standard-display-table (unibyte-char-to-multibyte i)
-          (vector (make-glyph-code ?\\ 'escape-glyph)
-                  (make-glyph-code ?x 'escape-glyph)
-                  (make-glyph-code hi 'escape-glyph)
-                  (make-glyph-code low 'escape-glyph)))
-    (setq i (+ i 1))))
+(when (>= emacs-major-version 22)
+  (setq standard-display-table (make-display-table))
+  (let ( (i ?\x80) hex hi low )
+    (while (<= i ?\xff)
+      (setq hex (format "%x" i))
+      (setq hi (elt hex 0))
+      (setq low (elt hex 1))
+      (aset standard-display-table (unibyte-char-to-multibyte i)
+            (vector (make-glyph-code ?\\ 'escape-glyph)
+                    (make-glyph-code ?x 'escape-glyph)
+                    (make-glyph-code hi 'escape-glyph)
+                    (make-glyph-code low 'escape-glyph)))
+      (setq i (+ i 1))))
+  )
 
 ;; generic-define-* before (require 'generic-x) allow load all useful extra modes.
 (setq generic-define-mswindows-modes t)
@@ -1136,9 +1138,9 @@
        (save-excursion
          (re-search-forward "\\_<class\\_>" nil t))))
 
-(add-to-list 'magic-mode-alist
-             '(my-c++-header-file-p . c++-mode))
-
+(when (>= emacs-major-version 22)
+  (add-to-list 'magic-mode-alist '(my-c++-header-file-p . c++-mode))
+  )
 
 (setq-default comment-style (quote indent))
 (setq-default comment-column 44)