summaryrefslogtreecommitdiff
path: root/src/fontset.h
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2013-12-12 12:39:41 +0400
committerDmitry Antipov <dmantipov@yandex.ru>2013-12-12 12:39:41 +0400
commit397a32c12ad097314c0948818d5c54b43d9f3d54 (patch)
tree30a5a27213eede4f3c633deb00d9c1423bb9d976 /src/fontset.h
parent09faee72dd0743a5b46444b5e917ee1259843788 (diff)
downloademacs-397a32c12ad097314c0948818d5c54b43d9f3d54.tar.gz
* dispextern.h (FACE_SUITABLE_FOR_CHAR_P): Remove unused macro.
(FACE_FOR_CHAR): Simplify because face_for_char does the same. * fontset.c (face_suitable_for_char_p) [0]: Remove unused function. (font_for_char): Prefer ptrdiff_t to int for buffer position. (face_for_char): Likewise. Rearrange eassert and return ASCII face for CHAR_BYTE8_P. * fontset.h (font_for_char, face_for_char): Adjust prototypes.
Diffstat (limited to 'src/fontset.h')
-rw-r--r--src/fontset.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fontset.h b/src/fontset.h
index b8ef4789e71..3531915f7d9 100644
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -28,8 +28,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
extern void free_face_fontset (struct frame *, struct face *);
extern int face_for_char (struct frame *, struct face *, int,
- int, Lisp_Object);
-extern Lisp_Object font_for_char (struct face *, int, int, Lisp_Object);
+ ptrdiff_t, Lisp_Object);
+extern Lisp_Object font_for_char (struct face *, int, ptrdiff_t, Lisp_Object);
extern int make_fontset_for_ascii_face (struct frame *, int, struct face *);
extern int fontset_from_font (Lisp_Object);