Update copyright year to 2015

[gnu-emacs] / src / widget.c

diff --git a/src/widget.c b/src/widget.c
index b5b76bb306bfead4169603b9aaf5cbb53731881b..c4d69407176355c4d76c8534527e0a5a62b9c439 100644 (file)
--- a/src/widget.c
+++ b/src/widget.c
@@ -1,5 +1,5 @@
 /* The emacs frame widget.
-   Copyright (C) 1992-1993, 2000-2014 Free Software Foundation, Inc.
+   Copyright (C) 1992-1993, 2000-2015 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -579,15 +579,6 @@ EmacsFrameResize (Widget widget)
   if (true || frame_resize_pixelwise)
     {
       int width, height;
-/**       int width = (ew->core.width **/
-/**               - FRAME_SCROLL_BAR_AREA_WIDTH (f) **/
-/**               - FRAME_TOTAL_FRINGE_WIDTH (f) **/
-/**               - 2 * FRAME_INTERNAL_BORDER_WIDTH (f)); **/
-
-/**       int height  = (ew->core.height **/
-/**                 - FRAME_TOOLBAR_HEIGHT (f) **/
-/**                 - FRAME_SCROLL_BAR_AREA_HEIGHT (f) **/
-/**                 - 2 * FRAME_INTERNAL_BORDER_WIDTH (f)); **/
 
       pixel_to_text_size (ew, ew->core.width, ew->core.height, &width, &height);
       change_frame_size (f, width, height, 0, 1, 0, 1);
@@ -653,7 +644,8 @@ EmacsFrameSetCharSize (Widget widget, int columns, int rows)
   EmacsFrame ew = (EmacsFrame) widget;
   struct frame *f = ew->emacs_frame.frame;
 
-  if (!frame_inhibit_resize (f, 0) && !frame_inhibit_resize (f, 1))
+  if (!frame_inhibit_resize (f, 0, Qfont)
+      && !frame_inhibit_resize (f, 1, Qfont))
     x_set_window_size (f, 0, columns, rows, 0);
 }