diff options
| author | Kim F. Storm | 2002-08-30 12:07:52 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2002-08-30 12:07:52 +0000 |
| commit | c76654a23a60e3b5ddccfe9ea813e1dc7cf7bf89 (patch) | |
| tree | f2b916e39c8cbc0c7ffde5da36fcfd65bc570ac1 /src | |
| parent | f0c8e81d17e8c7b3989ab82be9a88872f99f894d (diff) | |
| download | emacs-c76654a23a60e3b5ddccfe9ea813e1dc7cf7bf89.tar.gz emacs-c76654a23a60e3b5ddccfe9ea813e1dc7cf7bf89.zip | |
(Qbar, Qbox): Removed.
(syms_of_macfns): Don't intern or staticpro them.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/macfns.c | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index baea03c5363..4b15b68aa4f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -37,7 +37,9 @@ | |||
| 37 | 37 | ||
| 38 | * macfns.c (x_specified_cursor_type): Removed. | 38 | * macfns.c (x_specified_cursor_type): Removed. |
| 39 | (x_set_cursor_type): Use set_frame_cursor_types. | 39 | (x_set_cursor_type): Use set_frame_cursor_types. |
| 40 | 40 | (Qbar, Qbox): Removed. | |
| 41 | (syms_of_macfns): Don't intern or staticpro them. | ||
| 42 | |||
| 41 | * macterm.c (x_specified_cursor_type): Remove prototype. | 43 | * macterm.c (x_specified_cursor_type): Remove prototype. |
| 42 | (x_draw_bar_cursor): Use FRAME_CURSOR_WIDTH. | 44 | (x_draw_bar_cursor): Use FRAME_CURSOR_WIDTH. |
| 43 | (x_display_and_set_cursor): Use get_window_cursor_type. | 45 | (x_display_and_set_cursor): Use get_window_cursor_type. |
diff --git a/src/macfns.c b/src/macfns.c index 8ec44b18f15..88a7774a4f7 100644 --- a/src/macfns.c +++ b/src/macfns.c | |||
| @@ -199,10 +199,8 @@ Lisp_Object Vx_pixel_size_width_font_regexp; | |||
| 199 | /*&&& symbols declared here &&&*/ | 199 | /*&&& symbols declared here &&&*/ |
| 200 | Lisp_Object Qauto_raise; | 200 | Lisp_Object Qauto_raise; |
| 201 | Lisp_Object Qauto_lower; | 201 | Lisp_Object Qauto_lower; |
| 202 | Lisp_Object Qbar; | ||
| 203 | Lisp_Object Qborder_color; | 202 | Lisp_Object Qborder_color; |
| 204 | Lisp_Object Qborder_width; | 203 | Lisp_Object Qborder_width; |
| 205 | Lisp_Object Qbox; | ||
| 206 | Lisp_Object Qcursor_color; | 204 | Lisp_Object Qcursor_color; |
| 207 | Lisp_Object Qcursor_type; | 205 | Lisp_Object Qcursor_type; |
| 208 | Lisp_Object Qgeometry; | 206 | Lisp_Object Qgeometry; |
| @@ -9889,14 +9887,10 @@ syms_of_macfns () | |||
| 9889 | staticpro (&Qauto_raise); | 9887 | staticpro (&Qauto_raise); |
| 9890 | Qauto_lower = intern ("auto-lower"); | 9888 | Qauto_lower = intern ("auto-lower"); |
| 9891 | staticpro (&Qauto_lower); | 9889 | staticpro (&Qauto_lower); |
| 9892 | Qbar = intern ("bar"); | ||
| 9893 | staticpro (&Qbar); | ||
| 9894 | Qborder_color = intern ("border-color"); | 9890 | Qborder_color = intern ("border-color"); |
| 9895 | staticpro (&Qborder_color); | 9891 | staticpro (&Qborder_color); |
| 9896 | Qborder_width = intern ("border-width"); | 9892 | Qborder_width = intern ("border-width"); |
| 9897 | staticpro (&Qborder_width); | 9893 | staticpro (&Qborder_width); |
| 9898 | Qbox = intern ("box"); | ||
| 9899 | staticpro (&Qbox); | ||
| 9900 | Qcursor_color = intern ("cursor-color"); | 9894 | Qcursor_color = intern ("cursor-color"); |
| 9901 | staticpro (&Qcursor_color); | 9895 | staticpro (&Qcursor_color); |
| 9902 | Qcursor_type = intern ("cursor-type"); | 9896 | Qcursor_type = intern ("cursor-type"); |