HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
[bpt/emacs.git]
/
src
/
xfns.c
diff --git
a/src/xfns.c
b/src/xfns.c
index
1f98e9f
..
315d509
100644
(file)
--- a/
src/xfns.c
+++ b/
src/xfns.c
@@
-1,6
+1,6
@@
/* Functions for the X window system.
/* Functions for the X window system.
-Copyright (C) 1989, 1992-201
2
Free Software Foundation, Inc.
+Copyright (C) 1989, 1992-201
3
Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-3848,20
+3848,6
@@
x_pixel_height (register struct frame *f)
return FRAME_PIXEL_HEIGHT (f);
}
return FRAME_PIXEL_HEIGHT (f);
}
-int
-x_char_width (register struct frame *f)
-{
- return FRAME_COLUMN_WIDTH (f);
-}
-
-int
-x_char_height (register struct frame *f)
-{
- return FRAME_LINE_HEIGHT (f);
-}
-
-
-
\f
/************************************************************************
X Displays
************************************************************************/
/************************************************************************
X Displays
************************************************************************/