Remove code left dead after 2014-07-27 changes.

* frame.c (frame_inhibit_resize):
* widget.c (EmacsFrameResize):
* window.c (resize_frame_windows, Fset_window_configuration):
* xdisp.c (expose_frame):
* xfns.c (x_change_tool_bar_height):
* xmenu.c (update_frame_menubar):
* xterm.c (handle_one_xevent, x_new_font, x_set_window_size_1):
Remove code left dead after 2014-07-27 changes.

1 files changed, 0 insertions, 26 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 9aea0684927..974e29dfc88 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7560,9 +7560,6 @@ handle_one_xevent (struct x_display_info *dpyinfo,
               SET_FRAME_GARBAGED (f);
               cancel_mouse_face (f);
             }
-
-/**           FRAME_PIXEL_WIDTH (f) = event->xconfigure.width; **/
-/**           FRAME_PIXEL_HEIGHT (f) = event->xconfigure.height; **/
 #endif /* not USE_GTK */
 #endif
 
@@ -8647,7 +8644,6 @@ x_new_font (struct frame *f, Lisp_Object font_object, int fontset)
   FRAME_LINE_HEIGHT (f) = FONT_HEIGHT (font);
 
 #ifndef USE_X_TOOLKIT                                                   \
-/**   FRAME_TOOL_BAR_HEIGHT (f) = FRAME_TOOL_BAR_LINES (f) * FRAME_LINE_HEIGHT (f); **/
   FRAME_MENU_BAR_HEIGHT (f) = FRAME_MENU_BAR_LINES (f) * FRAME_LINE_HEIGHT (f);
 #endif
 
@@ -9490,18 +9486,6 @@ x_set_window_size_1 (struct frame *f, int change_gravity, int width, int height,
 {
   int pixelwidth, pixelheight;
 
-/**   if (pixelwise) **/
-/**     { **/
-/**       pixelwidth = FRAME_TEXT_TO_PIXEL_WIDTH (f, width); **/
-/**       pixelheight = FRAME_TEXT_TO_PIXEL_HEIGHT (f, height); **/
-/**     } **/
-/**   else **/
-/**     { **/
-/**       pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, width); **/
-/**       pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, height); **/
-/**     } **/
-
-/**   FRAME_TOOL_BAR_HEIGHT (f) = FRAME_TOOLBAR_HEIGHT (f); **/
   pixelwidth = (pixelwise
                 ? FRAME_TEXT_TO_PIXEL_WIDTH (f, width)
                 : FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, width));
@@ -9509,16 +9493,6 @@ x_set_window_size_1 (struct frame *f, int change_gravity, int width, int height,
                   ? FRAME_TEXT_TO_PIXEL_HEIGHT (f, height)
                   : FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, height)));
 
-/**   pixelwidth = ((pixelwise ? width : (width * FRAME_COLUMN_WIDTH (f))) **/
-/**             + FRAME_SCROLL_BAR_AREA_WIDTH (f) **/
-/**             + FRAME_TOTAL_FRINGE_WIDTH (f) **/
-/**             + 2 * FRAME_INTERNAL_BORDER_WIDTH (f)); **/
-
-/**   pixelheight = ((pixelwise ? height : (height * FRAME_LINE_HEIGHT (f))) **/
-/**              + FRAME_TOOLBAR_HEIGHT (f) **/
-/**              + FRAME_SCROLL_BAR_AREA_HEIGHT (f) **/
-/**              + 2 * FRAME_INTERNAL_BORDER_WIDTH (f)); **/
-
   if (change_gravity) f->win_gravity = NorthWestGravity;
   x_wm_set_size_hint (f, 0, 0);
   XResizeWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),