diff options
| author | Richard M. Stallman | 2006-01-18 01:48:49 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2006-01-18 01:48:49 +0000 |
| commit | edd1c6857ecfb345734ef01b0dbcd7208e207fc7 (patch) | |
| tree | a5a2adf308246c4faa231266cfd3aadc0fe28272 /src | |
| parent | 6bca59a3cc30a07745051856b61de05949ac2835 (diff) | |
| download | emacs-edd1c6857ecfb345734ef01b0dbcd7208e207fc7.tar.gz emacs-edd1c6857ecfb345734ef01b0dbcd7208e207fc7.zip | |
(x_frame_get_and_record_arg): Don't record Qunbound value in f->param_alist.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/frame.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b9bb573b326..848af025861 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-01-17 Richard M. Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * frame.c (x_frame_get_and_record_arg): Don't record Qunbound | ||
| 4 | value in f->param_alist. | ||
| 5 | |||
| 1 | 2006-01-15 Andreas Schwab <schwab@suse.de> | 6 | 2006-01-15 Andreas Schwab <schwab@suse.de> |
| 2 | 7 | ||
| 3 | * search.c (Freplace_match): Use UPPERCASEP instead of !NOCASEP. | 8 | * search.c (Freplace_match): Use UPPERCASEP instead of !NOCASEP. |
diff --git a/src/frame.c b/src/frame.c index 624e1a89b86..9060f7b47c5 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -3604,7 +3604,7 @@ x_frame_get_and_record_arg (f, alist, param, attribute, class, type) | |||
| 3604 | 3604 | ||
| 3605 | value = x_get_arg (FRAME_X_DISPLAY_INFO (f), alist, param, | 3605 | value = x_get_arg (FRAME_X_DISPLAY_INFO (f), alist, param, |
| 3606 | attribute, class, type); | 3606 | attribute, class, type); |
| 3607 | if (! NILP (value)) | 3607 | if (! NILP (value) && ! EQ (value, Qunbound)) |
| 3608 | store_frame_param (f, param, value); | 3608 | store_frame_param (f, param, value); |
| 3609 | 3609 | ||
| 3610 | return value; | 3610 | return value; |