diff options
| author | Paul Eggert | 2011-03-08 22:40:38 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-03-08 22:40:38 -0800 |
| commit | 77f2391201c5014f9ec83250f753cad4de814c95 (patch) | |
| tree | 559e89daccd9ba2f4ab05397975f238c675451be /src | |
| parent | 73719eba5cbda861e9a7cc296537cd03506418c1 (diff) | |
| download | emacs-77f2391201c5014f9ec83250f753cad4de814c95.tar.gz emacs-77f2391201c5014f9ec83250f753cad4de814c95.zip | |
* xterm.c (x_copy_dpy_color, x_focus_on_frame, x_unfocus_frame):
Remove unused functions.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/xterm.c | 46 |
2 files changed, 3 insertions, 46 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 244a17a61d5..fcb3cbc5dee 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2011-03-09 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-03-09 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * xterm.c (x_copy_dpy_color, x_focus_on_frame, x_unfocus_frame): | ||
| 4 | Remove unused functions. | ||
| 5 | |||
| 3 | * xfaces.c (clear_face_cache, Fx_list_fonts, Fface_font): Rename | 6 | * xfaces.c (clear_face_cache, Fx_list_fonts, Fface_font): Rename |
| 4 | or move locals to avoid shadowing. | 7 | or move locals to avoid shadowing. |
| 5 | (tty_defined_color, merge_face_heights): Now static. | 8 | (tty_defined_color, merge_face_heights): Now static. |
diff --git a/src/xterm.c b/src/xterm.c index 909b6978f5a..49553e3f1e0 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -1791,27 +1791,6 @@ x_copy_color (struct frame *f, long unsigned int pixel) | |||
| 1791 | } | 1791 | } |
| 1792 | 1792 | ||
| 1793 | 1793 | ||
| 1794 | /* Allocate color PIXEL on display DPY. PIXEL must already be allocated. | ||
| 1795 | It's necessary to do this instead of just using PIXEL directly to | ||
| 1796 | get color reference counts right. */ | ||
| 1797 | |||
| 1798 | unsigned long | ||
| 1799 | x_copy_dpy_color (Display *dpy, Colormap cmap, long unsigned int pixel) | ||
| 1800 | { | ||
| 1801 | XColor color; | ||
| 1802 | |||
| 1803 | color.pixel = pixel; | ||
| 1804 | BLOCK_INPUT; | ||
| 1805 | XQueryColor (dpy, cmap, &color); | ||
| 1806 | XAllocColor (dpy, cmap, &color); | ||
| 1807 | UNBLOCK_INPUT; | ||
| 1808 | #ifdef DEBUG_X_COLORS | ||
| 1809 | register_color (pixel); | ||
| 1810 | #endif | ||
| 1811 | return color.pixel; | ||
| 1812 | } | ||
| 1813 | |||
| 1814 | |||
| 1815 | /* Brightness beyond which a color won't have its highlight brightness | 1794 | /* Brightness beyond which a color won't have its highlight brightness |
| 1816 | boosted. | 1795 | boosted. |
| 1817 | 1796 | ||
| @@ -8862,31 +8841,6 @@ x_set_mouse_pixel_position (struct frame *f, int pix_x, int pix_y) | |||
| 8862 | UNBLOCK_INPUT; | 8841 | UNBLOCK_INPUT; |
| 8863 | } | 8842 | } |
| 8864 | 8843 | ||
| 8865 | /* focus shifting, raising and lowering. */ | ||
| 8866 | |||
| 8867 | void | ||
| 8868 | x_focus_on_frame (struct frame *f) | ||
| 8869 | { | ||
| 8870 | #if 0 | ||
| 8871 | /* I don't think that the ICCCM allows programs to do things like this | ||
| 8872 | without the interaction of the window manager. Whatever you end up | ||
| 8873 | doing with this code, do it to x_unfocus_frame too. */ | ||
| 8874 | XSetInputFocus (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), | ||
| 8875 | RevertToPointerRoot, CurrentTime); | ||
| 8876 | #endif /* ! 0 */ | ||
| 8877 | } | ||
| 8878 | |||
| 8879 | void | ||
| 8880 | x_unfocus_frame (struct frame *f) | ||
| 8881 | { | ||
| 8882 | #if 0 | ||
| 8883 | /* Look at the remarks in x_focus_on_frame. */ | ||
| 8884 | if (FRAME_X_DISPLAY_INFO (f)->x_focus_frame == f) | ||
| 8885 | XSetInputFocus (FRAME_X_DISPLAY (f), PointerRoot, | ||
| 8886 | RevertToPointerRoot, CurrentTime); | ||
| 8887 | #endif /* ! 0 */ | ||
| 8888 | } | ||
| 8889 | |||
| 8890 | /* Raise frame F. */ | 8844 | /* Raise frame F. */ |
| 8891 | 8845 | ||
| 8892 | void | 8846 | void |