projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge `chinese-isoir165'.
[chise/xemacs-chise.git]
/
src
/
emacs.c
diff --git
a/src/emacs.c
b/src/emacs.c
index
c3fc9fc
..
a60922f
100644
(file)
--- a/
src/emacs.c
+++ b/
src/emacs.c
@@
-77,7
+77,7
@@
Boston, MA 02111-1307, USA. */
void report_sheap_usage (int die_if_pure_storage_exceeded);
#endif
void report_sheap_usage (int die_if_pure_storage_exceeded);
#endif
-#if !defined SYSTEM_MALLOC && !defined DOUG_LEA_MALLOC
+#if !defined (SYSTEM_MALLOC) && !defined (DOUG_LEA_MALLOC)
extern void *(*__malloc_hook)(size_t);
extern void *(*__realloc_hook)(void *, size_t);
extern void (*__free_hook)(void *);
extern void *(*__malloc_hook)(size_t);
extern void *(*__realloc_hook)(void *, size_t);
extern void (*__free_hook)(void *);
@@
-943,6
+943,7
@@
main_1 (int argc, char **argv, char **envp, int restart)
#if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
syms_of_gui ();
#endif
#if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
syms_of_gui ();
#endif
+ syms_of_gutter ();
syms_of_indent ();
syms_of_intl ();
syms_of_keymap ();
syms_of_indent ();
syms_of_intl ();
syms_of_keymap ();
@@
-1165,6
+1166,7
@@
main_1 (int argc, char **argv, char **envp, int restart)
specifier_type_create ();
specifier_type_create_image ();
specifier_type_create ();
specifier_type_create_image ();
+ specifier_type_create_gutter ();
specifier_type_create_objects ();
#ifdef HAVE_TOOLBARS
specifier_type_create_toolbar ();
specifier_type_create_objects ();
#ifdef HAVE_TOOLBARS
specifier_type_create_toolbar ();
@@
-1200,6
+1202,9
@@
main_1 (int argc, char **argv, char **envp, int restart)
image_instantiator_format_create ();
image_instantiator_format_create_glyphs_eimage ();
image_instantiator_format_create_glyphs_widget ();
image_instantiator_format_create ();
image_instantiator_format_create_glyphs_eimage ();
image_instantiator_format_create_glyphs_widget ();
+#ifdef HAVE_TTY
+ image_instantiator_format_create_glyphs_tty ();
+#endif
#ifdef HAVE_X_WINDOWS
image_instantiator_format_create_glyphs_x ();
#endif /* HAVE_X_WINDOWS */
#ifdef HAVE_X_WINDOWS
image_instantiator_format_create_glyphs_x ();
#endif /* HAVE_X_WINDOWS */
@@
-1335,6
+1340,7
@@
main_1 (int argc, char **argv, char **envp, int restart)
#if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
vars_of_gui ();
#endif
#if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
vars_of_gui ();
#endif
+ vars_of_gutter ();
vars_of_indent ();
vars_of_insdel ();
vars_of_intl ();
vars_of_indent ();
vars_of_insdel ();
vars_of_intl ();
@@
-1487,6
+1493,7
@@
main_1 (int argc, char **argv, char **envp, int restart)
*/
specifier_vars_of_glyphs ();
*/
specifier_vars_of_glyphs ();
+ specifier_vars_of_gutter ();
#ifdef HAVE_MENUBARS
specifier_vars_of_menubar ();
#endif
#ifdef HAVE_MENUBARS
specifier_vars_of_menubar ();
#endif
@@
-2466,6
+2473,8
@@
and announce itself normally when it is run.
report_sheap_usage (1);
#endif
report_sheap_usage (1);
#endif
+ clear_message ();
+
fflush (stderr);
fflush (stdout);
fflush (stderr);
fflush (stdout);