procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(set_initial_environment): Rename from set_global_environment.

Browse source
This commit is contained in:
Stefan Monnier 2007-08-29 21:50:39 +00:00
parent b88c11ac65
commit b886686079
3 changed files with 84 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/button.el
View file

@ -470,5 +470,5 @@ Returns the button found."
(provide 'button)
;;; arch-tag: 5f2c7627-413b-4097-b282-630f89d9c5e9
;; arch-tag: 5f2c7627-413b-4097-b282-630f89d9c5e9
;;; button.el ends here

155
src/ChangeLog
View file

@ -1,3 +1,24 @@
2007-08-29 Stefan Monnier <monnier@iro.umontreal.ca>
* lisp.h (set_initial_environment): Rename from set_global_environment.
* Makefile.in (${etc}DOC): Re-add a ${EXEEXT} which seems to have been
removed by mistake on the multi-tty branch.
* frame.c (make_terminal_frame): Yet Another Int/Lisp_Object Mixup.
(Fmodify_frame_parameters): Return a value.
* image.c (png_load): Comment-out var only used in commented-out code.
* term.c (mark_ttys): Don't bother checking top_frame (incorrectly)
before passing it to mark_object.
* xfaces.c (internal_resolve_face_name): Return a value.
(internal_resolve_face_name, resolve_face_name_error): Comment out.
* xfns.c (check_x_display_info): Yet Another Int/Lisp_Object Mixup.
(x_icon): Comment-out var only used in commented-out code.
2007-08-29 Romain Francoise <romain@orebokech.com>
* keyboard.c (Fset_input_mode): Don't call `Fset_quit_char' if
@ -52,8 +73,8 @@
* termhooks.h (union display_info): Add mac_display_info.
* w32fns.c (Fx_create_frame): Use kboard from the terminal. Set
the default minibuffer frame, window_system and the rest of the
* w32fns.c (Fx_create_frame): Use kboard from the terminal.
Set the default minibuffer frame, window_system and the rest of the
frame parameters following what is done in X11.
* w32term.c (w32_initialize): Make static.
@ -78,8 +99,8 @@
* makefile.w32-in: Update dependancies from Makefile.in
(OBJ1): Add terminal.$(O)
* term.c (dissociate_if_controlling_tty) [WINDOWSNT]: Don't
define function body.
* term.c (dissociate_if_controlling_tty) [WINDOWSNT]:
Don't define function body.
(init_tty) [WINDOWSNT]: Use selected_frame for initializing.
* termhooks.h (display_info) [WINDOWSNT]: Add w32.
@ -91,8 +112,8 @@
(w32con_ins_del_lines, w32con_insert_glyphs, w32con_write_glyphs)
(w32con_delete_glyphs, w32con_set_terminal_window)
(scroll_line, w32_sys_ring_bell): Add frame arg.
(w32con_set_terminal_modes, w32con_reset_terminal_modes): Add
terminal arg.
(w32con_set_terminal_modes, w32con_reset_terminal_modes):
Add terminal arg.
(PICK_FRAME): Remove.
(w32con_write_glyphs): Use frame specific terminal coding.
(one_and_only_w32cons): New global variable.
@ -102,8 +123,8 @@
* w32inevt.c, w32inevt.h (w32_console_read_socket): Make first
arg a frame.
* w32fns.c (x_create_tip_frame): Set terminal and ref count. Set
window_system.
* w32fns.c (x_create_tip_frame): Set terminal and ref count.
Set window_system.
(x_set_tool_bar_lines): Don't use updating_frame.
(Fx_create_frame): Set terminal and ref count.
(Fx_open_connection): Remove window-system check.
@ -119,8 +140,7 @@
(w32_initialize): Move terminal specific initialization to
w32_create_terminal.
* w32term.h (x_output): Remove foreground_pixel and
background_pixel.
* w32term.h (x_output): Remove foreground_pixel and background_pixel.
(w32_clear_rect, w32_clear_area): Use background from frame.
(w32_display_info): Add terminal.
(w32_sys_ring_bell, x_delete_display): Declare here.
@ -144,15 +164,15 @@
2007-08-29 Karoly Lorentey <karoly@lorentey.hu>
* buffer.c (Fbuffer_list, Fbury_buffer): Take
frame->buried_buffer_list into account.
* buffer.c (Fbuffer_list, Fbury_buffer):
Take frame->buried_buffer_list into account.
* cm.c (current_tty): New variable, for cmputc().
(cmputc): Use it.
(cmcheckmagic): Add tty parameter, look up terminal streams there.
(calccost): Add tty parameter. Use emacs_tputs() instead of tputs().
(cmgoto): Add tty parameter. Pass it on to calccost(). Use
emacs_tputs() instead of tputs().
(cmgoto): Add tty parameter. Pass it on to calccost().
Use emacs_tputs() instead of tputs().
* cm.h (emacs_tputs): New macro to set current_tty, and then call
tputs().
@ -173,19 +193,19 @@
* w32term.h (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL):
Remove redundant definition.
* macfns.c (x_set_mouse_color, x_make_gc): Use
FRAME_BACKGROUND_PIXEL and FRAME_FOREGROUND_PIXEL.
* macfns.c (x_set_mouse_color, x_make_gc):
Use FRAME_BACKGROUND_PIXEL and FRAME_FOREGROUND_PIXEL.
* w32term.c (x_free_frame_resources): Use
FRAME_BACKGROUND_PIXEL and FRAME_FOREGROUND_PIXEL.
* w32term.c (x_free_frame_resources):
Use FRAME_BACKGROUND_PIXEL and FRAME_FOREGROUND_PIXEL.
(w32_initialize): Use the accessor macros for terminal characteristics.
* macterm.c (mac_initialize): Use Fset_input_interrupt_mode.
Use the accessor macros for terminal characteristics.
* msdos.c (internal_terminal_init): Use the accessor macros for
terminal characteristics.
(ScreenVisualBell, internal_terminal_init): Use
FRAME_BACKGROUND_PIXEL and FRAME_FOREGROUND_PIXEL.
(ScreenVisualBell, internal_terminal_init):
Use FRAME_BACKGROUND_PIXEL and FRAME_FOREGROUND_PIXEL.
* termopts.h (no_redraw_on_reenter): Declare.
@ -214,19 +234,18 @@
* print.c (print_preprocess): Don't lose print_depth levels while
iterating.
* widget.c (update_from_various_frame_slots): Use
FRAME_BACKGROUND_PIXEL and FRAME_FOREGROUND_PIXEL.
* widget.c (update_from_various_frame_slots):
Use FRAME_BACKGROUND_PIXEL and FRAME_FOREGROUND_PIXEL.
* window.c (set_window_buffer): Don't call clear_mouse_face on tty
frames.
(window_internal_height): Remove bogus make_number call.
(init_window_once): Call make_terminal_frame with two zero
parameters.
(init_window_once): Call make_terminal_frame with two zero parameters.
* fileio.c (Fread_file_name): Update comment.
* callint.c (Fcall_interactively): Use
temporarily_switch_to_single_kboard instead of single_kboard_state.
* callint.c (Fcall_interactively):
Use temporarily_switch_to_single_kboard instead of single_kboard_state.
Make sure it is correctly unwound.
* xsmfns.c (x_session_close): New function.
@ -244,24 +263,21 @@
(read_filtered_event): Call `read_char' with a local
`wrong_kboard_jmpbuf'.
* minibuf.c (read_minibuf): Call
temporarily_switch_to_single_kboard. Don't call
single_kboard_state. Use FRAME_RIF.
* minibuf.c (read_minibuf): Call temporarily_switch_to_single_kboard.
Don't call single_kboard_state. Use FRAME_RIF.
* process.c (Fmake_network_process): Don't unrequest_sigio on modern
systems.
* lisp.h (set_process_environment): Rename to
`set_global_environment'.
* lisp.h (set_process_environment): Rename to `set_global_environment'.
(Fframe_with_environment, Fset_input_meta_mode)
(Fset_quit_char): EXFUN.
(x_create_device, tty_output, terminal, tty_display_info): Declare.
(init_sys_modes, reset_sys_modes): Update prototypes.
(init_all_sys_modes, reset_all_sys_modes): New prototypes.
* keyboard.h (struct kboard): Add new fields:
Vlocal_function_key_map, Vlocal_key_translation_map,
Vkeyboard_translate_table.
* keyboard.h (struct kboard): Add new fields Vlocal_function_key_map,
Vlocal_key_translation_map, and Vkeyboard_translate_table.
(Vfunction_key_map, Vkeyboard_translate_table, single_kboard_state):
Delete declarations.
(Vfunction_key_map, Vkey_translation_map, push_kboard, pop_kboard)
@ -270,8 +286,8 @@
* emacs.c (main): Don't call init_sys_modes(), the new term_init()
already does that during init_display(). Call syms_of_keymap
before syms_of_keyboard. Call `syms_of_terminal'. Call
set_initial_environment, not set_process_environment.
before syms_of_keyboard. Call `syms_of_terminal'.
Call set_initial_environment, not set_process_environment.
(shut_down_emacs): Call reset_all_sys_modes() instead of
reset_sys_modes().
@ -288,8 +304,7 @@
characteristics.
* keymap.c (Vfunction_key_map): Remove.
(Fdescribe_buffer_bindings): Update references to
Vfunction_key_map.
(Fdescribe_buffer_bindings): Update references to Vfunction_key_map.
(syms_of_keymap): Remove DEFVAR for Vfunction_key_map.
(Vkey_translation_map): Remove.
(syms_of_keymap): Remove DEFVAR for key-translation-map.
@ -345,13 +360,12 @@
(insert_glyphs): Remove.
(raw_cursor_to, clear_to_end, tty_turn_off_insert)
(tty_turn_off_highlight, get_tty_size): Add declaration.
(tabs_safe_p, init_baud_rate, get_tty_terminal): Update
prototypes.
(tabs_safe_p, init_baud_rate, get_tty_terminal): Update prototypes.
* frame.h (enum output_method): Add output_initial.
(struct x_output): Delete.
(FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL): Access
foreground_pixel and background_pixel directly from the frame.
(FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL):
Access foreground_pixel and background_pixel directly from the frame.
(tty_display): Delete.
(struct frame): Add buried_buffer_list, foreground_pixel,
background_pixel and terminal. Delete kboard
@ -360,8 +374,8 @@
(FRAME_INITIAL_P): New macro.
(Qtty, Qtty_type, Qterminal, Qterminal_live_p, Qenvironment)
(Qterm_environment_variable, Qdisplay_environment_variable)
(make_terminal_frame, Qburied_buffer_list, Qwindow_system): New
declarations.
(make_terminal_frame, Qburied_buffer_list, Qwindow_system):
New declarations.
* termchar.h (tty_output, tty_display_info): New structures.
(tty_list): Declare.
@ -375,20 +389,18 @@
parameters.
(add_env): New function.
(child_setup): Use it.
(child_setup, getenv_internal): Handle the new
Vprocess_environment.
(child_setup, getenv_internal): Handle the new Vprocess_environment.
(getenv_internal): Fix get_terminal_param call.
(Fgetenv_internal, egetenv): Update doc.
(syms_of_callproc): Initialize Vprocess_environment to nil.
Register and initialize them. Remove obsolete defvars. Update doc
strings.
(child_setup): Handle Vlocal_environment_variables.
(getenv_internal): Add terminal parameter. Handle
Vlocal_environment_variables.
(getenv_internal): Add terminal parameter.
Handle Vlocal_environment_variables.
(Fgetenv_internal): Add terminal parameter.
(child_setup, getenv_internal, Fgetenv_internal): Store the local
environment in a frame (not terminal) parameter. Update doc
strings.
environment in a frame (not terminal) parameter. Update doc strings.
(set_initial_environment): Rename from set_global_environment.
Store Emacs environment in initial frame parameter.
@ -413,14 +425,13 @@
Use FRAME_TERMINAL_P, FRAME_WINDOW_P, FRAME_TTY and FRAME_RIF.
* xfns.c (x_set_foreground_color x_set_background_color)
(x_set_mouse_color, x_set_cursor_color, x_make_gc): Use
FRAME_BACKGROUND_PIXEL and FRAME_FOREGROUND_PIXEL.
(x_set_mouse_color, x_set_cursor_color, x_make_gc):
Use FRAME_BACKGROUND_PIXEL and FRAME_FOREGROUND_PIXEL.
(Fx_create_frame, x_create_tip_frame, build_string, x_window)
(Fx_create_frame, x_create_tip_frame): Don't create frames on a
terminal that is being deleted.
(Fx_create_frame): Use `store_frame_param' to set `window-system'
frame parameter, and make sure it overrides any user-supplied
setting.
frame parameter, and make sure it overrides any user-supplied setting.
(Fx_close_connection, Fx_synchronize): Unify argument names with
the rest of the DEFUNs.
@ -475,15 +486,13 @@
* frame.c (Fframep): Deal with output_initial.
(Qbuffer_predicate, Qbuffer_list, Qburied_buffer_list, Qtty)
(Qtty_type, Qwindow_system, Qenvironment)
(Qterm_environment_variable, Qdisplay_environment_variable): New
variables.
(Qterm_environment_variable, Qdisplay_environment_variable): New vars.
(x_set_screen_gamma, store_frame_param): Fix compilation errors.
(make_terminal_frame): Don't create frames on a terminal that is
being deleted.
(make_terminal_frame): Use FRAME_BACKGROUND_PIXEL and
FRAME_FOREGROUND_PIXEL.
(store_frame_param): Check for found_for_frame before calling
XFRAME.
(store_frame_param): Check for found_for_frame before calling XFRAME.
(Fmake_terminal_frame): Handle NULL tty names correctly.
(syms_of_frame): Enhance doc string of `default-frame-alist'.
(Fdelete_frame): Remove unused variable `count'.
@ -491,8 +500,7 @@
(Fdelete_frame): Don't allow other frames to refer to a deleted
frame in their 'environment parameter.
(Fframe_with_environment): New function.
(syms_of_frame): Defsubr it. Initialize and staticpro
Qenvironment.
(syms_of_frame): Defsubr it. Initialize and staticpro Qenvironment.
(get_future_frame_param): New function.
(Fmake_terminal_frame): Use it.
@ -507,22 +515,21 @@
(read_char_minibuf_menu_prompt): Add wrong_kboard_jmpbuf
parameter. Use it in call to `read_char'.
(read_char): Declare. Update call to
`read_char_minibuf_menu_prompt'. Set wrong_kboard_jmpbuf
correctly in recursive calls. Use current_kboard to access
Vkeyboard_translate_table. Enhance comment before extra longjmp
to wrong_kboard_jmpbuf. Add wrong_kboard_jmpbuf parameter to
allow for recursive calls. Update longjmp invocations. Remember
the original current_kboard, and longjmp to `wrong_kboard_jmpbuf'
when a filter, timer or sentinel changes it. Comment out
unnecessary calls to `record_single_kboard_state' and
`any_kboard_state'. Update recursive calls.
(read_char): Declare. Update call to `read_char_minibuf_menu_prompt'.
Set wrong_kboard_jmpbuf correctly in recursive calls.
Use current_kboard to access Vkeyboard_translate_table.
Enhance comment before extra longjmp to wrong_kboard_jmpbuf.
Add wrong_kboard_jmpbuf parameter to allow for recursive calls.
Update longjmp invocations. Remember the original current_kboard,
and longjmp to `wrong_kboard_jmpbuf' when a filter, timer or sentinel
changes it. Comment out unnecessary calls to
`record_single_kboard_state' and `any_kboard_state'.
Update recursive calls.
(wrong_kboard_jmpbuf): Remove global variable.
(read_key_sequence): Remove unused variable wrong_kboard_jmpbuf.
Handle deleted interrupted_kboards correctly; that is a legal
case. Add `wrong_kboard_jmpbuf' local variable. Update setjmp
and read_char calls. Abort if interrupted_kboard died in
read_char.
and read_char calls. Abort if interrupted_kboard died in read_char.
(any_kboard_state, single_kboard_state)
(push_frame_kboard): Remove function.
(pop_kboard): Switch out of single_kboard mode if the kboard has
@ -540,8 +547,8 @@
up single_kboard mode.
(Frecursive_edit): Switch to single_kboard mode only in nested
command loops.
(cmd_error, command_loop, command_loop_1, timer_check): Comment
out unnecessary call to `any_kboard_state' and
(cmd_error, command_loop, command_loop_1, timer_check):
Comment out unnecessary call to `any_kboard_state' and
`record_single_kboard_state'.
(delete_kboard): Exit single_kboard mode if we have just deleted
that kboard. Use FRAME_KBOARD.

3
src/lisp.h
View file

@ -3009,6 +3009,7 @@ extern void init_keyboard P_ ((void));
extern void syms_of_keyboard P_ ((void));
extern void keys_of_keyboard P_ ((void));
extern char *push_key_description P_ ((unsigned int, char *, int));
extern void add_user_signal P_ ((int sig, const char *name));
/* defined in indent.c */
@ -3120,7 +3121,7 @@ EXFUN (Fcall_process, MANY);
extern int child_setup P_ ((int, int, int, char **, int, Lisp_Object));
extern void init_callproc_1 P_ ((void));
extern void init_callproc P_ ((void));
extern void set_global_environment P_ ((void));
extern void set_initial_environment P_ ((void));
extern void syms_of_callproc P_ ((void));
/* defined in doc.c */