diff options
| author | Seiji Zenitani | 2008-12-07 05:00:54 +0000 |
|---|---|---|
| committer | Seiji Zenitani | 2008-12-07 05:00:54 +0000 |
| commit | aa96c42b3a01bd2238cf421a4677fad9adf229da (patch) | |
| tree | e4e08f1eb3710daa77424c4047b5972041b99a96 /src | |
| parent | df36ff1f38e46e3bedc3ccab2a584ad5925ef497 (diff) | |
| download | emacs-aa96c42b3a01bd2238cf421a4677fad9adf229da.tar.gz emacs-aa96c42b3a01bd2238cf421a4677fad9adf229da.zip | |
* nsfns.m (ns_set_background_color): Remove code duplication.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/nsfns.m | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3b40c99fa88..8672bb2b240 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-12-07 Seiji Zenitani <zenitani@mac.com> | ||
| 2 | |||
| 3 | * nsfns.m (ns_set_background_color): Remove code duplication. | ||
| 4 | It was a substite for face-transparency on OS X 10.3. | ||
| 5 | |||
| 1 | 2008-12-06 Chong Yidong <cyd@stupidchicken.com> | 6 | 2008-12-06 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * coding.c (make_conversion_work_buffer): Disable buffer | 8 | * coding.c (make_conversion_work_buffer): Disable buffer |
diff --git a/src/nsfns.m b/src/nsfns.m index df5c7e13daf..0f7b6318e63 100644 --- a/src/nsfns.m +++ b/src/nsfns.m | |||
| @@ -389,14 +389,6 @@ ns_set_background_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval) | |||
| 389 | [[view window] setBackgroundColor: col]; | 389 | [[view window] setBackgroundColor: col]; |
| 390 | alpha = [col alphaComponent]; | 390 | alpha = [col alphaComponent]; |
| 391 | 391 | ||
| 392 | #ifdef NS_IMPL_COCOA | ||
| 393 | /* the alpha code below only works on 10.4, so we need to do something | ||
| 394 | else (albeit less good) otherwise. | ||
| 395 | Check NSApplication.h for useful NSAppKitVersionNumber values. */ | ||
| 396 | if (NSAppKitVersionNumber < 744.0) | ||
| 397 | [[view window] setAlphaValue: alpha]; | ||
| 398 | #endif | ||
| 399 | |||
| 400 | if (alpha != 1.0) | 392 | if (alpha != 1.0) |
| 401 | [[view window] setOpaque: NO]; | 393 | [[view window] setOpaque: NO]; |
| 402 | else | 394 | else |