Merge from mainline.

13 files changed, 131 insertions, 70 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 29b2457e08a..2b0df1f7a30 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,6 @@
 2011-04-14  Paul Eggert  <eggert@cs.ucla.edu>
 
-        * lisp.h (INFUN): Remove.  Suggested by Dan Nicolaescu in
-        <http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00393.html>.
-        All uses spelled out.
+        Improve C-level modularity by making more things 'static'.
 
         Don't publish debugger-only interfaces to other modules.
         * lisp.h (safe_debug_print, debug_output_compilation_hack):
@@ -49,7 +47,7 @@
         (get_tty_terminal): Now static.
         (term_mouse_moveto): Do not define if HAVE_WINDOW_SYSTEM.
         * termhooks.h (term_mouse_moveto): Do not declare if
-        HAVE_WINDOW_SYSTEMM.
+        HAVE_WINDOW_SYSTEM.
         * dispextern.h (tty_set_terminal_modes, tty_reset_terminal_modes):
         (tty_turn_off_highlight, get_tty_terminal): Remove decls.
 
@@ -132,8 +130,6 @@
         Now static.
         * intervals.h (merge_interval_right, delete_interval): Remove decls.
 
-2011-04-13  Paul Eggert  <eggert@cs.ucla.edu>
-
         * insdel.c: Make symbols static if they're not exported.
         However, leave prepare_to_modify_buffer alone.  It's never
         called from outside this function, but that appears to be a bug.
@@ -218,8 +214,6 @@
         (xic_create_fontsetname): Declare only if HAVE_X_WINDOWS &&
         USE_X_TOOLKIT.
 
-2011-04-12  Paul Eggert  <eggert@cs.ucla.edu>
-
         * ftxfont.c: Make symbols static if they're not exported.
         (ftxfont_driver): Export only if !defined HAVE_XFT && def8ined
         HAVE_FREETYPE.
@@ -281,8 +275,6 @@
         * lisp.h (circular_list_error, FOREACH): Remove; unused.
         * data.c (circular_list_error): Remove.
 
-2011-04-11  Paul Eggert  <eggert@cs.ucla.edu>
-
         * commands.h (last_point_position, last_point_position_buffer):
         (last_point_position_window): Remove decls.
         * keyboard.c: Make these variables static.
@@ -370,11 +362,8 @@
         to see whether these functions can be called from other modules.
         DEFUN now defines a static function.  To make the function external
         so that it can be used in other C modules, use the new macro DEFUE.
-        * lisp.h (DEFINE_FUNC): New macro, with the old contents of DEFUN.
-        (DEFUN): Rewrite in terms of DEFINE_FUNC.  It now generates a
-        static function definition.  Use DEFUE if you want an extern one.
-        (DEFUE, INFUN): New macros.
-        (Funibyte_char_to_multibyte, Fsyntax_table_p, Finit_image_library):
+        * lisp.h (Funibyte_char_to_multibyte, Fsyntax_table_p):
+        (Finit_image_library):
         (Feval_region, Fbacktrace, Ffetch_bytecode, Fswitch_to_buffer):
         (Ffile_executable_p, Fmake_symbolic_link, Fcommand_execute):
         (Fget_process, Fdocumentation_property, Fbyte_code, Ffile_attributes):
@@ -423,12 +412,63 @@
         (Fset_window_margins, Fset_window_vscroll): New forward static decls.
         * window.h (Fset_window_vscroll, Fset_window_margins): Remove decls.
 
-2011-04-10  Paul Eggert  <eggert@cs.ucla.edu>
-
         * editfns.c (Fformat): Remove unreachable code.
 
