diff options
| author | Paul Eggert | 2011-06-11 14:31:32 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-11 14:31:32 -0700 |
| commit | 4475bec4dd51b8da9884816d9ca06e4d60a35e15 (patch) | |
| tree | 1f300450eb2241ec23f1b2d43cde8d1284a45754 /src/xterm.c | |
| parent | 6198ccd0b2e8cebc14415e13765de6bb758ec786 (diff) | |
| download | emacs-4475bec4dd51b8da9884816d9ca06e4d60a35e15.tar.gz emacs-4475bec4dd51b8da9884816d9ca06e4d60a35e15.zip | |
* buffer.c (Qclone_number): Remove for now, as it's unused.
(record_buffer, Funrecord_buffer): Rename local to avoid shadowing.
(record_buffer): Remove unused local.
* frame.c (other_visible_frames, frame_buffer_list): Now static.
(set_frame_buffer_list): Remove; unused.
* frame.h (other_visible_frames): Remove decl.
* keyboard.h (menu_items_inuse): Declare only if USE_GTK || USE_MOTIF.
* lisp.h (frame_buffer_list, set_frame_buffer_list): Remove decls.
(add_gpm_wait_descriptor, delete_gpm_wait_descriptor): Declare only
if HAVE_GPM.
* menu.c (menu_items_inuse): Now static unless USE_GTK || USE_MOTIF.
* process.c (add_gpm_wait_descriptor, delete_gpm_wait_descriptor):
Define only if HAVE_GPM.
* widget.c (EmacsFrameResize, emacsFrameClassRec): Now static.
(update_hints_inhibit): Remove; never set. All uses removed.
* widgetprv.h (emacsFrameClassRec): Remove decl.
* window.c (delete_deletable_window): Now returns void, since it
wasn't returning anything.
(compare_window_configurations): Remove unused locals.
* xfns.c (x_set_scroll_bar_default_width): Remove unused locals.
* xmenu.c (x_menu_set_in_use): Define only if USE_GTK || USE_MOTIF.
Omit no-longer-needed #ifdef USE_X_TOOLKIT, since USE_X_TOOLKIT is
implied by USE_GTK || USE_MOTIF.
(dialog_selection_callback) [!USE_GTK]: Prefer intptr_t for integers
the same widths as pointers. This follows up on the 2011-05-06 patch.
* xterm.c (x_alloc_lighter_color_for_widget): Define only if USE_LUCID.
* xterm.h: Likewise.
(x_menu_set_in_use): Declare only if USE_GTK || USE_MOTIF.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/xterm.c b/src/xterm.c index d6d6457f522..9673e5e315e 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -1446,6 +1446,8 @@ x_frame_of_widget (Widget widget) | |||
| 1446 | } | 1446 | } |
| 1447 | 1447 | ||
| 1448 | 1448 | ||
| 1449 | #ifdef USE_LUCID | ||
| 1450 | |||
| 1449 | /* Allocate a color which is lighter or darker than *PIXEL by FACTOR | 1451 | /* Allocate a color which is lighter or darker than *PIXEL by FACTOR |
| 1450 | or DELTA. Try a color with RGB values multiplied by FACTOR first. | 1452 | or DELTA. Try a color with RGB values multiplied by FACTOR first. |
| 1451 | If this produces the same color as PIXEL, try a color where all RGB | 1453 | If this produces the same color as PIXEL, try a color where all RGB |
| @@ -1461,6 +1463,8 @@ x_alloc_lighter_color_for_widget (Widget widget, Display *display, Colormap cmap | |||
| 1461 | return x_alloc_lighter_color (f, display, cmap, pixel, factor, delta); | 1463 | return x_alloc_lighter_color (f, display, cmap, pixel, factor, delta); |
| 1462 | } | 1464 | } |
| 1463 | 1465 | ||
| 1466 | #endif | ||
| 1467 | |||
| 1464 | 1468 | ||
| 1465 | /* Structure specifying which arguments should be passed by Xt to | 1469 | /* Structure specifying which arguments should be passed by Xt to |
| 1466 | cvt_string_to_pixel. We want the widget's screen and colormap. */ | 1470 | cvt_string_to_pixel. We want the widget's screen and colormap. */ |