diff options
| author | Dan Nicolaescu | 2009-11-06 06:50:52 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2009-11-06 06:50:52 +0000 |
| commit | d67b4f80dbe514d6e351e7d89c78921c85e7dbe7 (patch) | |
| tree | da83a5dc49e499e330365feaa8123709fdf0cc88 /src/textprop.c | |
| parent | 495bd5ca19cf79a9e91b77bf2e2ea37b8be3ef1f (diff) | |
| download | emacs-d67b4f80dbe514d6e351e7d89c78921c85e7dbe7.tar.gz emacs-d67b4f80dbe514d6e351e7d89c78921c85e7dbe7.zip | |
* xterm.c (syms_of_xterm):
* xselect.c (syms_of_xselect):
* xmenu.c (syms_of_xmenu):
* xfns.c (syms_of_xfns):
* xfaces.c (syms_of_xfaces):
* xdisp.c (syms_of_xdisp):
* window.c (syms_of_window):
* w32fns.c (syms_of_w32fns):
* undo.c (syms_of_undo):
* textprop.c (syms_of_textprop):
* terminal.c (syms_of_terminal):
* syntax.c (syms_of_syntax):
* sound.c (syms_of_sound):
* search.c (syms_of_search):
* print.c (syms_of_print):
* minibuf.c (syms_of_minibuf):
* macros.c (syms_of_macros):
* keymap.c (syms_of_keymap, initial_define_key)
(initial_define_lispy_key):
* keyboard.c (syms_of_keyboard):
* insdel.c (syms_of_insdel):
* image.c (syms_of_image):
* fringe.c (syms_of_fringe):
* frame.c (syms_of_frame):
* fontset.c (syms_of_fontset):
* fns.c (syms_of_fns):
* fns.c (syms_of_fns):
* fileio.c (syms_of_fileio):
* fileio.c (syms_of_fileio):
* eval.c (syms_of_eval):
* doc.c (syms_of_doc):
* dispnew.c (syms_of_display):
* dired.c (syms_of_dired):
* dbusbind.c (syms_of_dbusbind):
* data.c (syms_of_data):
* composite.c (syms_of_composite):
* coding.c (syms_of_coding):
* cmds.c (syms_of_cmds):
* charset.c (define_charset_internal, syms_of_character):
* ccl.c (syms_of_ccl):
* category.c (syms_of_category, init_category_once):
* casetab.c (syms_of_casetab):
* casefiddle.c (syms_of_casefiddle):
* callint.c (syms_of_callint):
* bytecode.c (syms_of_bytecode):
* buffer.c (keys_of_buffer, syms_of_buffer):
* alloc.c (syms_of_alloc):
* process.c (syms_of_process, init_process):
* lread.c (syms_of_lread, init_obarray):
* font.c (build_style_table):
* emacs.c (syms_of_emacs, main): Replace calls to intern with
intern_c_string, calls to make_pure_string with
make_pure_c_string. Use pure_cons instead of Fcons.
* process.c (socket_options): Make it const.
(set_socket_option, init_process): Use a const pointer.
* lread.c (intern_c_string): New function.
(defvar_kboard, defvar_lisp, defvar_lisp_nopro, defvar_bool)
(defvar_int): Uset it. Make the name const char*.
* font.c (struct table_entry): Remove unused member. Make NAMES
constant.
(weight_table, slant_table, width_table): Make constant.
* emacs.c (struct standard_args): Make name and longname constant.
Diffstat (limited to 'src/textprop.c')
| -rw-r--r-- | src/textprop.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/textprop.c b/src/textprop.c index e82af12d90a..3df5cc9204d 100644 --- a/src/textprop.c +++ b/src/textprop.c | |||
| @@ -2300,7 +2300,7 @@ inherits it if NONSTICKINESS is nil. The `front-sticky' and | |||
| 2300 | `rear-nonsticky' properties of the character override NONSTICKINESS. */); | 2300 | `rear-nonsticky' properties of the character override NONSTICKINESS. */); |
| 2301 | /* Text property `syntax-table' should be nonsticky by default. */ | 2301 | /* Text property `syntax-table' should be nonsticky by default. */ |
| 2302 | Vtext_property_default_nonsticky | 2302 | Vtext_property_default_nonsticky |
| 2303 | = Fcons (Fcons (intern ("syntax-table"), Qt), Qnil); | 2303 | = Fcons (Fcons (intern_c_string ("syntax-table"), Qt), Qnil); |
| 2304 | 2304 | ||
| 2305 | staticpro (&interval_insert_behind_hooks); | 2305 | staticpro (&interval_insert_behind_hooks); |
| 2306 | staticpro (&interval_insert_in_front_hooks); | 2306 | staticpro (&interval_insert_in_front_hooks); |
| @@ -2311,44 +2311,44 @@ inherits it if NONSTICKINESS is nil. The `front-sticky' and | |||
| 2311 | /* Common attributes one might give text */ | 2311 | /* Common attributes one might give text */ |
| 2312 | 2312 | ||
| 2313 | staticpro (&Qforeground); | 2313 | staticpro (&Qforeground); |
| 2314 | Qforeground = intern ("foreground"); | 2314 | Qforeground = intern_c_string ("foreground"); |
| 2315 | staticpro (&Qbackground); | 2315 | staticpro (&Qbackground); |
| 2316 | Qbackground = intern ("background"); | 2316 | Qbackground = intern_c_string ("background"); |
| 2317 | staticpro (&Qfont); | 2317 | staticpro (&Qfont); |
| 2318 | Qfont = intern ("font"); | 2318 | Qfont = intern_c_string ("font"); |
| 2319 | staticpro (&Qstipple); | 2319 | staticpro (&Qstipple); |
| 2320 | Qstipple = intern ("stipple"); | 2320 | Qstipple = intern_c_string ("stipple"); |
| 2321 | staticpro (&Qunderline); | 2321 | staticpro (&Qunderline); |
| 2322 | Qunderline = intern ("underline"); | 2322 | Qunderline = intern_c_string ("underline"); |
| 2323 | staticpro (&Qread_only); | 2323 | staticpro (&Qread_only); |
| 2324 | Qread_only = intern ("read-only"); | 2324 | Qread_only = intern_c_string ("read-only"); |
| 2325 | staticpro (&Qinvisible); | 2325 | staticpro (&Qinvisible); |
| 2326 | Qinvisible = intern ("invisible"); | 2326 | Qinvisible = intern_c_string ("invisible"); |
| 2327 | staticpro (&Qintangible); | 2327 | staticpro (&Qintangible); |
| 2328 | Qintangible = intern ("intangible"); | 2328 | Qintangible = intern_c_string ("intangible"); |
| 2329 | staticpro (&Qcategory); | 2329 | staticpro (&Qcategory); |
| 2330 | Qcategory = intern ("category"); | 2330 | Qcategory = intern_c_string ("category"); |
| 2331 | staticpro (&Qlocal_map); | 2331 | staticpro (&Qlocal_map); |
| 2332 | Qlocal_map = intern ("local-map"); | 2332 | Qlocal_map = intern_c_string ("local-map"); |
| 2333 | staticpro (&Qfront_sticky); | 2333 | staticpro (&Qfront_sticky); |
| 2334 | Qfront_sticky = intern ("front-sticky"); | 2334 | Qfront_sticky = intern_c_string ("front-sticky"); |
| 2335 | staticpro (&Qrear_nonsticky); | 2335 | staticpro (&Qrear_nonsticky); |
| 2336 | Qrear_nonsticky = intern ("rear-nonsticky"); | 2336 | Qrear_nonsticky = intern_c_string ("rear-nonsticky"); |
| 2337 | staticpro (&Qmouse_face); | 2337 | staticpro (&Qmouse_face); |
| 2338 | Qmouse_face = intern ("mouse-face"); | 2338 | Qmouse_face = intern_c_string ("mouse-face"); |
| 2339 | staticpro (&Qminibuffer_prompt); | 2339 | staticpro (&Qminibuffer_prompt); |
| 2340 | Qminibuffer_prompt = intern ("minibuffer-prompt"); | 2340 | Qminibuffer_prompt = intern_c_string ("minibuffer-prompt"); |
| 2341 | 2341 | ||
| 2342 | /* Properties that text might use to specify certain actions */ | 2342 | /* Properties that text might use to specify certain actions */ |
| 2343 | 2343 | ||
| 2344 | staticpro (&Qmouse_left); | 2344 | staticpro (&Qmouse_left); |
| 2345 | Qmouse_left = intern ("mouse-left"); | 2345 | Qmouse_left = intern_c_string ("mouse-left"); |
| 2346 | staticpro (&Qmouse_entered); | 2346 | staticpro (&Qmouse_entered); |
| 2347 | Qmouse_entered = intern ("mouse-entered"); | 2347 | Qmouse_entered = intern_c_string ("mouse-entered"); |
| 2348 | staticpro (&Qpoint_left); | 2348 | staticpro (&Qpoint_left); |
| 2349 | Qpoint_left = intern ("point-left"); | 2349 | Qpoint_left = intern_c_string ("point-left"); |
| 2350 | staticpro (&Qpoint_entered); | 2350 | staticpro (&Qpoint_entered); |
| 2351 | Qpoint_entered = intern ("point-entered"); | 2351 | Qpoint_entered = intern_c_string ("point-entered"); |
| 2352 | 2352 | ||
| 2353 | defsubr (&Stext_properties_at); | 2353 | defsubr (&Stext_properties_at); |
| 2354 | defsubr (&Sget_text_property); | 2354 | defsubr (&Sget_text_property); |