aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2006-06-06 03:57:22 +0000
committerKenichi Handa2006-06-06 03:57:22 +0000
commit3ec0b7a9de72f1bf0f804b042043e9ef45d1cd48 (patch)
tree51f163553f70ad4adc23e40d1d55b8ec6acbf4cd /src
parent02ed2ea88a3d8fce9785c15ca54498954b241d81 (diff)
downloademacs-3ec0b7a9de72f1bf0f804b042043e9ef45d1cd48.tar.gz
emacs-3ec0b7a9de72f1bf0f804b042043e9ef45d1cd48.zip
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog.unicode2
-rw-r--r--src/character.c4
-rw-r--r--src/character.h2
3 files changed, 5 insertions, 3 deletions
diff --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode
index 86831f14d5b..13c8fdc0918 100644
--- a/src/ChangeLog.unicode
+++ b/src/ChangeLog.unicode
@@ -61,6 +61,8 @@
61 (make_frame, x_set_font) [USE_FONT_BACKEND]: Use font-backend 61 (make_frame, x_set_font) [USE_FONT_BACKEND]: Use font-backend
62 mechanism. 62 mechanism.
63 63
64 * lisp.h (assoc_no_quit): Extern it.
65
64 * xdisp.c: If USE_FONT_BACKEND is defined, include "font.h". 66 * xdisp.c: If USE_FONT_BACKEND is defined, include "font.h".
65 Through out the file, use FONT_INFO_FROM_FACE instead of 67 Through out the file, use FONT_INFO_FROM_FACE instead of
66 FONT_INFO_FROM_ID, use get_per_char_metric instead of 68 FONT_INFO_FROM_ID, use get_per_char_metric instead of
diff --git a/src/character.c b/src/character.c
index ca3b136a463..3d3e28bc7d2 100644
--- a/src/character.c
+++ b/src/character.c
@@ -1,8 +1,8 @@
1/* Basic character support. 1/* Basic character support.
2 Copyright (C) 1995, 1997, 1998, 2001 Electrotechnical Laboratory, JAPAN. 2 Copyright (C) 1995, 1997, 1998, 2001 Electrotechnical Laboratory, JAPAN.
3 Licensed to the Free Software Foundation. 3 Licensed to the Free Software Foundation.
4 Copyright (C) 2001, 2005 Free Software Foundation, Inc. 4 Copyright (C) 2001, 2005, 2006 Free Software Foundation, Inc.
5 Copyright (C) 2003 5 Copyright (C) 2003, 2006
6 National Institute of Advanced Industrial Science and Technology (AIST) 6 National Institute of Advanced Industrial Science and Technology (AIST)
7 Registration Number H13PRO009 7 Registration Number H13PRO009
8 8
diff --git a/src/character.h b/src/character.h
index a939dc727f0..d02fdfb8b79 100644
--- a/src/character.h
+++ b/src/character.h
@@ -1,7 +1,7 @@
1/* Header for multibyte character handler. 1/* Header for multibyte character handler.
2 Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN. 2 Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN.
3 Licensed to the Free Software Foundation. 3 Licensed to the Free Software Foundation.
4 Copyright (C) 2003 4 Copyright (C) 2003, 2006
5 National Institute of Advanced Industrial Science and Technology (AIST) 5 National Institute of Advanced Industrial Science and Technology (AIST)
6 Registration Number H13PRO009 6 Registration Number H13PRO009
7 7