Add a note how to use `tramp-own-remote-path'

[gnu-emacs] / src / terminal.c

diff --git a/src/terminal.c b/src/terminal.c
index 15d74f4e812ce811db67bd016152e296345b6e05..5dd9975a6f44125cb39e916d6414b585bd1c9b9e 100644 (file)
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -1,12 +1,12 @@
 /* Functions related to terminal devices.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs 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, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,16 +21,16 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdio.h>
 
 #include "lisp.h"
+#include "character.h"
 #include "frame.h"
 #include "termchar.h"
 #include "termhooks.h"
-#include "charset.h"
-#include "coding.h"
 #include "keyboard.h"
 
-#ifdef HAVE_LINUX_KD_H
+#if HAVE_STRUCT_UNIPAIR_UNICODE
 # include <errno.h>
 # include <linux/kd.h>
+# include <sys/ioctl.h>
 #endif
 
 /* Chain of all terminals currently in use.  */
@@ -198,7 +198,7 @@ ins_del_lines (struct frame *f, int vpos, int n)
 }
 
 /* Return the terminal object specified by TERMINAL.  TERMINAL may
-”   be a terminal object, a frame, or nil for the terminal device of
+   be a terminal object, a frame, or nil for the terminal device of
    the current frame.  If TERMINAL is neither from the above or the
    resulting terminal object is deleted, return NULL.  */
 
@@ -531,7 +531,7 @@ selected frame's terminal).  */)
   return store_terminal_param (decode_live_terminal (terminal), parameter, value);
 }
 
-#if HAVE_LINUX_KD_H
+#if HAVE_STRUCT_UNIPAIR_UNICODE
 
 /* Compute the glyph code table for T.  */
 
@@ -574,7 +574,7 @@ calculate_glyph_code_table (struct terminal *t)
 Lisp_Object
 terminal_glyph_code (struct terminal *t, int ch)
 {
-#if HAVE_LINUX_KD_H
+#if HAVE_STRUCT_UNIPAIR_UNICODE
   if (t->type == output_termcap)
     {
       /* As a hack, recompute the table when CH is the maximum