Mercurial > emacs
annotate etc/COOKIES @ 83004:7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
lib-src/emacsclient.c (window_change_signal): Renamed to pass_signal_to_emacs.
(init_signal): Pass SIGINT and SIGQUIT to the emacs process.
lisp/faces.el (face-valid-attribute-values): Use the window-system
function, not the variable.
(read-face-attribute, face-spec-set-match-display, frame-set-background-mode)
(face-set-after-frame-default): Ditto.
lisp/frame.el (make-frame-on-tty): Added interactive declaration
(suggested by Robert J. Chassell). Use tty-create-frame-with-faces,
not make-terminal-frame.
src/termhooks.h (struct display_method): Renamed to display for brevity.
(struct display): Added all display hook variables as members of this structure.
Added next_display, reference_count, type and display_info components.
(FRAME_MUST_WRITE_SPACES, FRAME_FAST_CLEAR_END_OF_LINE, FRAME_LINE_INS_DEL_OK)
(FRAME_CHAR_INS_DEL_OK, FRAME_SCROLL_REGION_OK, FRAME_SCROLL_REGION_COST)
(FRAME_MEMORY_BELOW_FRAME, FRAME_RIF): Updated for struct display.
(FRAME_DISPLAY): New macro.
(create_display, delete_display): New prototypes.
src/frame.h (struct frame): Added `display' member, removed display_method.
(FRAME_LIVE_P): Look at f->display, not f->output_data.
src/termchar.h (struct tty_display_info): Removed display_method component.
(FRAME_TTY): Use the display structure, not output_data.
src/term.c (display_list): New variable.
(cursor_to_hook, raw_cursor_to_hook, clear_to_end_hook, clear_frame_hook)
(clear_end_of_line_hook, ins_del_lines_hook, delete_glyphs_hook)
(ring_bell_hook, reset_terminal_modes_hook, set_terminal_modes_hook)
(update_begin_hook, update_end_hook, set_terminal_window_hook)
(insert_glyphs_hook, write_glyphs_hook, delete_glyphs_hoo, read_socket_hook)
(frame_up_to_date_hook, mouse_position_hook, frame_rehighlight_hook)
(frame_raise_lower_hook, set_vertical_scroll_bar_hook, condemn_scroll_bars_hook)
(redeem_scroll_bar_hook, judge_scroll_bars_hook): Moved to struct display.
(tty_display_method_template): Removed.
(syms_of_term): Don't initialize tty_display_method_template.
(ring_bell, set_terminal_modes, reset_terminal_modes, update_begin)
(update_end, set_terminal_window, cursor_to, raw_cursor_to, clear_to_end)
(clear_frame, clear_end_of_line, write_glyphs, insert_glyphs)
(delete_glyphs, ins_del_lines): Access display hooks through the frame pointer.
(Ftty_display_color_p): Use the frame given as a parameter, or else return nil.
(Ftty_display_color_cells): Ditto.
(get_named_tty): Renamed to get_named_tty_display, changed return type to struct display.
(term_dummy_init): Renamed to initial_term_init. Create and return an initial display.
(term_init): Initialize a new struct display and return a pointer to
it instead of tty_display_info. Removed frame initialization kludge.
(Fdelete_tty): Updated for struct display.
(delete_tty): The parameter type is now struct display, not tty_display_info.
Delete the display, too.
(create_tty_output): New function for creating tty_output structures.
(delete_tty_output): New function for deleting tty_output structures.
(create_display): New function for creating and registering display structures.
(delete_display): New function for deleting and unregistering display structures.
src/dispextern.h: Updated prototypes.
src/dispnew.c: Include frame.h before termhooks.h.
(init_display): Updated term_init call to new signature.
src/emacs.c: Include frame.h (for termhooks.h).
src/keymap.c: Ditto.
src/lread.c: Ditto.
src/xsmfns.c: Ditto.
src/process.c: Include frame.h before termhooks.h.
src/frame.c (Fwindow_system): New function.
(syms_of_frame): Initialize it.
(make_terminal_frame): Open the terminal device before creating the new frame.
Disable scrollbars here, term_init cannot do that anymore.
(Fdelete_frame): Use the new delete_frame_hook, don't do display-specific
frame deletion here. Ditto for delete_display_hook.
(Fmouse_position, Fmouse_pixel_position, Fraise_frame, Flower_frame)
(Fredirect_frame_focus): Access display hooks through the frame pointer.
src/keyboard.c: Include frame.h before termhooks.h.
(start_polling, input_polling_used, stop_polling, gobble_input): Ignore read_socket_hook.
(kbd_buffer_get_event, Fset_input_mode): Access display hooks through the frame pointer.
(read_avail_input): Loop through all display devices for and call all read_socket_hook functions. Check ttys even if read_socket_hook returned an error.
src/sysdep.c (discard_tty_input): Ignore read_socket_hook.
(stuff_char): Don't do anything if the current frame is not on a termcap display.
(request_sigio, unrequest_sigio): Ignore read_socket_hook.
(init_sys_modes): Always call narrow_foreground_group. Set up terminal modes and sigio even under X.
src/xdisp.c (message2_nolog, message3_nolog, redisplay_internal)
(set_vertical_scroll_bar, redisplay_window): Access display hooks through the frame pointer.
(echo_area_display): Don't be afraid of termcap frames during an X+tty combo session.
src/xfaces.c: Include termhooks.h.
(Ftty_supports_face_attributes_p): Use the given frame, not selected_frame.
src/xfns.c (x_set_scroll_bar_foreground, x_set_scroll_bar_background): Access display hooks through the frame pointer.
(Fx_create_frame, x_create_tip_frame): Initialize the frame's display structure.
src/xmenu.c: Include termhooks.h after frame.h.
src/xselect.c (x_own_selection, some_frame_on_display, x_get_foreign_selection)
(Fx_disown_selection_internal, Fx_get_cut_buffer_internal)
(Fx_store_cut_buffer_internal, Fx_rotate_cut_buffers_internal): Don't do anything
if the selected frame is not an X frame.
src/xterm.c (x_display_method): Removed.
(x_create_frame_display, x_delete_frame_display): New functions for handling struct display objects.
(x_term_init): Set up a new struct display object, too.
(x_delete_display): Delete the struct display corresponding to the X display.
(x_initialize): Moved hook initialization to x_create_frame_display.
src/xterm.h (x_display_method): Removed.
(struct x_display_info): Added frame_display component.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-44
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 05 Jan 2004 05:54:35 +0000 |
parents | 23a1cea22d13 |
children | 0ebcdaee8a4e |
rev | line source |
---|---|
25852 | 1 [Someone sent this in from California, and we decided to extend |
2 our campaign against information hoarding to recipes as well | |
3 as software. (Recipes are the closest thing, not involving computers, | |
4 to software.) | |
5 | |
6 The story appears to be a myth, according to the Chicago Tribune, | |
7 which says that Mrs Fields Cookies hoards the information completely. | |
8 Therefore, this recipe can be thought of as a compatible replacement. | |
9 We have reports that the cookies it makes are pretty good.] | |
10 | |
11 Someone at PG&E called the Mrs. Fields Cookie office | |
12 and requested the recipe for her cookies. They asked | |
13 her for her charge card number, and she gave it to them | |
14 thinking the cost would be $15 to $25. It turned out | |
15 to be $200! | |
16 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25852
diff
changeset
|
17 Therefore, this person is giving the recipe to anyone |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25852
diff
changeset
|
18 and everyone she knows (and doesn't know) so that |
25852 | 19 someone can get use of her $200. Anyway, just keep |
20 passing it on. | |
21 | |
22 Cream together: 2 cups butter | |
23 2 cups sugar | |
24 2 cups brown sugar | |
25 | |
26 Add: 4 eggs | |
27 2 tsp. vanilla | |
28 | |
29 Mis together in | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25852
diff
changeset
|
30 separate bowl: 4 cups flour |
25852 | 31 5 cups oatmeal (put small |
32 amounts of oatmeal in blender until it turns to | |
33 powder. Measure out 5 cups of oatmeal and only | |
34 "powderize" that, NOT 5 cups "powderized" oatmeal) | |
35 | |
36 1 tsp salt | |
37 2 tsp baking powder | |
38 2 tsp baking soda | |
39 | |
40 Mix: All of the above | |
41 | |
42 Add: 24 oz. bag of chocolate chips and | |
43 1 finely grated 8 oz Hershey bar (plain) | |
44 | |
45 Add: 3 cups chopped nuts (any kind) | |
46 | |
47 Bake on greased cookie sheet (make golf ball sized balls) and | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25852
diff
changeset
|
48 bake about two inches apart. Bake at 350 degrees for 8 - 10 |
25852 | 49 minutes. DO NOT OVERBAKE. Makes 112. |
50 | |
51 From: ucdavis!lll-lcc!hplabs!parcvax!bane@ucbvax.berkeley.edu (John R. Bane) | |
52 Subject: Re: free cookie foundation? | |
53 | |
54 Hi! I "stole" your very expensive cookie recipe off the net. If you | |
55 want to send me your SnailMail address, I'll be glad to send you a | |
56 dollar (I would like to suggest this to the net, but I think there is | |
57 some netiquette rule against asking for money - or is that only money | |
58 for oneself?) to help defray the cost (it's not much, but if EVERYone | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25852
diff
changeset
|
59 who took the recipe sent you a dollar, it would help). |
25852 | 60 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25852
diff
changeset
|
61 Here also is another cookie recipe which I'm very fond of. |
25852 | 62 |
63 Makes 6-8 dozen | |
64 Bake at 375 degrees for ~10 min. | |
65 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25852
diff
changeset
|
66 Cream together: |
25852 | 67 |
68 1 cup shortening (I use Weight Watcher's Reduced Calorie Margarine!) | |
69 1/4 cup peanut butter (I recommend the non-sugared kind) | |
70 1/2 cup sugar | |
71 1/2 cup brown sugar | |
72 2 eggs | |
73 1 teaspoon vanilla | |
74 | |
75 Add: | |
76 | |
77 1/2 cup flour | |
78 1 teaspoon soda | |
79 1/2 teaspoon salt | |
80 2 cups rolled oats (I use the 5-min variety) | |
81 1-2 cups chocolate chips (I use 2 cups semi-sweet - ummmm!) | |
82 1 cup nuts (I use pecan pieces - don't get them crushed, or the extra | |
83 oil will make greasy cookies) | |
84 1 cup shredded or flaked coconut | |
85 | |
86 (The nuts were listed as optional and I added the coconut myself, but | |
87 I really love them there! You could also add things like m&m's, or | |
88 raisins (I don't care for raisins in cookies, but you might). I've | |
89 always wanted to try banana chips.) | |
90 | |
91 Mix well. Drop by teaspoonfuls on greased cookie sheet (I use pam). | |
92 Bake at 375 degrees for approx. 10 min. | |
93 | |
94 My aunt found this recipe in an Amish book called something like | |
95 "Eating Well When The Whole World Is Starving," and although I thought | |
96 a cookie recipe was a bit odd for a book like that, they are about the | |
97 healthiest a cookie is ever likely to get. | |
98 | |
99 They are also very easy to make (no blending, sifting, rolling, etc.) | |
100 and extremely delicious. I get rave reviews and recipe requests whenever | |
101 I make them. | |
102 | |
103 - rene | |
104 | |
105 Chocolate Chip Cookies - Glamorous, crunchy, rich with chocolate bits & nuts. | |
106 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25852
diff
changeset
|
107 Also known as "Toll House" Cookies ... from Kenneth and Ruth Wakefield's |
25852 | 108 charming New England Toll House on the outskirts of Whitman, Massachusetts. |
109 These cookies were first introduced to American homemakers in 1939 through | |
110 our series of radio talks on "Famous Foods From Famous Eating Places." | |
111 | |
112 Mix Thoroughly : | |
113 2/3 cup soft shortening ( part butter ) | |
114 1/2 cup granulated sugar | |
115 1/2 cup brown sugar ( packed ) | |
116 1 egg | |
117 1 tsp vanilla | |
118 | |
119 Sift together and stir in : | |
120 1-1/2 cups sifted flour (*) | |
121 1/2 tsp soda | |
122 1/2 tsp salt | |
123 | |
124 Stir in : | |
125 1/2 cup cut-up nuts | |
126 6 oz package of semi-sweet chocolate pieces ( about 1-1/4 cups ) | |
127 | |
128 | |
129 (*) for a softer, more rounded cookie, use 1-3/4 cups sifted flour. | |
130 | |
131 | |
132 Drop rounded teaspoonfuls about 2" apart on ungreased baking sheet. Bake until | |
133 delicately browned ... cookies should still be soft. Cool slightly before you | |
134 remove them from the baking sheet. | |
135 | |
136 Temperature: 375 F. ( modern oven ) | |
137 Time: bake 8 - 10 minutes | |
138 Amount: 4 - 5 dozen 2" cookies | |
139 | |
140 | |
141 ===== | |
142 | |
143 Personal comments : | |
144 | |
145 I find it tastes better with a mixture of shortening and butter, as they say. | |
146 | |
147 You don't need << all >> of that sugar, and it can be whatever color you want. | |
148 | |
149 The nuts are optional. Feel free to play with the recipe. I put oatmeal in it, | |
150 reducing flour accordingly, and sometimes cinnamon. | |
151 | |
152 I also find it useful to grease the cookie sheets. | |
153 | |
154 I think I'm going to go bake some now ... | |
155 | |
156 -- richard | |
157 |