Changeset 3674

Timestamp:

04/10/05 08:38:44 (4 years ago)

Author:

miyoshi

Message:

* mw32term.c: Follow the change of struct glyph_row' and struct
glyph_string'.

* mw32menu.c (Fx_popup_menu): Use Fkeymap_prompt() instead of
map_prompt().

* dispextern.h: Sync up with Emacs CVS HEAD.

* emacs.c: Ditto.

* fileio.c: Ditto.

* fontset.c: Ditto.

* keyboard.c: Ditto.

* keyboard.h: Ditto.

Files:

• branches/2.2/src/ChangeLog.Meadow (modified) (1 diff)
• branches/2.2/src/dispextern.h (modified) (24 diffs)
• branches/2.2/src/emacs.c (modified) (49 diffs)
• branches/2.2/src/fileio.c (modified) (78 diffs)
• branches/2.2/src/fontset.c (modified) (26 diffs)
• branches/2.2/src/keyboard.c (modified) (162 diffs)
• branches/2.2/src/keyboard.h (modified) (7 diffs)
• branches/2.2/src/mw32menu.c (modified) (2 diffs)
• branches/2.2/src/mw32term.c (modified) (20 diffs)

branches/2.2/src/ChangeLog.Meadow

@@ +1 @@
+2005-04-10  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * mw32term.c: Follow the change of `struct glyph_row' and `struct
+        glyph_string'.
+
+        * mw32menu.c (Fx_popup_menu): Use Fkeymap_prompt() instead of
+        map_prompt().
+
+        * dispextern.h: Sync up with Emacs CVS HEAD.
+
+        * emacs.c: Ditto.
+
+        * fileio.c: Ditto.
+
+        * fontset.c: Ditto.
+
+        * keyboard.c: Ditto.
+
+        * keyboard.h: Ditto.
+
-2005-04-09  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

branches/2.2/src/dispextern.h

