rpms/emacs/devel lang-coding-systems-init.el,1.7,1.8

[fedora-cvs-commits at redhat.com]

Author: coldwell

Update of /cvs/dist/rpms/emacs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7827

Modified Files:
	lang-coding-systems-init.el 
Log Message:
don't set keyboard-coding-system when running under X (Dean Messing #205859)



Index: lang-coding-systems-init.el
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/lang-coding-systems-init.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lang-coding-systems-init.el	3 Aug 2006 18:56:33 -0000	1.7
+++ lang-coding-systems-init.el	14 Nov 2006 21:36:10 -0000	1.8
@@ -23,8 +23,9 @@
 	 (set-default-coding-systems 'utf-8)
 	 (set-terminal-coding-system 'utf-8)
 	 (let ((term (getenv "TERM")))
-	   (when (or (string-match "^linux" term)
-		     (string-match "^xterm" term))
+	   (when (and (not window-system)
+		      (or (string-match "^linux" term)
+			  (string-match "^xterm" term)))
 	     (set-keyboard-coding-system 'utf-8))))
 	((equal lang "ja")
 	 (set-default-coding-systems 'euc-jp)