aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2015-09-13 11:55:28 -0700
committerPaul Eggert2015-09-13 11:56:06 -0700
commita85472bbdcd16b0a695cd75f98b68ee39b86ae2f (patch)
treef200f070a7b5489aab13e55a1e8e08b16a5f1fec /src
parent59e3f2df9314e160b37bb1375b4bad15976cd56f (diff)
downloademacs-a85472bbdcd16b0a695cd75f98b68ee39b86ae2f.tar.gz
emacs-a85472bbdcd16b0a695cd75f98b68ee39b86ae2f.zip
Port Unicode char detection to FreeBSD+svgalib
Problem reported by Ashish SHUKLA in: http://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00531.html * configure.ac: Check for struct unipair.unicode instead of for <linux/kd.h>, since that’s more specific to what the code actually needs. * src/terminal.c: Use HAVE_STRUCT_UNIPAIR_UNICODE, not HAVE_LINUX_KD_H.
Diffstat (limited to 'src')
-rw-r--r--src/terminal.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/terminal.c b/src/terminal.c
index d7c16d9d036..80c6aa20bee 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -28,7 +28,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
28#include "coding.h" 28#include "coding.h"
29#include "keyboard.h" 29#include "keyboard.h"
30 30
31#ifdef HAVE_LINUX_KD_H 31#if HAVE_STRUCT_UNIPAIR_UNICODE
32# include <errno.h> 32# include <errno.h>
33# include <linux/kd.h> 33# include <linux/kd.h>
34# include <sys/ioctl.h> 34# include <sys/ioctl.h>
@@ -532,7 +532,7 @@ selected frame's terminal). */)
532 return store_terminal_param (decode_live_terminal (terminal), parameter, value); 532 return store_terminal_param (decode_live_terminal (terminal), parameter, value);
533} 533}
534 534
535#if HAVE_LINUX_KD_H 535#if HAVE_STRUCT_UNIPAIR_UNICODE
536 536
537/* Compute the glyph code table for T. */ 537/* Compute the glyph code table for T. */
538 538
@@ -575,7 +575,7 @@ calculate_glyph_code_table (struct terminal *t)
575Lisp_Object 575Lisp_Object
576terminal_glyph_code (struct terminal *t, int ch) 576terminal_glyph_code (struct terminal *t, int ch)
577{ 577{
578#if HAVE_LINUX_KD_H 578#if HAVE_STRUCT_UNIPAIR_UNICODE
579 if (t->type == output_termcap) 579 if (t->type == output_termcap)
580 { 580 {
581 /* As a hack, recompute the table when CH is the maximum 581 /* As a hack, recompute the table when CH is the maximum