@@ -1 +1 @@
-/* Interface definitions for display code.
- 1993, 1994, 1997, 1998, 1999, 2000, 2001
+93,94,97,98,99, 2000,01,02,03, 2004, 2005
-     Free Software Foundation, Inc.
-
@@ -73 +73 @@
-#endif
-
-HAVE_CARBON
+MAC_OS
-#include "macgui.h"
-typedef struct mac_display_info Display_Info;
@@ -115 +115 @@
-
-/* Number of bits allocated to store fringe bitmap numbers.  */
-8
+16
-
-
@@ -134 +134 @@
-#if GLYPH_DEBUG
-#define IF_DEBUG(X)     X
-#define xassert(X)      do {if (!(X)) abort ();} while (0)
-#else
-#define IF_DEBUG(X)     (void) 0
-#define xassert(X)      (void) 0
-#endif
+
+/* Maybe move this inside the above `#ifdef GLYPH_DEBUG' for release.  */
+#define xassert(X)      do {if (!(X)) abort ();} while (0)
-
-/* Macro for displaying traces of redisplay.  If Emacs was compiled
@@ -364 +365 @@
-  unsigned glyph_not_available_p : 1;
-
-2
+1
-
-  /* Face of the glyph.  */
@@ -720 +721 @@
-  unsigned left_user_fringe_bitmap : FRINGE_ID_BITS;
-
+  /* Right fringe bitmap number (enum fringe_bitmap_type).  */
+  unsigned right_user_fringe_bitmap : FRINGE_ID_BITS;
+
+  /* Left fringe bitmap number (enum fringe_bitmap_type).  */
+  unsigned left_fringe_bitmap : FRINGE_ID_BITS;
+
+  /* Right fringe bitmap number (enum fringe_bitmap_type).  */
+  unsigned right_fringe_bitmap : FRINGE_ID_BITS;
+
-  /* Face of the left fringe glyph.  */
-  unsigned left_user_fringe_face_id : FACE_ID_BITS;
-
-  /* Right fringe bitmap number (enum fringe_bitmap_type).  */
-  unsigned right_user_fringe_bitmap : FRINGE_ID_BITS;
-
-  /* Face of the right fringe glyph.  */
-  unsigned right_user_fringe_face_id : FACE_ID_BITS;
-
-  /* Left fringe bitmap number (enum fringe_bitmap_type).  */
-  unsigned left_fringe_bitmap : FRINGE_ID_BITS;
-
-  /* Face of the left fringe glyph.  */
-  unsigned left_fringe_face_id : FACE_ID_BITS;
-
-  /* Right fringe bitmap number (enum fringe_bitmap_type).  */
-  unsigned right_fringe_bitmap : FRINGE_ID_BITS;
-
-  /* Face of the right fringe glyph.  */
@@ -749 +750 @@
-     screen.  */
-  unsigned enabled_p : 1;
-
-  /* Display this line in inverse video?  Used for the mode line and
-     menu bar lines.  */
-  unsigned inverse_p : 1;
-
-  /* 1 means row displays a text line that is truncated on the left or
@@ -983 +980 @@
-
-#define MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P(ROW)        \
-=
+
-      || (ROW)->end.overlay_string_index >= 0           \
-      || (ROW)->ends_in_middle_of_char_p)
@@ -995 +992 @@
-
-#define MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P(ROW)      \
-=
+
-      || (ROW)->starts_in_middle_of_char_p              \
-      || ((ROW)->start.overlay_string_index >= 0        \
@@ -1131 +1128 @@
-
-  /* Characters to be drawn, and number of characters.  */
-pfcp
+char2b
-  unsigned char *pstr;
-  int nchars;
-  int nbytes;
-  /* Glyph Layout Information */
-  int *pdx;
-
@@ -1598 +1594 @@
-};
-
+#define MAX_FACE_ID  ((1 << FACE_ID_BITS) - 1)
-
-/* A cache of realized faces.  Each frame has its own cache because
@@ -2104 +2101 @@
-  unsigned left_user_fringe_bitmap : FRINGE_ID_BITS;
-
+  /* Right fringe bitmap number (enum fringe_bitmap_type).  */
+  unsigned right_user_fringe_bitmap : FRINGE_ID_BITS;
+
-  /* Face of the left fringe glyph.  */
-  unsigned left_user_fringe_face_id : FACE_ID_BITS;
-
-  /* Right fringe bitmap number (enum fringe_bitmap_type).  */
-  unsigned right_user_fringe_bitmap : FRINGE_ID_BITS;
-
-  /* Face of the right fringe glyph.  */
@@ -2294 +2291 @@
-extern struct redisplay_interface *rif;
-
-/* Hook to call in estimate_mode_line_height.  */
-
-extern int (* estimate_mode_line_height_hook) P_ ((struct frame *,
-                                                   enum face_id));
-
-
-/***********************************************************************
@@ -2509 +2501 @@
-  TOOL_BAR_IMAGE_DISABLED_DESELECTED
-};
-
-/* Non-zero means raise tool-bar buttons when the mouse moves over them.  */
-
-extern int auto_raise_tool_bar_buttons_p;
-
-/* Margin around tool-bar buttons in pixels.  */
@@ -2639 +2627 @@
-                                          struct glyph_row *,
-                                          enum draw_glyphs_face));
+extern int get_phys_cursor_geometry P_ ((struct window *, struct glyph_row *,
+                                         struct glyph *, int *));
-extern void erase_phys_cursor P_ ((struct window *));
-extern void display_and_set_cursor P_ ((struct window *,
@@ -2673 +2663 @@
-/* Defined in fringe.c */
-
-valid_fringe_bitmap_id_p (in
+lookup_fringe_bitmap (Lisp_Objec
-void draw_fringe_bitmap P_ ((struct window *, struct glyph_row *, int));
-void draw_row_fringe_bitmaps P_ ((struct window *, struct glyph_row *));
@@ -2685 +2675 @@
-#endif
-
+/* Defined in image.c */
+
+struct image_cache *make_image_cache P_ ((void));
+void free_image_cache P_ ((struct frame *));
+void clear_image_cache P_ ((struct frame *, int));
+void forall_images_in_image_cache P_ ((struct frame *,
+                                       void (*) P_ ((struct image *))));
+int valid_image_p P_ ((Lisp_Object));
+void prepare_image_for_display P_ ((struct frame *, struct image *));
+int lookup_image P_ ((struct frame *, Lisp_Object));
-/* Defined in sysdep.c */
-
@@ -2707 +2707 @@
-                              enum lface_attribute_index));
-void unload_color P_ ((struct frame *, unsigned long));
-rame_update_line_height P_ ((struct frame *
+ace_font_available_p P_ ((struct frame *, Lisp_Object
-int ascii_face_of_lisp_face P_ ((struct frame *, int));
-void prepare_face_for_display P_ ((struct frame *, struct face *));
@@ -2723 +2723 @@
-int face_at_string_position P_ ((struct window *, Lisp_Object, int, int, int,
-                                 int, int *, enum face_id, int));
+int merge_faces P_ ((struct frame *, Lisp_Object, int, int));
-int compute_char_face P_ ((struct frame *, int, Lisp_Object));
-void free_all_realized_faces P_ ((Lisp_Object));
@@ -2747 +2748 @@
-#ifdef HAVE_WINDOW_SYSTEM
-
-void x_kill_gs_process P_ ((Pixmap, struct frame *));
-int x_screen_planes P_ ((struct frame *));
-void x_implicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
-
-
-
-
-
-
-
-
+
-extern Lisp_Object tip_frame;
-extern Window tip_window;
@@ -2765 +2758 @@
-extern void cancel_hourglass P_ ((void));
-extern int display_hourglass_p;
+
+/* Returns the background color of IMG, calculating one heuristically if
+   necessary.  If non-zero, XIMG is an existing XImage object to use for
+   the heuristic.  */
+
+#define IMAGE_BACKGROUND(img, f, ximg)                                        \
+   ((img)->background_valid                                                   \
+    ? (img)->background                                                       \
+    : image_background (img, f, ximg))
+
+/* Returns true if IMG has a `transparent' background, using heuristics
+   to decide if necessary.  If non-zero, MASK is an existing XImage
+   object to use for the heuristic.  */
+
+#define IMAGE_BACKGROUND_TRANSPARENT(img, f, mask)                            \
+   ((img)->background_transparent_valid                                       \
+    ? (img)->background_transparent                                           \
+    : image_background_transparent (img, f, mask))
-
-#endif /* HAVE_WINDOW_SYSTEM */
@@ -2787 +2798 @@
-                                         Lisp_Object *,
-                                         int *, int *, int *, int *));
+extern Lisp_Object marginal_area_string P_ ((struct window *, enum window_part,
+                                             int *, int *, int *,
+                                             Lisp_Object *,
+                                             int *, int *, int *, int *));
-extern void redraw_frame P_ ((struct frame *));
-extern void redraw_garbaged_frames P_ ((void));
@@ -2847 +2862 @@
-extern void turn_off_highlight P_ ((void));
-extern void background_highlight P_ ((void));
-extern void reassert_line_highlight P_ ((int, int));
-extern void clear_frame P_ ((void));
-extern void clear_end_of_line P_ ((int));
@@ -2905 +2919 @@
-
-#endif /* not DISPEXTERN_H_INCLUDED */
+
+/* arch-tag: c65c475f-1c1e-4534-8795-990b8509fd65
+   (do not change this comment) */

branches/2.2/src/emacs.c

@@ -1 +1 @@
-/* Fully extensible Emacs, running on Unix, intended for GNU.
-86,87,93,94,95,97,98,1999,2001,02,03,2004
-
+ 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2001,
+2002, 2003, 2004, 2005 
-
-This file is part of GNU Emacs.
@@ -66 +66 @@
-#include <sys/time.h>
-#include <sys/resource.h>
+#endif
+
+#ifdef HAVE_PERSONALITY_LINUX32
+#include <sys/personality.h>
-#endif
-
@@ -192 +196 @@
-   Tells GC how to save a copy of the stack.  */
-char *stack_bottom;
+
+/* The address where the heap starts (from the first sbrk (0) call).  */
+static void *my_heap_start;
+
+/* The gap between BSS end and heap start as far as we can tell.  */
+static unsigned long heap_bss_diff;
+
+/* If the gap between BSS end and heap start is larger than this we try to
+   work around it, and if that fails, output a warning in dump-emacs.  */
+#define MAX_HEAP_BSS_DIFF (1024*1024)
+
-
-#ifdef HAVE_WINDOW_SYSTEM
@@ -291 +306 @@
---fullwidth, -fw                make the first frame wide as the screen\n\
---geometry, -g GEOMETRY         window geometry\n\
---horizontal-scroll-bars, -hb   enable horizontal scroll bars\n\
---icon-type, -i                 use picture of gnu for Emacs icon\n\
---iconic                        start Emacs in iconified state\n\
@@ -329 +343 @@
-void (*fatal_error_signal_hook) P_ ((void));
-
+#ifdef HAVE_GTK_AND_PTHREAD
+/* When compiled with GTK and running under Gnome, multiple threads meay be
+   created.  Keep track of our main thread to make sure signals are delivered
+   to it (see syssignal.h).  */
+
+pthread_t main_thread;
+#endif
+
-
-#ifdef SIGUSR1
@@ -337 +359 @@
-  struct input_event buf;
-
+  SIGNAL_THREAD_CHECK (sig);
-  bzero (&buf, sizeof buf);
-  buf.kind = USER_SIGNAL_EVENT;
@@ -352 +375 @@
-  struct input_event buf;
-
+  SIGNAL_THREAD_CHECK (sig);
-  bzero (&buf, sizeof buf);
-  buf.kind = USER_SIGNAL_EVENT;
@@ -366 +390 @@
-     int sig;
-{
+  SIGNAL_THREAD_CHECK (sig);
-  fatal_error_code = sig;
-  signal (sig, SIG_DFL);
@@ -405 +430 @@
-{
-  signal (sig, memory_warning_signal);
+  SIGNAL_THREAD_CHECK (sig);
-
-  malloc_warning ("Operating system warns that virtual memory is running low.\n");
@@ -567 +593 @@
-    {
-      if (i == 0 || i > skip_args)
+        /* For the moment, we keep arguments as is in unibyte strings.
+           They are decoded in the function command-line after we know
+           locale-coding-system.  */
-        Vcommand_line_args
-
+
+
-    }
-
@@ -731 +761 @@
-
-      malloc_set_state (malloc_state_ptr);
+#ifndef XMALLOC_OVERRUN_CHECK
-      free (malloc_state_ptr);
+#endif
-    }
-  else
-
+
+
+
+
+
-}
-
@@ -745 +781 @@
-#define REPORT_EMACS_BUG_PRETEST_ADDRESS "emacs-pretest-bug@gnu.org"
-
-
-
+
+
+
+
+
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -795 +839 @@
-#endif
-  int no_loadup = 0;
+  char *junk = 0;
-#ifdef PDUMP
-  int print_version = 0;
@@ -805 +850 @@
-#endif
-
+#ifndef MEADOW
+  if (!initialized)
+    {
+      extern char my_endbss[];
+      extern char *my_endbss_static;
+
+      if (my_heap_start == 0)
+        my_heap_start = sbrk (0);
+
+      heap_bss_diff = (char *)my_heap_start - max (my_endbss, my_endbss_static);
+    }
+#endif
+
-#ifdef LINUX_SBRK_BUG
-  __sbrk (1);
@@ -812 +870 @@
-  if (initialized)
-    run_time_remap (argv[0]);
+#endif
+
+#ifdef MAC_OSX
+  if (!initialized)
+    unexec_init_emacs_zone ();
-#endif
-
@@ -828 +891 @@
-#ifdef PDUMP
-      print_version = 1;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#ifdef PDUMP
@@ -864 +965 @@
-#endif /* NeXT */
-
+#ifdef MAC_OSX
+  /* Skip process serial number passed in the form -psn_x_y as
+     command-line argument.  */
+  if (argc > skip_args + 1 && strncmp (argv[skip_args+1], "-psn_", 5) == 0)
+    skip_args++;
+#endif /* MAC_OSX */
+
-#ifdef VMS
-  /* If -map specified, map the data file in.  */
-  {
-    char *file;
-mapin_
+
-      mapin_data (file);
-  }
@@ -949 +1057 @@
-  free (realloc (malloc (4), 4));
-
+# ifndef SYNC_INPUT
-  /* Arrange to disable interrupt input inside malloc etc.  */
-  uninterrupt_malloc ();
+# endif /* not SYNC_INPUT */
-#endif  /* not SYSTEM_MALLOC */
-
-
+
+
+
+
+
-  /* We do all file input/output as binary files.  When we need to translate
-     newlines, we do that manually.  */
-  _fmode = O_BINARY;
-
+
+
+
-#if __DJGPP__ >= 2
-  if (!isatty (fileno (stdin)))
@@ -1035 +1151 @@
-  /* Command line option --no-windows is deprecated and thus not mentioned
-     in the manual and usage informations.  */
-
+
+
-    inhibit_window_system = 1;
-
@@ -1041 +1158 @@
-  noninteractive = 0;
-  if (argmatch (argv, argc, "-batch", "--batch", 5, NULL, &skip_args))
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  /* Handle the --help option, which gives a usage message.  */
-  if (argmatch (argv, argc, "-help", "--help", 3, NULL, &skip_args))
-    {
-
-
+
+
+
-      exit (0);
-    }
@@ -1086 +1216 @@
-  if (
-#ifndef CANNOT_DUMP
-
-
+
-#else
-      1
@@ -1208 +1337 @@
-         work correctly before syms_of_textprop, syms_of_macfns,
-         syms_of_ccl, syms_of_fontset, syms_of_xterm, syms_of_search,
-initialize
+term_init
-         been called.  */
-      syms_of_textprop ();
@@ -1220 +1349 @@
-      syms_of_frame ();
-
-initialize (
+term_init (build_string ("Mac"), NULL, NULL
-      init_keyboard ();
-#endif
@@ -1285 +1414 @@
-      /* --multibyte overrides EMACS_UNIBYTE.  */
-      if (argmatch (argv, argc, "-no-unibyte", "--no-unibyte", 4, NULL, &skip_args)
-
+
+
+
-        inhibit_unibyte = 1;
-
@@ -1403 +1534 @@
-
-#ifdef WINDOWSNT
+#ifndef MEADOW
+  globals_of_w32 ();
+#endif
-  /* Initialize environment from registry settings.  */
-  init_environment (argv);
-
+
+
+
+
+
+
-#endif
-
@@ -1522 +1661 @@
-      syms_of_xfns ();
-      syms_of_fontset ();
+#ifdef HAVE_X_SM
+      syms_of_xsmfns ();
+#endif
-#ifdef HAVE_X11
-      syms_of_xselect ();
@@ -1546 +1688 @@
-      syms_of_mw32mci ();
-      syms_of_fontset ();
-
+ /* not MEADOW */
-#ifdef HAVE_NTGUI
-      syms_of_w32term ();
@@ -1556 +1698 @@
-#endif /* not MEADOW */
-
+#ifdef HAVE_CARBON
+      syms_of_macterm ();
+      syms_of_macfns ();
+      syms_of_macmenu ();
+      syms_of_fontset ();
+#endif /* HAVE_CARBON */
+
-#ifdef SYMS_SYSTEM
-      SYMS_SYSTEM;
@@ -1574 +1723 @@
-  else
-    {
+      /* Initialization that must be done even if the global variable
+         initialized is non zero.  */
-#ifdef PDUMP
-      reinit_syms_of_abbrev ();
@@ -1585 +1736 @@
-      reinit_syms_of_editfns ();
-      reinit_syms_of_insdel ();
-#ifdef HAVE_X_WINDOWS
-      reinit_syms_of_xfns ();
-#ifdef HAVE_X11
-      reinit_syms_of_xselect ();
-#endif
-#endif /* HAVE_X_WINDOWS */
-
-#ifndef HAVE_NTGUI
-      reinit_syms_of_xmenu ();
-#endif
-
-#ifdef MEADOW
@@ -1602 +1743 @@
-      reinit_syms_of_mw32reg ();
-      reinit_syms_of_fontset ();
-
+
+
+
+
+
+
+
+
+
+
+
+
-#ifdef HAVE_NTGUI
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-      globals_of_w32menu ();
-
-
+
-    }
-
@@ -1634 +1777 @@
-  init_vmsproc ();      /* And this too.  */
-#endif /* VMS */
-
-
-
-
+
-#ifdef MEADOW
-  init_mw32fns ();
@@ -1667 +1807 @@
-        Vtop_level = Fcons (intern ("load"),
-                            Fcons (build_string (file), Qnil));
-#ifdef CANNOT_DUMP
-#ifdef SPECIAL_EXEC
-      Vtop_level = Fcons (intern ("load"),
-                          Fcons (build_string ("cd-startup.el"), Qnil));
-#else
-      /* Unless next switch is -nl, load "loadup.el" first thing.  */
-      if (! no_loadup)
-        Vtop_level = Fcons (intern ("load"),
-                            Fcons (build_string ("loadup.el"), Qnil));
-#endif
-#endif /* CANNOT_DUMP */
-    }
-
@@ -1780 +1913 @@
-#endif
-  { "-t", "--terminal", 120, 1 },
+  { "-nw", "--no-window-system", 110, 0 },
-  { "-nw", "--no-windows", 110, 0 },
-  { "-batch", "--batch", 100, 0 },
+  { "-script", "--script", 100, 1 },
-  { "-help", "--help", 90, 0 },
-  { "-no-unibyte", "--no-unibyte", 83, 0 },
@@ -1787 +1922 @@
-  { "-unibyte", "--unibyte", 81, 0 },
-  { "-no-multibyte", "--no-multibyte", 80, 0 },
-#ifdef CANNOT_DUMP
-  { "-nl", "--no-loadup", 70, 0 },
-#endif
-  /* -d must come last before the options handled in startup.el.  */
-  { "-d", "--display", 60, 1 },
@@ -1797 +1930 @@
-  { "-no-init-file", 0, 50, 0 },
-  { "-no-site-file", "--no-site-file", 40, 0 },
+  { "-no-splash", "--no-splash", 40, 0 },
-  { "-u", "--user", 30, 1 },
-  { "-user", 0, 30, 1 },
@@ -1814 +1948 @@
-  { "-fn", "--font", 10, 1 },
-  { "-font", 0, 10, 1 },
+  { "-fs", "--fullscreen", 10, 0 },
+  { "-fw", "--fullwidth", 10, 0 },
+  { "-fh", "--fullheight", 10, 0 },
-  { "-g", "--geometry", 10, 1 },
-  { "-geometry", 0, 10, 1 },
@@ -1825 +1962 @@
-  { "-hb", "--horizontal-scroll-bars", 5, 0 },
-  { "-vb", "--vertical-scroll-bars", 5, 0 },
+  { "-color", "--color", 5, 0},
-  /* These have the same priority as ordinary file name args,
-     so they are not reordered with respect to those.  */
@@ -1994 +2132 @@
-  bcopy (new, argv, sizeof (char *) * argc);
-
-
-
-
+x
+x
+x
-}
-
@@ -2070 +2208 @@
-  Vrun_hooks = Qnil;
-
-
+
+
+
+
-#ifdef EMACS_HAVE_TTY_PGRP
-  {
@@ -2107 +2248 @@
-  /* It's not safe to call intern here.  Maybe we are crashing.  */
-  if (!noninteractive && SYMBOLP (Vwindow_system)
-XSYMBOL (Vwindow_system)->name->size
-XSYMBOL (Vwindow_system)->name->data[0]
+SCHARS (SYMBOL_NAME (Vwindow_system))
+SREF (SYMBOL_NAME (Vwindow_system), 0)
-      && ! no_x)
-    Fx_close_current_connection ();
@@ -2153 +2294 @@
-  Lisp_Object tem;
-
+  check_pure_size ();
-  CHECK_STRING (filename);
-  filename = Fexpand_file_name (filename, Qnil);
@@ -2188 +2330 @@
-  int count = SPECPDL_INDEX ();
-
+  check_pure_size ();
+
-  if (! noninteractive)
-    error ("Dumping Emacs works only in batch mode");
+
+#ifdef __linux__
+  if (heap_bss_diff > MAX_HEAP_BSS_DIFF)
+    {
+      fprintf (stderr, "**************************************************\n");
+      fprintf (stderr, "Warning: Your system has a gap between BSS and the\n");
+      fprintf (stderr, "heap (%lu byte).  This usually means that exec-shield\n",
+               heap_bss_diff);
+      fprintf (stderr, "or something similar is in effect.  The dump may\n");
+      fprintf (stderr, "fail because of this.  See the section about \n");
+      fprintf (stderr, "exec-shield in etc/PROBLEMS for more information.\n");
+      fprintf (stderr, "**************************************************\n");
+    }
+#endif /* __linux__ */
-
-  /* Bind `command-line-processed' to nil before dumping,
@@ -2223 +2381 @@
-  fflush (stdout);
-#ifdef VMS
-XSTRING (filename)->data
- /* VMS */
-
+SDATA (filename)
+
+. 
-  /* Also arrange for warnings when nearly out of space.  */
-#ifndef SYSTEM_MALLOC
@@ -2233 +2391 @@
-  memory_warnings (my_edata, malloc_warning);
-#endif /* not WINDOWSNT */
-
+
+
+
+
+
+
+
-#ifdef PDUMP
-  pdump ();
-
-
-
-
-
-
-
+
-  {
-    char temacs_exe[MAX_PATH];
@@ -2266 +2424 @@
-#ifdef DOUG_LEA_MALLOC
-  malloc_state_ptr = malloc_get_state ();
- /* DOUG_LEA_MALLOC */
+
-
-#ifdef USE_MMAP_FOR_BUFFERS
-  mmap_set_vars (0);
- /* USE_MMAP_FOR_BUFFERS */
-XSTRING (filename)->data
-XSTRING (symfile)->data
+
+SDATA (filename)
+SDATA (symfile)
-#ifdef USE_MMAP_FOR_BUFFERS
-  mmap_set_vars (1);
- /* USE_MMAP_FOR_BUFFERS */
+
-#ifdef DOUG_LEA_MALLOC
-  free (malloc_state_ptr);
- /* DOUG_LEA_MALLOC */
+
-#endif /* not PDUMP */
-#endif /* not VMS */
@@ -2313 +2471 @@
-      *plocale = desired_locale;
-      setlocale (category, (STRINGP (desired_locale)
-(XSTRING (desired_locale)->data
+ SDATA (desired_locale
-                            : ""));
-    }
@@ -2430 +2588 @@
-
-  DEFVAR_LISP ("system-type", &Vsystem_type,
-
+
+
+
+
+
+
+
+
+
+
-  Vsystem_type = intern (SYSTEM_TYPE);
-
@@ -2507 +2674 @@
-  Vprevious_system_time_locale = Qnil;
-}
+
+/* arch-tag: 7bfd356a-c720-4612-8ab6-aa4222931c2e
+   (do not change this comment) */

branches/2.2/src/fileio.c

@@ -142 +142 @@
-#include "commands.h"
-extern int use_dialog_box;
-#if 0
-extern int use_file_dialog;
-#endif
-
-#ifndef O_WRONLY
@@ -183 +181 @@
-Lisp_Object Vfile_name_handler_alist;
-
-/* Format for auto-save files */
-Lisp_Object Vauto_save_file_format;
-
-/* Lisp functions for translating file formats */
-Lisp_Object Qformat_decode, Qformat_annotate_function;
@@ -240 +235 @@
-
-extern int minibuffer_auto_raise;
+
+extern int history_delete_duplicates;
-
-/* These variables describe handlers that have "already" had a chance
@@ -357 +354 @@
-{
-  /* This function must not munge the match data.  */
-
-
+
+
+
+
-  CHECK_STRING (filename);
-
@@ -374 +373 @@
-        {
-          Lisp_Object string;
+          int match_pos;
-          string = XCAR (elt);
-
+
+
-            {
-              Lisp_Object handler, tem;
@@ -382 +383 @@
-              tem = Fmemq (handler, inhibited_handlers);
-              if (NILP (tem))
-
+
+
+
+
-            }
-        }
@@ -388 +392 @@
-      QUIT;
-    }
-Qnil
+result