Merge branch 'master' into jgrpp

# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h

src/window_func.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /*
  * This file is part of OpenTTD.
  * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
@@ -57,6 +55,7 @@ void DeleteWindowByClass(WindowClass cls);
 bool FocusWindowById(WindowClass cls, WindowNumber number);
 
 bool EditBoxInGlobalFocus();
+bool FocusedWindowIsConsole();
 Point GetCaretPosition();
 
 #endif /* WINDOW_FUNC_H */