aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2007-02-02 09:35:02 +0000
committerJan Djärv2007-02-02 09:35:02 +0000
commit849bb789c8c8863291569284163f7cef2ed57229 (patch)
tree5e3543d7e299f802568a9444bc9b0aa617e42bfc /src
parentb05db979e489255731c36b0f4d02b1e3aff4642b (diff)
downloademacs-849bb789c8c8863291569284163f7cef2ed57229.tar.gz
emacs-849bb789c8c8863291569284163f7cef2ed57229.zip
(do_ewmh_fullscreen): Check that what != NULL before
calling wm_supports.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xterm.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 515f5a334cb..bfc82e05a5e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12007-02-02 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * xterm.c (do_ewmh_fullscreen): Check that what != NULL before
4 calling wm_supports.
5
12007-02-01 Juanma Barranquero <lekktu@gmail.com> 62007-02-01 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * lread.c (syms_of_lread) <user-init-file>: Doc fix. 8 * lread.c (syms_of_lread) <user-init-file>: Doc fix.
diff --git a/src/xterm.c b/src/xterm.c
index e3fb3ae1c14..3650f3cc541 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8442,7 +8442,7 @@ do_ewmh_fullscreen (f)
8442 break; 8442 break;
8443 } 8443 }
8444 8444
8445 if (!wm_supports (f, what)) return 0; 8445 if (what != NULL && !wm_supports (f, what)) return 0;
8446 8446
8447 8447
8448 Fx_send_client_event (frame, make_number (0), frame, 8448 Fx_send_client_event (frame, make_number (0), frame,