diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 39 | ||||
| -rw-r--r-- | src/callproc.c | 1 | ||||
| -rw-r--r-- | src/frame.c | 59 | ||||
| -rw-r--r-- | src/frame.h | 1 | ||||
| -rw-r--r-- | src/indent.c | 9 | ||||
| -rw-r--r-- | src/lisp.h | 1 | ||||
| -rw-r--r-- | src/lread.c | 6 | ||||
| -rw-r--r-- | src/macfns.c | 2 | ||||
| -rw-r--r-- | src/puresize.h | 2 |
9 files changed, 42 insertions, 78 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4160a53e9d7..c928977d68b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,15 +1,41 @@ +2007-10-10 Patrick Mahan <mahan@mahan.org> (tiny change) + + * macfns.c (x_create_tip_frame): Set terminal for frame. + +2007-10-10 Stefan Monnier <monnier@iro.umontreal.ca> + + * frame.c (Qenvironment): Remove. + (syms_of_frame) <Qenvironment>: Don't initialize. + (Fdelete_frame): Don't treat the `environment' param specially. + * frame.h (Qenvironment): Don't declare. + * callproc.c (set_initial_environment): Don't set unused frame param. + + * frame.c (Fframe_with_environment): Remove. + (syms_of_frame) <Sframe_with_environment>: Don't declare. + + * lisp.h (Fframe_with_environment): Don't declare. + +2007-10-10 Juanma Barranquero <lekktu@gmail.com> + + * indent.c (indent_tabs_mode, last_known_column) + (last_known_column_modified): Make static. + (syms_of_indent) <indent-tabs-mode>: Remove redundant info in docstring. + +2007-10-10 Katsumi Yamaoka <yamaoka@jpl.org> + + * puresize.h (BASE_PURESIZE): Increase to 1170000. + 2007-10-08 Martin Rudalics <rudalics@gmx.at> * keyboard.c (kbd_buffer_get_event): Break loop waiting for input when there's an unread command event. - * frame.c (focus_follows_mouse): Moved here from frame.el to allow + * frame.c (focus_follows_mouse): Move here from frame.el to allow window autoselection act appropriately when leaving selected frame. (syms_of_frame): Initialize focus_follows_mouse. * frame.h (focus_follows_mouse): Extern it. * macterm.c (XTread_socket): When focus_follows_mouse is nil - make SELECT_WINDOW_EVENT only if we don't leave the selected - frame. + make SELECT_WINDOW_EVENT only if we don't leave the selected frame. * msdos.c (dos_rawgetc): Likewise. * w32term.c (w32_read_socket): Likewise. * xterm.c (handle_one_xevent): Likewise. @@ -39,7 +65,7 @@ 2007-10-08 Richard Stallman <rms@gnu.org> - * image.c (our_memory_buffer): Renamed from omfib_buffer. + * image.c (our_memory_buffer): Rename from omfib_buffer. 2007-10-08 Richard Stallman <rms@gnu.org> @@ -82,7 +108,7 @@ 2007-10-09 Stefan Monnier <monnier@iro.umontreal.ca> - Add new `input-decode-map' keymap and use it for temrinal + Add new `input-decode-map' keymap and use it for terminal escape sequences. * keyboard.h (struct kboard): Add Vinput_decode_map. Remove Vlocal_key_translation_map. @@ -295,8 +321,7 @@ 2007-09-22 Eli Zaretskii <eliz@gnu.org> - * term.c (DEV_TTY): New macro. Provide a definition for - MS-Windows. + * term.c (DEV_TTY): New macro. Provide a definition for MS-Windows. (FRAME_TERMCAP_P) [WINDOWSNT]: Don't define to zero. (Fcontrolling_tty_p, Fresume_tty, dissociate_if_controlling_tty) (init_tty): Use DEV_TTY instead of "/dev/tty". diff --git a/src/callproc.c b/src/callproc.c index 5560f32173c..8a8052c0019 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -1663,7 +1663,6 @@ set_initial_environment () for (envp = environ; *envp; envp++) Vprocess_environment = Fcons (build_string (*envp), Vprocess_environment); - store_frame_param (SELECTED_FRAME(), Qenvironment, Vprocess_environment); /* Ideally, the `copy' shouldn't be necessary, but it seems it's frequent to use `delete' and friends on process-environment. */ Vinitial_environment = Fcopy_sequence (Vprocess_environment); diff --git a/src/frame.c b/src/frame.c index 8314ad7a398..5f4e12cd705 100644 --- a/src/frame.c +++ b/src/frame.c @@ -114,7 +114,6 @@ Lisp_Object Qbuffer_predicate, Qbuffer_list, Qburied_buffer_list; Lisp_Object Qtty_color_mode; Lisp_Object Qtty, Qtty_type; Lisp_Object Qwindow_system; -Lisp_Object Qenvironment; Lisp_Object Qfullscreen, Qfullwidth, Qfullheight, Qfullboth; #ifdef USE_FONT_BACKEND @@ -1479,24 +1478,6 @@ The functions are run with one arg, the frame to be deleted. */) if (EQ (f->minibuffer_window, echo_area_window)) echo_area_window = sf->minibuffer_window; - /* Don't allow other frames to refer to a deleted frame in their - 'environment parameter. */ - { - Lisp_Object tail, frame1; - Lisp_Object env = get_frame_param (XFRAME (frame), Qenvironment); - FOR_EACH_FRAME (tail, frame1) - { - if (EQ (frame, frame1) || !FRAME_LIVE_P (XFRAME (frame1))) - continue; - if (EQ (frame, get_frame_param (XFRAME (frame1), Qenvironment))) - { - store_frame_param (XFRAME (frame1), Qenvironment, env); - if (!FRAMEP (env)) - env = frame1; - } - } - } - /* Clear any X selections for this frame. */ #ifdef HAVE_X_WINDOWS if (FRAME_X_P (f)) @@ -2618,43 +2599,6 @@ enabled such bindings for that variable with `make-variable-frame-local'. */) } return Qnil; } - -DEFUN ("frame-with-environment", Fframe_with_environment, Sframe_with_environment, 0, 1, 0, - doc: /* Return the frame that has the environment variable list for FRAME. - -The frame-local environment variable list is normally shared between -frames that were created in the same Emacsclient session. The -environment list is stored in a single frame's 'environment parameter; -the other frames' 'environment parameter is set to this frame. This -function follows the chain of 'environment references to reach the -frame that stores the actual local environment list, and returns that -frame. */) - (frame) - Lisp_Object frame; -{ - Lisp_Object hare, tortoise; - - if (NILP (frame)) - frame = selected_frame; - CHECK_FRAME (frame); - - hare = tortoise = get_frame_param (XFRAME (frame), Qenvironment); - while (!NILP (hare) && FRAMEP (hare)) - { - frame = hare; - hare = get_frame_param (XFRAME (hare), Qenvironment); - if (NILP (hare) || !FRAMEP (hare)) - break; - frame = hare; - hare = get_frame_param (XFRAME (hare), Qenvironment); - tortoise = get_frame_param (XFRAME (tortoise), Qenvironment); - if (EQ (hare, tortoise)) - error ("Cyclic frame-local environment indirection"); - } - - return frame; -} - DEFUN ("frame-char-height", Fframe_char_height, Sframe_char_height, 0, 1, 0, @@ -4455,8 +4399,6 @@ syms_of_frame () staticpro (&Qtty_type); Qwindow_system = intern ("window-system"); staticpro (&Qwindow_system); - Qenvironment = intern ("environment"); - staticpro (&Qenvironment); Qface_set_after_frame_default = intern ("face-set-after-frame-default"); staticpro (&Qface_set_after_frame_default); @@ -4656,7 +4598,6 @@ automatically. */); defsubr (&Sframe_parameters); defsubr (&Sframe_parameter); defsubr (&Smodify_frame_parameters); - defsubr (&Sframe_with_environment); defsubr (&Sframe_char_height); defsubr (&Sframe_char_width); defsubr (&Sframe_pixel_height); diff --git a/src/frame.h b/src/frame.h index e48dd646da3..e9be84d8558 100644 --- a/src/frame.h +++ b/src/frame.h @@ -796,7 +796,6 @@ typedef struct frame *FRAME_PTR; extern Lisp_Object Qframep, Qframe_live_p; extern Lisp_Object Qtty, Qtty_type; extern Lisp_Object Qterminal, Qterminal_live_p; -extern Lisp_Object Qenvironment; extern struct frame *last_nonminibuf_frame; diff --git a/src/indent.c b/src/indent.c index 2a4fe1e5e72..3f528749570 100644 --- a/src/indent.c +++ b/src/indent.c @@ -39,7 +39,7 @@ Boston, MA 02110-1301, USA. */ /* Indentation can insert tabs if this is non-zero; otherwise always uses spaces. */ -int indent_tabs_mode; +static int indent_tabs_mode; #define CR 015 @@ -49,7 +49,7 @@ int indent_tabs_mode; Some things in set last_known_column_point to -1 to mark the memorized value as invalid. */ -double last_known_column; +static double last_known_column; /* Value of point when current_column was called. */ @@ -57,7 +57,7 @@ EMACS_INT last_known_column_point; /* Value of MODIFF when current_column was called. */ -int last_known_column_modified; +static int last_known_column_modified; static double current_column_1 P_ ((void)); static double position_indentation P_ ((int)); @@ -2159,8 +2159,7 @@ void syms_of_indent () { DEFVAR_BOOL ("indent-tabs-mode", &indent_tabs_mode, - doc: /* *Indentation can insert tabs if this is non-nil. -Setting this variable automatically makes it local to the current buffer. */); + doc: /* *Indentation can insert tabs if this is non-nil. */); indent_tabs_mode = 1; defsubr (&Scurrent_indentation); diff --git a/src/lisp.h b/src/lisp.h index 578cc3a6410..50750af3c4f 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3029,7 +3029,6 @@ EXFUN (Fvisible_frame_list, 0); EXFUN (Fframe_parameter, 2); EXFUN (Fframe_parameters, 1); EXFUN (Fmodify_frame_parameters, 2); -EXFUN (Fframe_with_environment, 1); EXFUN (Fset_frame_height, 3); EXFUN (Fset_frame_width, 3); EXFUN (Fset_frame_size, 3); diff --git a/src/lread.c b/src/lread.c index 3975c0bfcd0..1bcad4672f0 100644 --- a/src/lread.c +++ b/src/lread.c @@ -3821,8 +3821,8 @@ defalias (sname, string) #endif /* NOTDEF */ /* Define an "integer variable"; a symbol whose value is forwarded - to a C variable of type int. Sample call: */ - /* DEFVAR_INT ("indent-tabs-mode", &indent_tabs_mode, "Documentation"); */ + to a C variable of type int. Sample call: + DEFVAR_INT ("emacs-priority", &emacs_priority, "Documentation"); */ void defvar_int (namestring, address) char *namestring; @@ -3837,7 +3837,7 @@ defvar_int (namestring, address) } /* Similar but define a variable whose value is t if address contains 1, - nil if address contains 0 */ + nil if address contains 0. */ void defvar_bool (namestring, address) char *namestring; diff --git a/src/macfns.c b/src/macfns.c index 71eae699f9a..0330ccd0d44 100644 --- a/src/macfns.c +++ b/src/macfns.c @@ -3855,6 +3855,8 @@ x_create_tip_frame (dpyinfo, parms, text) the frame is live, as per FRAME_LIVE_P. If we get a signal from this point on, x_destroy_window might screw up reference counts etc. */ + f->terminal = dpyinfo->terminal; + f->terminal->reference_count++; f->output_method = output_mac; f->output_data.mac = (struct mac_output *) xmalloc (sizeof (struct mac_output)); diff --git a/src/puresize.h b/src/puresize.h index 4b88283d8dd..f5b675055b8 100644 --- a/src/puresize.h +++ b/src/puresize.h @@ -43,7 +43,7 @@ Boston, MA 02110-1301, USA. */ #endif #ifndef BASE_PURESIZE -#define BASE_PURESIZE (1164000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) +#define BASE_PURESIZE (1170000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) #endif /* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */ |