aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2014-09-30 08:20:03 -0700
committerPaul Eggert2014-09-30 08:20:03 -0700
commit699aeb00d4cf6278ba59e9b1e845df20fe3cd791 (patch)
tree43bbc6276d7f3da1de8b8eee857362fd26e0c880
parenta701e357579acdb43794d2f893e5470edf67a085 (diff)
downloademacs-699aeb00d4cf6278ba59e9b1e845df20fe3cd791.tar.gz
emacs-699aeb00d4cf6278ba59e9b1e845df20fe3cd791.zip
* frame.c (x_set_frame_parameters): Port --enable-gcc-warnings
to Ubuntu 14.04.1 x86-64.
-rw-r--r--src/ChangeLog3
-rw-r--r--src/frame.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ae4200e7d09..761303a0471 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12014-09-30 Paul Eggert <eggert@cs.ucla.edu> 12014-09-30 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * frame.c (x_set_frame_parameters): Port --enable-gcc-warnings
4 to Ubuntu 14.04.1 x86-64.
5
3 Simplify stack-allocated Lisp objects, and make them more portable. 6 Simplify stack-allocated Lisp objects, and make them more portable.
4 The build_local_string macro was used in two ways: (1) string 7 The build_local_string macro was used in two ways: (1) string
5 literals for which scoped allocation suffices, and (2) file name 8 literals for which scoped allocation suffices, and (2) file name
diff --git a/src/frame.c b/src/frame.c
index 9bc52f1e88f..4b2ffd11e7a 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2988,7 +2988,7 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist)
2988 /* If both of these parameters are present, it's more efficient to 2988 /* If both of these parameters are present, it's more efficient to
2989 set them both at once. So we wait until we've looked at the 2989 set them both at once. So we wait until we've looked at the
2990 entire list before we set them. */ 2990 entire list before we set them. */
2991 int width, height IF_LINT (= 0); 2991 int width IF_LINT (= 0), height IF_LINT (= 0);
2992 bool width_change = 0, height_change = 0; 2992 bool width_change = 0, height_change = 0;
2993 2993
2994 /* Same here. */ 2994 /* Same here. */