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
82e2184
..
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.
@@
-224,13
+224,11
@@
x_window_to_frame (struct x_display_info *dpyinfo, int wdesc)
Lisp_Object tail, frame;
struct frame *f;
Lisp_Object tail, frame;
struct frame *f;
- if (wdesc == None) return 0;
+ if (wdesc == None)
+ return NULL;
-
for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)
)
+
FOR_EACH_FRAME (tail, frame
)
{
{
- frame = XCAR (tail);
- if (!FRAMEP (frame))
- continue;
f = XFRAME (frame);
if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
continue;
f = XFRAME (frame);
if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
continue;
@@
-270,18
+268,16
@@
struct frame *
x_any_window_to_frame (struct x_display_info *dpyinfo, int wdesc)
{
Lisp_Object tail, frame;
x_any_window_to_frame (struct x_display_info *dpyinfo, int wdesc)
{
Lisp_Object tail, frame;
- struct frame *f, *found;
+ struct frame *f, *found
= NULL
;
struct x_output *x;
struct x_output *x;
- if (wdesc == None) return NULL;
+ if (wdesc == None)
+ return NULL;
- found = NULL;
- for (tail = Vframe_list; CONSP (tail) && !found; tail = XCDR (tail))
+ FOR_EACH_FRAME (tail, frame)
{
{
- frame = XCAR (tail);
- if (!FRAMEP (frame))
- continue;
-
+ if (found)
+ break;
f = XFRAME (frame);
if (FRAME_X_P (f) && FRAME_X_DISPLAY_INFO (f) == dpyinfo)
{
f = XFRAME (frame);
if (FRAME_X_P (f) && FRAME_X_DISPLAY_INFO (f) == dpyinfo)
{
@@
-325,13
+321,11
@@
x_menubar_window_to_frame (struct x_display_info *dpyinfo, XEvent *event)
struct frame *f;
struct x_output *x;
struct frame *f;
struct x_output *x;
- if (wdesc == None) return 0;
+ if (wdesc == None)
+ return NULL;
-
for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)
)
+
FOR_EACH_FRAME (tail, frame
)
{
{
- frame = XCAR (tail);
- if (!FRAMEP (frame))
- continue;
f = XFRAME (frame);
if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
continue;
f = XFRAME (frame);
if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
continue;
@@
-359,13
+353,11
@@
x_top_window_to_frame (struct x_display_info *dpyinfo, int wdesc)
struct frame *f;
struct x_output *x;
struct frame *f;
struct x_output *x;
- if (wdesc == None) return 0;
+ if (wdesc == None)
+ return NULL;
-
for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)
)
+
FOR_EACH_FRAME (tail, frame
)
{
{
- frame = XCAR (tail);
- if (!FRAMEP (frame))
- continue;
f = XFRAME (frame);
if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
continue;
f = XFRAME (frame);
if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
continue;
@@
-3856,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
************************************************************************/