--- a/lisp/x-win-xfree86.el	Mon Aug 13 10:20:01 2007 +0200
+++ b/lisp/x-win-xfree86.el	Mon Aug 13 10:20:27 2007 +0200
@@ -34,60 +34,31 @@
 ;;; #### Counter-bleck!! We shouldn't override a user binding for F13.
 ;;; So we use function-key-map for now.
 ;;; When we've implemented a fallback-style equivalent of
-;;; keyboard-translate-table, we'll use that instead. (mrb)
+;;; keyboard-translate-table, we'll use that instead. (martin)
 
 ;; For no obvious reason, shift-F1 is called F13, although Meta-F1 and
 ;; Control-F1 have normal names.
 
 (defun x-win-init-xfree86 ()
-
-(loop for (x-key key sane-key) in
-  '(("F13" f13 f1)
-    ("F14" f14 f2)
-    ("F15" f15 f3)
-    ("F16" f16 f4)
-    ("F17" f17 f5)
-    ("F18" f18 f6)
-    ("F19" f19 f7)
-    ("F20" f20 f8)
-    ("F21" f21 f9)
-    ("F22" f22 f10)
-    ("F23" f23 f11)
-    ("F24" f24 f12))
-  do
-  (when (and (x-keysym-on-keyboard-p x-key)
-	     (not (x-keysym-on-keyboard-sans-modifiers-p x-key)))
-    ;; define also the control, meta, and meta-control versions.
-    (loop for mods in '(() (control) (meta) (meta control)) do
-      (define-key function-key-map `[(,@mods ,key)] `[(shift ,@mods ,sane-key)])
-      )))
-
-;; (let ((mapping '((f13 . (shift f1))
-;; 		 (f14 . (shift f2))
-;; 		 (f15 . (shift f3))
-;; 		 (f16 . (shift f4))
-;; 		 (f17 . (shift f5))
-;; 		 (f18 . (shift f6))
-;; 		 (f19 . (shift f7))
-;; 		 (f20 . (shift f8))
-;; 		 (f21 . (shift f9))
-;; 		 (f22 . (shift f10))
-;; 		 (f23 . (shift f11))
-;; 		 (f24 . (shift f12)))))
-;;
-;;   ;; now define them and also the control, meta, and meta-control versions.
-;;   (while mapping
-;;     (let* ((foo (caar mapping))
-;; 	   (bar (cdar mapping))
-;; 	   (foo (if (listp foo) foo (list foo)))
-;; 	   (bar (if (listp bar) bar (list bar))))
-;;       (let ((mods '(() (control) (meta) (meta control))))
-;; 	(while mods
-;; 	  (let ((k1 (vector (append (car mods) foo)))
-;; 		(k2 (vector (append (car mods) bar))))
-;; 	    (define-key global-map k1 k2))
-;; 	  (setq mods (cdr mods))))
-;;       (setq mapping (cdr mapping)))))
-)
+  (loop for (key sane-key) in
+    '((f13 f1)
+      (f14 f2)
+      (f15 f3)
+      (f16 f4)
+      (f17 f5)
+      (f18 f6)
+      (f19 f7)
+      (f20 f8)
+      (f21 f9)
+      (f22 f10)
+      (f23 f11)
+      (f24 f12))
+    do
+    (when (and (x-keysym-on-keyboard-p key)
+	       (not (x-keysym-on-keyboard-sans-modifiers-p key)))
+      ;; define also the control, meta, and meta-control versions.
+      (loop for mods in '(() (control) (meta) (meta control)) do
+	(define-key function-key-map `[(,@mods ,key)] `[(shift ,@mods ,sane-key)])
+	))))
 
 ;;; x-win-xfree86.el ends here