+2011-04-14  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * fileio.c (Finsert_file_contents): Fix typo in 2005-05-13
+        change.  (Bug#8496)
+
+2011-04-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (handle_invisible_prop): Don't call bidi_paragraph_init
+        when at ZV.  (Bug#8487)
+
+2011-04-12  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * charset.c (Fclear_charset_maps): Use xfree instead of free.
+        (Bug#8437)
+        * keyboard.c (parse_tool_bar_item): Likewise.
+        * sound.c (sound_cleanup, alsa_close): Likewise.
+        * termcap.c (tgetent): Likewise.
+        * xfns.c (x_default_font_parameter): Likewise.
+        * xsettings.c (read_and_apply_settings): Likewise.
+
+        * alloc.c (overrun_check_malloc, overrun_check_realloc)
+        (overrun_check_free): Protoize.
+
+2011-04-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * sysdep.c (emacs_read, emacs_write): Check for negative sizes
+        since callers should never pass a negative size.
+        Change the signature to match that of plain 'read' and 'write'; see
+        <http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00397.html>.
+        * lisp.h: Update prototypes of emacs_write and emacs_read.
+
+2011-04-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (redisplay_window): Don't try to determine the character
+        position of the scroll margin if the window start point w->startp
+        is outside the buffer's accessible region.  (Bug#8468)
+
+2011-04-10  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix write-region and its subroutines for buffers > 2GB.
+        * fileio.c (a_write, e_write): Modify declaration of arguments and
+        local variables to support buffers larger than 2GB.
+        (Fcopy_file): Use EMACS_INT for return value of emacs_read.
+
+        * sysdep.c (emacs_write, emacs_read): Use ssize_t for last
+        argument, local variables, and return value.
+
+        * lisp.h: Update prototypes of emacs_write and emacs_read.
+
+        * sound.c (vox_write): Use ssize_t for return value of emacs_write.
+
 2011-04-10  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * xdisp.c (vmessage): Use memchr, not strnlen, which some hosts lack.
+
         Fix more problems found by GCC 4.6.0's static checks.
 
         * xdisp.c (vmessage): Use a better test for character truncation.
@@ -534,7 +574,7 @@
         * xselect.c (x_decline_selection_request)
         (x_reply_selection_request): Avoid type-punned deref of X events.
 
-2011-04-09  Eli Zaretskii  <eliz@emacstest.gnu.org>
+2011-04-09  Eli Zaretskii  <eliz@gnu.org>
 
         Fix some uses of `int' instead of EMACS_INT.
         * search.c (string_match_1, fast_string_match)
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 703b084743c..6f462e32534 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -4906,7 +4906,7 @@
         (Finternal_describe_syntax_value): Recognize new flag; use the
         SYNTAX_FLAGS_* macros.
         (scan_sexps_forward, Fparse_partial_sexp): Change representation of
-        comment style to accomodate the new styles.
+        comment style to accommodate the new styles.
         (back_comment, forw_comment, Fforward_comment, scan_lists)
         (scan_sexps_forward): Update code to obey the new comment style flag.
 
diff --git a/src/alloc.c b/src/alloc.c
index 1c793c985eb..16cd183aaa1 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -565,8 +565,7 @@ static int check_depth;
 /* Like malloc, but wraps allocated block with header and trailer.  */
 
 POINTER_TYPE *
-overrun_check_malloc (size)
-     size_t size;
+overrun_check_malloc (size_t size)
 {
   register unsigned char *val;
   size_t overhead = ++check_depth == 1 ? XMALLOC_OVERRUN_CHECK_SIZE*2 : 0;
@@ -590,11 +589,9 @@ overrun_check_malloc (size)
    with header and trailer.  */
 
 POINTER_TYPE *
-overrun_check_realloc (block, size)
-     POINTER_TYPE *block;
-     size_t size;
+overrun_check_realloc (POINTER_TYPE *block, size_t size)
 {
-  register unsigned char *val = (unsigned char *)block;
+  register unsigned char *val = (unsigned char *) block;
   size_t overhead = ++check_depth == 1 ? XMALLOC_OVERRUN_CHECK_SIZE*2 : 0;
 
   if (val
@@ -630,10 +627,9 @@ overrun_check_realloc (block, size)
 /* Like free, but checks block for overrun.  */
 
 void
-overrun_check_free (block)
-     POINTER_TYPE *block;
+overrun_check_free (POINTER_TYPE *block)
 {
-  unsigned char *val = (unsigned char *)block;
+  unsigned char *val = (unsigned char *) block;
 
   ++check_depth;
   if (val
diff --git a/src/charset.c b/src/charset.c
index cc7c53ae61c..c4699dcb0a7 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -2143,7 +2143,7 @@ It should be called only from temacs invoked for dumping.  */)
 {
   if (temp_charset_work)
     {
-      free (temp_charset_work);
+      xfree (temp_charset_work);
       temp_charset_work = NULL;
     }
 
diff --git a/src/fileio.c b/src/fileio.c
index 7f749536d56..b8c5e796db4 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -146,8 +146,10 @@ static Lisp_Object Qcar_less_than_car;
 
 static Lisp_Object Fmake_symbolic_link (Lisp_Object, Lisp_Object, Lisp_Object);
 static int a_write (int, Lisp_Object, int, int,
+static int a_write (int, Lisp_Object, EMACS_INT, EMACS_INT,
                     Lisp_Object *, struct coding_system *);
-static int e_write (int, Lisp_Object, int, int, struct coding_system *);
+static int e_write (int, Lisp_Object, EMACS_INT, EMACS_INT,
+                    struct coding_system *);
 
 
 void
@@ -1808,7 +1810,8 @@ If PRESERVE-SELINUX-CONTEXT is non-nil and SELinux is enabled
 on the system, we copy the SELinux context of FILE to NEWNAME.  */)
   (Lisp_Object file, Lisp_Object newname, Lisp_Object ok_if_already_exists, Lisp_Object keep_time, Lisp_Object preserve_uid_gid, Lisp_Object preserve_selinux_context)
 {
-  int ifd, ofd, n;
+  int ifd, ofd;
+  EMACS_INT n;
   char buf[16 * 1024];
   struct stat st, out_st;
   Lisp_Object handler;
@@ -3802,9 +3805,7 @@ variable `last-coding-system-used' to the coding system actually used.  */)
     /* For a special file, all we can do is guess.  */
     total = READ_BUF_SIZE;
 
-  /* FIXME: This if-statement is a no-op, because 'inserted' must be zero here
-     (Bug#8496).  */
-  if (NILP (visit) && inserted > 0)
+  if (NILP (visit) && total > 0)
     {
 #ifdef CLASH_DETECTION
       if (!NILP (BVAR (current_buffer, file_truename))
@@ -3914,7 +3915,6 @@ variable `last-coding-system-used' to the coding system actually used.  */)
   if (inserted == 0)
     {
 #ifdef CLASH_DETECTION
-      /* FIXME: This code is a no-op, too (Bug#8496).  */
       if (we_locked_file)
         unlock_file (BVAR (current_buffer, file_truename));
 #endif
@@ -4799,11 +4799,13 @@ build_annotations (Lisp_Object start, Lisp_Object end)
    The return value is negative in case of system call failure.  */
 
 static int
-a_write (int desc, Lisp_Object string, int pos, register int nchars, Lisp_Object *annot, struct coding_system *coding)
+a_write (int desc, Lisp_Object string, EMACS_INT pos,
+         register EMACS_INT nchars, Lisp_Object *annot,
+         struct coding_system *coding)
 {
   Lisp_Object tem;
-  int nextpos;
-  int lastpos = pos + nchars;
+  EMACS_INT nextpos;
+  EMACS_INT lastpos = pos + nchars;
 
   while (NILP (*annot) || CONSP (*annot))
     {
@@ -4843,7 +4845,8 @@ a_write (int desc, Lisp_Object string, int pos, register int nchars, Lisp_Object
    are indexes to the string STRING.  */
 
 static int
-e_write (int desc, Lisp_Object string, int start, int end, struct coding_system *coding)
+e_write (int desc, Lisp_Object string, EMACS_INT start, EMACS_INT end,
+         struct coding_system *coding)
 {
   if (STRINGP (string))
     {
@@ -4874,8 +4877,8 @@ e_write (int desc, Lisp_Object string, int start, int end, struct coding_system
         }
       else
         {
-          int start_byte = CHAR_TO_BYTE (start);
-          int end_byte = CHAR_TO_BYTE (end);
+          EMACS_INT start_byte = CHAR_TO_BYTE (start);
+          EMACS_INT end_byte = CHAR_TO_BYTE (end);
 
           coding->src_multibyte = (end - start) < (end_byte - start_byte);
           if (CODING_REQUIRE_ENCODING (coding))
diff --git a/src/keyboard.c b/src/keyboard.c
index 28e7e5bd463..7895d05b34f 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8270,7 +8270,7 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item)
         PROP (TOOL_BAR_ITEM_LABEL) = new_lbl;
       else
         PROP (TOOL_BAR_ITEM_LABEL) = make_string ("", 0);
-      free (buf);
+      xfree (buf);
     }
 
   /* If got a filter apply it on binding.  */
diff --git a/src/lisp.h b/src/lisp.h
index 09830a980f2..8b8e25eb689 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3316,8 +3316,8 @@ extern long get_random (void);
 extern void seed_random (long);
 extern int emacs_open (const char *, int, int);
 extern int emacs_close (int);
-extern int emacs_read (int, char *, unsigned int);
-extern int emacs_write (int, const char *, unsigned int);
+extern ssize_t emacs_read (int, char *, size_t);
+extern ssize_t emacs_write (int, const char *, size_t);
 enum { READLINK_BUFSIZE = 1024 };
 extern char *emacs_readlink (const char *, char [READLINK_BUFSIZE]);
 #ifndef HAVE_MEMSET
diff --git a/src/sound.c b/src/sound.c
index e121b5e37f3..697e81c814b 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -460,8 +460,8 @@ sound_cleanup (Lisp_Object arg)
     current_sound_device->close (current_sound_device);
   if (current_sound->fd > 0)
     emacs_close (current_sound->fd);
-  free (current_sound_device);
-  free (current_sound);
+  xfree (current_sound_device);
+  xfree (current_sound);
 
   return Qnil;
 }
@@ -897,7 +897,7 @@ vox_init (struct sound_device *sd)
 static void
 vox_write (struct sound_device *sd, const char *buffer, int nbytes)
 {
-  int nwritten = emacs_write (sd->fd, buffer, nbytes);
+  ssize_t nwritten = emacs_write (sd->fd, buffer, nbytes);
   if (nwritten < 0)
     sound_perror ("Error writing to sound device");
 }
@@ -1095,7 +1095,7 @@ alsa_close (struct sound_device *sd)
           snd_pcm_drain (p->handle);
           snd_pcm_close (p->handle);
         }
-      free (p);
+      xfree (p);
     }
 }
 
diff --git a/src/sysdep.c b/src/sysdep.c
index 3dc255933ee..0d9b31f35cd 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1825,10 +1825,18 @@ emacs_close (int fd)
   return rtnval;
 }
 
-int
-emacs_read (int fildes, char *buf, unsigned int nbyte)
+ssize_t
+emacs_read (int fildes, char *buf, size_t nbyte)
 {
-  register int rtnval;
+  register ssize_t rtnval;
+
+  /* Defend against the possibility that a buggy caller passes a negative NBYTE
+     argument, which would be converted to a large unsigned size_t NBYTE.  This
+     defense prevents callers from doing large writes, unfortunately.  This
+     size restriction can be removed once we have carefully checked that there
+     are no such callers.  */
+  if ((ssize_t) nbyte < 0)
+    abort ();
 
   while ((rtnval = read (fildes, buf, nbyte)) == -1
          && (errno == EINTR))
@@ -1836,14 +1844,18 @@ emacs_read (int fildes, char *buf, unsigned int nbyte)
   return (rtnval);
 }
 
-int
-emacs_write (int fildes, const char *buf, unsigned int nbyte)
+ssize_t
+emacs_write (int fildes, const char *buf, size_t nbyte)
 {
-  register int rtnval, bytes_written;
+  register ssize_t rtnval, bytes_written;
+
+  /* Defend against negative NBYTE, as in emacs_read.  */
+  if ((ssize_t) nbyte < 0)
+    abort ();
 
   bytes_written = 0;
 
-  while (nbyte > 0)
+  while (nbyte != 0)
     {
       rtnval = write (fildes, buf, nbyte);
 
diff --git a/src/termcap.c b/src/termcap.c
index 27a20a67ae1..5b71ad229d7 100644
--- a/src/termcap.c
+++ b/src/termcap.c
@@ -1,6 +1,6 @@
 /* Work-alike for termcap, plus extra features.
    Copyright (C) 1985, 1986, 1993, 1994, 1995, 2000, 2001, 2002, 2003,
-                 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007, 2008, 2011 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -468,15 +468,15 @@ tgetent (char *bp, const char *name)
       if (scan_file (term, fd, &buf) == 0)
         {
           close (fd);
-          free (buf.beg);
+          xfree (buf.beg);
           if (malloc_size)
-            free (bp);
+            xfree (bp);
           return 0;
         }
 
       /* Free old `term' if appropriate.  */
       if (term != name)
-        free (term);
+        xfree (term);
 
       /* If BP is malloc'd by us, make sure it is big enough.  */
       if (malloc_size)
@@ -506,7 +506,7 @@ tgetent (char *bp, const char *name)
     }
 
   close (fd);
-  free (buf.beg);
+  xfree (buf.beg);
 
   if (malloc_size)
     bp = (char *) xrealloc (bp, bp1 - bp + 1);
diff --git a/src/xdisp.c b/src/xdisp.c
index 3370d84d67f..4f1830f4c6c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3617,7 +3617,7 @@ handle_invisible_prop (struct it *it)
                  _after_ bidi iteration avoids affecting the visual
                  order of the displayed text when invisible properties
                  are added or removed.  */
-              if (it->bidi_it.first_elt)
+              if (it->bidi_it.first_elt && it->bidi_it.charpos < ZV)
                 {
                   /* If we were `reseat'ed to a new paragraph,
                      determine the paragraph base direction.  We need
@@ -8374,10 +8374,13 @@ vmessage (const char *m, va_list ap)
 
               /* Do any truncation at a character boundary.  */
               if (! (0 <= len && len < bufsize))
-                for (len = strnlen (buf, bufsize);
-                     len && ! CHAR_HEAD_P (buf[len - 1]);
-                     len--)
-                  continue;
+                {
+                  char *end = memchr (buf, 0, bufsize);
+                  for (len = end ? end - buf : bufsize;
+                       len && ! CHAR_HEAD_P (buf[len - 1]);
+                       len--)
+                    continue;
+                }
 
               message2 (FRAME_MESSAGE_BUF (f), len, 0);
             }
@@ -14206,7 +14209,14 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
 
       /* If there is a scroll margin at the top of the window, find
          its character position.  */
-      if (margin)
+      if (margin
+          /* Cannot call start_display if startp is not in the
+             accessible region of the buffer.  This can happen when we
+             have just switched to a different buffer and/or changed
+             its restriction.  In that case, startp is initialized to
+             the character position 1 (BEG) because we did not yet
+             have chance to display the buffer even once.  */
+          && BEGV <= CHARPOS (startp) && CHARPOS (startp) <= ZV)
         {
           struct it it1;
 
diff --git a/src/xfns.c b/src/xfns.c
index 1182ef8e770..290b6161215 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2958,7 +2958,7 @@ x_default_font_parameter (struct frame *f, Lisp_Object parms)
         {
           char *name = xstrdup (system_font);
           font = font_open_by_name (f, name);
-          free (name);
+          xfree (name);
         }
     }
 
diff --git a/src/xsettings.c b/src/xsettings.c
index d09b702a428..2513bcc5aa8 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -566,20 +566,20 @@ read_and_apply_settings (struct x_display_info *dpyinfo, int send_event_p)
           if (send_event_p)
             store_config_changed_event (Qtool_bar_style, dpyname);
         }
-      free (settings.tb_style);
+      xfree (settings.tb_style);
     }
 
   if (settings.seen & SEEN_FONT)
     {
       if (!current_font || strcmp (current_font, settings.font) != 0)
         {
-          free (current_font);
+          xfree (current_font);
           current_font = settings.font;
           if (send_event_p)
             store_config_changed_event (Qfont_name, dpyname);
         }
       else
-        free (settings.font);
+        xfree (settings.font);
     }
 }