# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1426466431 0
# Node ID da732079c58d5792bdb688c81fd22e53cbea3122
# Parent  e0f1dfaa821e30818493c2a7773dbddc7e82e322
Correct some code with badly-placed parentheses, thank you Mats Lidell.

lisp/ChangeLog addition:

2015-03-16  Aidan Kehoe  <kehoea@parhasard.net>

	* tty-init.el (make-frame-after-init-entry-point):
	Some parentheses were placed badly here with the last change,
	thank you Mats for pointing it out; in passing, change to a
	version of the code that doesn't create a string for garbage, not
	that it matters.

diff -r e0f1dfaa821e -r da732079c58d lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Mar 16 00:28:18 2015 +0000
+++ b/lisp/ChangeLog	Mon Mar 16 00:40:31 2015 +0000
@@ -1,3 +1,11 @@
+2015-03-16  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* tty-init.el (make-frame-after-init-entry-point):
+	Some parentheses were placed badly here with the last change,
+	thank you Mats for pointing it out; in passing, change to a
+	version of the code that doesn't create a string for garbage, not
+	that it matters.
+
 2015-03-16  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* obsolete.el (max-char):
diff -r e0f1dfaa821e -r da732079c58d lisp/tty-init.el
--- a/lisp/tty-init.el	Mon Mar 16 00:28:18 2015 +0000
+++ b/lisp/tty-init.el	Mon Mar 16 00:40:31 2015 +0000
@@ -66,10 +66,9 @@
   ;; override term-file-prefix. (startup.el does it after
   ;; loading the init file.)
   (when (and (find-coding-system 'euc-jp)
-             (member* (mismatch "kterm"
-                                (canoncase (or (console-tty-terminal-type
-                                                console) ""))
-                                '(nil 5))))
+             (member* (mismatch "kterm" (console-tty-terminal-type console)
+                                :test #'equalp)
+                      '(nil 5)))
     (set-console-tty-coding-system console 'euc-jp))
   (when init-file-loaded
     ;; temporarily select the console so that the changes