diff options
| author | Eli Zaretskii | 2001-10-25 20:48:33 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2001-10-25 20:48:33 +0000 |
| commit | b23236fbe35fd850428ece919333ba9af28e67be (patch) | |
| tree | f240f4610d04c610bfb8c65be47ad911e8b039d9 /src | |
| parent | 1d57ac826d5f4bd7051f259f492affa1980752d9 (diff) | |
| download | emacs-b23236fbe35fd850428ece919333ba9af28e67be.tar.gz emacs-b23236fbe35fd850428ece919333ba9af28e67be.zip | |
(Fframe_parameter): Fix last change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/frame.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 94c596df8ed..0083f018313 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2001-10-25 Eli Zaretskii <eliz@is.elta.co.il> | ||
| 2 | |||
| 3 | * frame.c (Fframe_parameter): Fix last change. | ||
| 4 | |||
| 1 | 2001-10-25 Gerd Moellmann <gerd@gnu.org> | 5 | 2001-10-25 Gerd Moellmann <gerd@gnu.org> |
| 2 | 6 | ||
| 3 | * frame.c (Fframe_parameter): Fix a bug whereby some | 7 | * frame.c (Fframe_parameter): Fix a bug whereby some |
diff --git a/src/frame.c b/src/frame.c index 8720d7a3ae9..8d9ef248d01 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -2121,10 +2121,11 @@ If FRAME is nil, describe the currently selected frame. */) | |||
| 2121 | } | 2121 | } |
| 2122 | } | 2122 | } |
| 2123 | } | 2123 | } |
| 2124 | else | ||
| 2125 | value = Fcdr (Fassq (parameter, Fframe_parameters (frame))); | ||
| 2124 | } | 2126 | } |
| 2125 | else if (EQ (parameter, Qdisplay_type) | 2127 | else if (EQ (parameter, Qdisplay_type) |
| 2126 | || EQ (parameter, Qbackground_mode)) | 2128 | || EQ (parameter, Qbackground_mode)) |
| 2127 | /* Avoid consing in frequent cases. */ | ||
| 2128 | value = Fcdr (Fassq (parameter, f->param_alist)); | 2129 | value = Fcdr (Fassq (parameter, f->param_alist)); |
| 2129 | else | 2130 | else |
| 2130 | value = Fcdr (Fassq (parameter, Fframe_parameters (frame))); | 2131 | value = Fcdr (Fassq (parameter, Fframe_parameters (frame))); |