diff options
| author | Miles Bader | 2007-10-19 00:00:21 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-10-19 00:00:21 +0000 |
| commit | 9c8020a8df03dc67a56d7df15664dcf7ace54bf0 (patch) | |
| tree | 09b0646addff3c39f9e96ba89c04bdcc038a87a7 /src/frame.c | |
| parent | dfc3268dfa133a2e0a677f1af7c1ee548eae065d (diff) | |
| parent | bd3164743080f3eb5fc316aca7cc5322ca58fe33 (diff) | |
| download | emacs-9c8020a8df03dc67a56d7df15664dcf7ace54bf0.tar.gz emacs-9c8020a8df03dc67a56d7df15664dcf7ace54bf0.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 890-898)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 122-128)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 257-258)
- Merge from emacs--rel--22
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-270
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/frame.c b/src/frame.c index 389a94ae3e8..5c89c96a239 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -2299,8 +2299,7 @@ store_frame_param (f, prop, val) | |||
| 2299 | { | 2299 | { |
| 2300 | Lisp_Object valcontents; | 2300 | Lisp_Object valcontents; |
| 2301 | valcontents = SYMBOL_VALUE (prop); | 2301 | valcontents = SYMBOL_VALUE (prop); |
| 2302 | if ((BUFFER_LOCAL_VALUEP (valcontents) | 2302 | if ((BUFFER_LOCAL_VALUEP (valcontents)) |
| 2303 | || SOME_BUFFER_LOCAL_VALUEP (valcontents)) | ||
| 2304 | && XBUFFER_LOCAL_VALUE (valcontents)->check_frame | 2303 | && XBUFFER_LOCAL_VALUE (valcontents)->check_frame |
| 2305 | && XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame | 2304 | && XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame |
| 2306 | && XFRAME (XBUFFER_LOCAL_VALUE (valcontents)->frame) == f) | 2305 | && XFRAME (XBUFFER_LOCAL_VALUE (valcontents)->frame) == f) |