aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2001-03-25 18:37:29 +0000
committerEli Zaretskii2001-03-25 18:37:29 +0000
commit6a65b1b512446bc33c92efbad765194f681baa30 (patch)
treef6489945b36db1cabd9f57eb23c00e1103f25199 /src
parent6c145d351d1255df9cd7070d0a02ef7e99a5a8fb (diff)
downloademacs-6a65b1b512446bc33c92efbad765194f681baa30.tar.gz
emacs-6a65b1b512446bc33c92efbad765194f681baa30.zip
(Fframe_list): Don't reference tip_frame if HAVE_WINDOW_SYSTEM is not defined.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/frame.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 86ec6b1a13d..3281ff8fef1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12001-03-25 Eli Zaretskii <eliz@is.elta.co.il> 12001-03-25 Eli Zaretskii <eliz@is.elta.co.il>
2 2
3 * frame.c (Fframe_list): Don't reference tip_frame if
4 HAVE_WINDOW_SYSTEM is not defined.
5
3 * emacs.c (main): Update the copyright year. From Werner LEMBERG 6 * emacs.c (main): Update the copyright year. From Werner LEMBERG
4 <wl@gnu.org>. 7 <wl@gnu.org>.
5 8
diff --git a/src/frame.c b/src/frame.c
index 7c6cd89a196..3e84a3d81cf 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -809,8 +809,10 @@ DEFUN ("frame-list", Fframe_list, Sframe_list,
809{ 809{
810 Lisp_Object frames; 810 Lisp_Object frames;
811 frames = Fcopy_sequence (Vframe_list); 811 frames = Fcopy_sequence (Vframe_list);
812#ifdef HAVE_WINDOW_SYSTEM
812 if (FRAMEP (tip_frame)) 813 if (FRAMEP (tip_frame))
813 frames = Fdelq (tip_frame, frames); 814 frames = Fdelq (tip_frame, frames);
815#endif
814 return frames; 816 return frames;
815} 817}
816 818