diff options
| author | Paul Eggert | 2011-07-10 23:05:57 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-07-10 23:05:57 -0700 |
| commit | da85a02af7585384008d3ebec836a7b8571f175d (patch) | |
| tree | e6d4f34119ea1c45985eaed207ef6b47f650ea93 /src/widget.c | |
| parent | 7f5515125fbc9b46454e1f84b7e3052a0a5326f0 (diff) | |
| parent | 4d45a8b7a237e1d33d0ae71d95a0ed7165ea6cda (diff) | |
| download | emacs-da85a02af7585384008d3ebec836a7b8571f175d.tar.gz emacs-da85a02af7585384008d3ebec836a7b8571f175d.zip | |
Merge from trunk.
Diffstat (limited to 'src/widget.c')
| -rw-r--r-- | src/widget.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/widget.c b/src/widget.c index 6d871ad7cb2..a09ec2631ad 100644 --- a/src/widget.c +++ b/src/widget.c | |||
| @@ -224,8 +224,7 @@ get_wm_shell (Widget w) | |||
| 224 | #if 0 /* Currently not used. */ | 224 | #if 0 /* Currently not used. */ |
| 225 | 225 | ||
| 226 | static void | 226 | static void |
| 227 | mark_shell_size_user_specified (wmshell) | 227 | mark_shell_size_user_specified (Widget wmshell) |
| 228 | Widget wmshell; | ||
| 229 | { | 228 | { |
| 230 | if (! XtIsWMShell (wmshell)) abort (); | 229 | if (! XtIsWMShell (wmshell)) abort (); |
| 231 | /* This is kind of sleazy, but I can't see how else to tell it to make it | 230 | /* This is kind of sleazy, but I can't see how else to tell it to make it |
| @@ -510,8 +509,7 @@ update_wm_hints (EmacsFrame ew) | |||
| 510 | #if 0 | 509 | #if 0 |
| 511 | 510 | ||
| 512 | static void | 511 | static void |
| 513 | create_frame_gcs (ew) | 512 | create_frame_gcs (EmacsFrame ew) |
| 514 | EmacsFrame ew; | ||
| 515 | { | 513 | { |
| 516 | struct frame *s = ew->emacs_frame.frame; | 514 | struct frame *s = ew->emacs_frame.frame; |
| 517 | 515 | ||