ustream

13 files changed, 148 insertions, 81 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index b60c14fe289..fc8eab6d1df 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -67,10 +67,7 @@ end
 # from calling OutputDebugString, which causes GDB to display each
 # character twice (yuk!).
 define pr
-  set $output_debug = print_output_debug_flag
-  set print_output_debug_flag = 0
-  set debug_print ($)
-  set print_output_debug_flag = $output_debug
+  pp $
 end
 document pr
 Print the emacs s-expression which is $.
@@ -90,48 +87,17 @@ Print the argument as an emacs s-expression
 Works only when an inferior emacs is executing.
 end
 
-# Print out s-expressions from tool bar
-define pp1
-  set $tmp = $arg0
-  set $output_debug = print_output_debug_flag
-  set print_output_debug_flag = 0
-  set safe_debug_print ($tmp)
-  set print_output_debug_flag = $output_debug
-end
-document pp1
-Print the argument as an emacs s-expression.
-Works only when an inferior emacs is executing.
-For use on tool bar when debugging in Emacs
-where the variable name would not otherwise
-be recorded in the GUD buffer.
-end
-
 # Print value of lisp variable
 define pv
   set $tmp = "$arg0"
   set $output_debug = print_output_debug_flag
   set print_output_debug_flag = 0
-  set safe_debug_print ( find_symbol_value (intern ($tmp)))
-  set print_output_debug_flag = $output_debug
-end
-document pv
-Print the value of the lisp variable given as argument.
-Works only when an inferior emacs is executing.
-end
-
-# Print value of lisp variable
-define pv1
-  set $tmp = "$arg0"
-  set $output_debug = print_output_debug_flag
-  set print_output_debug_flag = 0
   set safe_debug_print (find_symbol_value (intern ($tmp)))
   set print_output_debug_flag = $output_debug
 end
-document pv1
+document pv
 Print the value of the lisp variable given as argument.
 Works only when an inferior emacs is executing.
-For use when debugging in Emacs where the variable
-name would not otherwise be recorded in the GUD buffer.
 end
 
 # Print out current buffer point and boundaries
diff --git a/src/ChangeLog b/src/ChangeLog
index 89fa90d9f92..2353cc1eca2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,76 @@
+2012-02-04  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * .gdbinit (pp1, pv1): Remove redundant defines.
+        (pr): Use pp.
+
+2012-02-04  Chong Yidong  <cyd@gnu.org>
+
+        * nsterm.m: Declare a global (Bug#10694).
+
+2012-02-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (get_emacs_configuration_options): Include
+        --enable-checking, if specified, in the return value.
+
+2012-02-04  Martin Rudalics  <rudalics@gmx.at>
+
+        * dispnew.c (change_frame_size_1): Calculate new_frame_total_cols
+        after rounding frame sizes.  (Bug#9723)
+
+2012-02-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * keyboard.c (adjust_point_for_property): Don't position point
+        before BEGV.  (Bug#10696)
+
+2012-02-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Handle overflow when computing char display width (Bug#9496).
+        * character.c (char_width): Return EMACS_INT, not int.
+        (char_width, c_string_width): Check for overflow when
+        computing the width; this is possible now that individual
+        characters can have unbounded width.  Problem introduced
+        by merge from Emacs 23 on 2012-01-19.
+
+2012-02-02  Michael Albinus  <michael.albinus@gmx.de>
+
+        * dbusbind.c (Fdbus_register_method): Mention the return value
+        :ignore in the docstring.
+
+2012-02-02  Glenn Morris  <rgm@gnu.org>
+
+        * callproc.c (Fcall_process, Fcall_process_region): Doc fix.
+
+        * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>:
+        Unconditionally set to t.  (Bug#10673)
+        * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>:
+        * w32term.c (syms_of_w32term) <x-toolkit-scroll-bars>:
+        * xterm.c (syms_of_xterm) <x-toolkit-scroll-bars>: Doc fix.
+
+2012-02-02  Kenichi Handa  <handa@m17n.org>
+
+        (x_produce_glyphs): Cancel previous change.  If cmp->glyph_len is
+        0, do not call append_composite_glyph.
+
+2012-02-02  Kenichi Handa  <handa@m17n.org>
+
+        * xdisp.c (BUILD_COMPOSITE_GLYPH_STRING): Initialize first_s to
+        NULL (Bug#6988).
+        (x_produce_glyphs): If the component of a composition is a null
+        string, set it->pixel_width to 1 to avoid zero-width glyph.
+
+2012-02-01  Eli Zaretskii  <eliz@gnu.org>
+
+        * ralloc.c (resize_bloc, r_alloc_sbrk): Don't call memmove if its
+        first 2 arguments are identical.  This makes inserting large
+        output from a subprocess an order of magnitude faster on
+        MS-Windows, where all sbrk'ed memory is always contiguous.
+
+2012-01-31  Glenn Morris  <rgm@gnu.org>
+
+        * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>:
+        * w32term.c (syms_of_w32term) <x-toolkit-scroll-bars>:
+        * xterm.c (syms_of_xterm) <x-toolkit-scroll-bars>: Sync docs.
+
 2012-01-29  Glenn Morris  <rgm@gnu.org>
 
         * gnutls.c (syms_of_gnutls): More doc (from etc/NEWS).
@@ -8,7 +81,6 @@
 
 2012-01-28  Chong Yidong  <cyd@gnu.org>
 
-
         * minibuf.c (syms_of_minibuf): Doc fix (Bug#10550).
 
 2012-01-26  Chong Yidong  <cyd@gnu.org>
@@ -2363,7 +2435,7 @@
         Remove unreachable code.
         (read_hex, load_charset_map_from_file): Check for integer overflow.
 
-        * xterm.c: don't go over XClientMessageEvent limit
+        * xterm.c: Don't go over XClientMessageEvent limit.
         (scroll_bar_windows_size): Now ptrdiff_t, as we prefer signed.
         (x_send_scroll_bar_event): Likewise.  Check that the size does not
         exceed limits imposed by XClientMessageEvent, as well as the usual
@@ -5654,7 +5726,7 @@
 
         * ccl.c (ccl_driver): Redo slightly to avoid the need for 'unsigned'.
 
-        ccl: add integer overflow checks
+        ccl: Add integer overflow checks.
         * ccl.c (CCL_CODE_MAX, GET_CCL_RANGE, GET_CCL_CODE, GET_CCL_INT):
         (IN_INT_RANGE): New macros.
         (ccl_driver): Use them to check for integer overflow when
diff --git a/src/callproc.c b/src/callproc.c
index c5208fb93d9..b5b8cadeb68 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -164,7 +164,8 @@ The remaining arguments are optional.
 The program's input comes from file INFILE (nil means `/dev/null').
 Insert output in BUFFER before point; t means current buffer; nil for BUFFER
  means discard it; 0 means discard and don't wait; and `(:file FILE)', where
- FILE is a file name string, means that it should be written to that file.
+ FILE is a file name string, means that it should be written to that file
+ \(if the file already exists it is overwritten).
 BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case,
 REAL-BUFFER says what to do with standard output, as above,
 while STDERR-FILE says what to do with standard error in the child.
@@ -940,7 +941,7 @@ Delete the text if fourth arg DELETE is non-nil.
 Insert output in BUFFER before point; t means current buffer; nil for
  BUFFER means discard it; 0 means discard and don't wait; and `(:file
  FILE)', where FILE is a file name string, means that it should be
- written to that file.
+ written to that file (if the file already exists it is overwritten).
 BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case,
 REAL-BUFFER says what to do with standard output, as above,
 while STDERR-FILE says what to do with standard error in the child.
diff --git a/src/character.c b/src/character.c
index 593fbcece0b..82bc2bfef4e 100644
--- a/src/character.c
+++ b/src/character.c
@@ -311,10 +311,10 @@ If the multibyte character does not represent a byte, return -1.  */)
 
 /* Return width (columns) of C considering the buffer display table DP. */
 
-static int
+static EMACS_INT
 char_width (int c, struct Lisp_Char_Table *dp)
 {
-  int width = CHAR_WIDTH (c);
+  EMACS_INT width = CHAR_WIDTH (c);
 
   if (dp)
     {
@@ -326,7 +326,12 @@ char_width (int c, struct Lisp_Char_Table *dp)
           {
             ch = AREF (disp, i);
             if (CHARACTERP (ch))
-              width += CHAR_WIDTH (XFASTINT (ch));
+              {
+                int w = CHAR_WIDTH (XFASTINT (ch));
+                if (INT_ADD_OVERFLOW (width, w))
+                  string_overflow ();
+                width += w;
+              }
           }
     }
   return width;
@@ -340,7 +345,8 @@ Tab is taken to occupy `tab-width' columns.
 usage: (char-width CHAR)  */)
   (Lisp_Object ch)
 {
-  int c, width;
+  int c;
+  EMACS_INT width;
 
   CHECK_CHARACTER (ch);
   c = XINT (ch);
@@ -367,10 +373,14 @@ c_string_width (const unsigned char *str, EMACS_INT len, int precision,
     {
       int bytes;
       int c = STRING_CHAR_AND_LENGTH (str + i_byte, bytes);
-      int thiswidth = char_width (c, dp);
+      EMACS_INT thiswidth = char_width (c, dp);
 
-      if (precision > 0
-          && (width + thiswidth > precision))
+      if (precision <= 0)
+        {
+          if (INT_ADD_OVERFLOW (width, thiswidth))
+            string_overflow ();
+        }
+      else if (precision - width < thiswidth)
         {
           *nchars = i;
           *nbytes = i_byte;
diff --git a/src/dbusbind.c b/src/dbusbind.c
index c89867fbae6..ad1a3f3cbe8 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -2162,10 +2162,13 @@ DONT-REGISTER-SERVICE below).
 
 PATH is the D-Bus object path SERVICE is registered (See discussion of
 DONT-REGISTER-SERVICE below).  INTERFACE is the interface offered by
-SERVICE.  It must provide METHOD.  HANDLER is a Lisp function to be
-called when a method call is received.  It must accept the input
-arguments of METHOD.  The return value of HANDLER is used for
-composing the returning D-Bus message.
+SERVICE.  It must provide METHOD.
+
+HANDLER is a Lisp function to be called when a method call is
+received.  It must accept the input arguments of METHOD.  The return
+value of HANDLER is used for composing the returning D-Bus message.
+In case HANDLER shall return a reply message with an empty argument
+list, HANDLER must return the symbol `:ignore'.
 
 When DONT-REGISTER-SERVICE is non-nil, the known name SERVICE is not
 registered.  This means that other D-Bus clients have no way of
diff --git a/src/dispnew.c b/src/dispnew.c
index 88de7361735..d2c2668864e 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -5774,19 +5774,22 @@ change_frame_size_1 (register struct frame *f, int newheight, int newwidth, int
   if (newwidth == 0)
     newwidth  = FRAME_COLS  (f);
 
-  /* Compute width of windows in F.
-     This is the width of the frame without vertical scroll bars.  */
-  new_frame_total_cols = FRAME_TOTAL_COLS_ARG (f, newwidth);
-
+  /* Compute width of windows in F.  */
   /* Round up to the smallest acceptable size.  */
   check_frame_size (f, &newheight, &newwidth);
 
+  /* This is the width of the frame with vertical scroll bars and fringe
+     columns.  Do this after rounding - see discussion of bug#9723.  */
+  new_frame_total_cols = FRAME_TOTAL_COLS_ARG (f, newwidth);
+
   /* If we're not changing the frame size, quit now.  */
-  /* Frame width may be unchanged but the text portion may change, for example,
-     fullscreen and remove/add scroll bar.  */
+  /* Frame width may be unchanged but the text portion may change, for
+     example, fullscreen and remove/add scroll bar.  */
   if (newheight == FRAME_LINES (f)
-      && newwidth == FRAME_COLS  (f) // text portion unchanged
-      && new_frame_total_cols == FRAME_TOTAL_COLS (f)) // frame width unchanged
+      /* Text portion unchanged?  */
+      && newwidth == FRAME_COLS  (f)
+      /* Frame width unchanged?  */
+      && new_frame_total_cols == FRAME_TOTAL_COLS (f))
     return;
 
   BLOCK_INPUT;
diff --git a/src/keyboard.c b/src/keyboard.c
index 87103177eab..8b17c32bf36 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1752,7 +1752,9 @@ adjust_point_for_property (EMACS_INT last_pt, int modified)
         {
           xassert (end > PT);
           SET_PT (PT < last_pt
-                  ? (STRINGP (val) && SCHARS (val) == 0 ? beg - 1 : beg)
+                  ? (STRINGP (val) && SCHARS (val) == 0
+                     ? max (beg - 1, BEGV)
+                     : beg)
                   : end);
           check_composition = check_invisible = 1;
         }
diff --git a/src/nsterm.m b/src/nsterm.m
index 70d3cc0e8b8..a45792fd645 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1,6 +1,7 @@
 /* NeXT/Open/GNUstep / MacOSX communication module.
-   Copyright (C) 1989, 1993-1994, 2005-2006, 2008-2012
-     Free Software Foundation, Inc.
+
+Copyright (C) 1989, 1993-1994, 2005-2006, 2008-2012
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -64,6 +65,7 @@ int term_trace_num = 0;
 #define NSTRACE(x)
 #endif
 
+extern NSString *NSMenuDidBeginTrackingNotification;
 
 /* ==========================================================================
 
@@ -6735,12 +6737,12 @@ Only works on OSX 10.6 or later.  */);
 
   /* TODO: move to common code */
   DEFVAR_LISP ("x-toolkit-scroll-bars", Vx_toolkit_scroll_bars,
-               doc: /* If not nil, Emacs uses toolkit scroll bars.  */);
-#ifdef USE_TOOLKIT_SCROLL_BARS
+               doc: /* Which toolkit scroll bars Emacs uses, if any.
+A value of nil means Emacs doesn't use toolkit scroll bars.
+With the X Window system, the value is a symbol describing the
+X toolkit.  Possible values are: gtk, motif, xaw, or xaw3d.
+With MS Windows or Nextstep, the value is t.  */);
   Vx_toolkit_scroll_bars = Qt;
-#else
-  Vx_toolkit_scroll_bars = Qnil;
-#endif
 
   DEFVAR_BOOL ("x-use-underline-position-properties",
                x_use_underline_position_properties,
diff --git a/src/ralloc.c b/src/ralloc.c
index 13587b9ffd4..896ad9f3155 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -636,7 +636,8 @@ resize_bloc (bloc_ptr bloc, SIZE size)
             }
           else
             {
-              memmove (b->new_data, b->data, b->size);
+              if (b->new_data != b->data)
+                memmove (b->new_data, b->data, b->size);
               *b->variable = b->data = b->new_data;
             }
         }
@@ -647,7 +648,8 @@ resize_bloc (bloc_ptr bloc, SIZE size)
         }
       else
         {
-          memmove (bloc->new_data, bloc->data, old_size);
+          if (bloc->new_data != bloc->data)
+            memmove (bloc->new_data, bloc->data, old_size);
           memset ((char *) bloc->new_data + old_size, 0, size - old_size);
           *bloc->variable = bloc->data = bloc->new_data;
         }
@@ -663,7 +665,8 @@ resize_bloc (bloc_ptr bloc, SIZE size)
             }
           else
             {
-              memmove (b->new_data, b->data, b->size);
+              if (b->new_data != b->data)
+                memmove (b->new_data, b->data, b->size);
               *b->variable = b->data = b->new_data;
             }
         }
@@ -816,7 +819,8 @@ r_alloc_sbrk (long int size)
              header.  */
           for (b = last_bloc; b != NIL_BLOC; b = b->prev)
             {
-              memmove (b->new_data, b->data, b->size);
+              if (b->new_data != b->data)
+                memmove (b->new_data, b->data, b->size);
               *b->variable = b->data = b->new_data;
             }
 
@@ -862,7 +866,8 @@ r_alloc_sbrk (long int size)
 
           for (b = first_bloc; b != NIL_BLOC; b = b->next)
             {
-              memmove (b->new_data, b->data, b->size);
+              if (b->new_data != b->data)
+                memmove (b->new_data, b->data, b->size);
               *b->variable = b->data = b->new_data;
             }
         }
diff --git a/src/w32.c b/src/w32.c
index f610a36ecf4..3d3d33453c6 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -1940,6 +1940,9 @@ get_emacs_configuration_options (void)
 #ifdef EMACSDEBUG
     " --no-opt",
 #endif
+#ifdef ENABLE_CHECKING
+    " --enable-checking",
+#endif
     /* configure.bat already sets USER_CFLAGS and USER_LDFLAGS
        with a starting space to save work here.  */
 #ifdef USER_CFLAGS
diff --git a/src/w32term.c b/src/w32term.c
index f764ad9d218..8a0e9efc943 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1,6 +1,6 @@
 /* Implementation of GUI terminal on the Microsoft W32 API.
 
-Copyright (C) 1989, 1993-2012  Free Software Foundation, Inc.
+Copyright (C) 1989, 1993-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -6432,7 +6432,7 @@ baseline level.  The default value is nil.  */);
 A value of nil means Emacs doesn't use toolkit scroll bars.
 With the X Window system, the value is a symbol describing the
 X toolkit.  Possible values are: gtk, motif, xaw, or xaw3d.
-With MS Windows, the value is t.  */);
+With MS Windows or Nextstep, the value is t.  */);
   Vx_toolkit_scroll_bars = Qt;
 
   staticpro (&last_mouse_motion_frame);
diff --git a/src/xdisp.c b/src/xdisp.c
index 87aedabd757..653ca46904b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -22878,7 +22878,7 @@ compute_overhangs_and_x (struct glyph_string *s, int x, int backward_p)
     ptrdiff_t cmp_id = (row)->glyphs[area][START].u.cmp.id;                 \
     struct composition *cmp = composition_table[cmp_id];                    \
     XChar2b *char2b;                                                        \
-    struct glyph_string *first_s IF_LINT (= NULL);                          \
+    struct glyph_string *first_s = NULL;                                    \
     int n;                                                                  \
                                                                             \
     char2b = (XChar2b *) alloca ((sizeof *char2b) * cmp->glyph_len);        \
@@ -24628,7 +24628,7 @@ x_produce_glyphs (struct it *it)
           /* Initialize the bounding box.  */
           if (pcm)
             {
-              width = pcm->width;
+              width = cmp->glyph_len > 0 ? pcm->width : 0;
               ascent = pcm->ascent;
               descent = pcm->descent;
               lbearing = pcm->lbearing;
@@ -24636,7 +24636,7 @@ x_produce_glyphs (struct it *it)
             }
           else
             {
-              width = font->space_width;
+              width = cmp->glyph_len > 0 ? font->space_width : 0;
               ascent = FONT_BASE (font);
               descent = FONT_DESCENT (font);
               lbearing = 0;
@@ -24854,7 +24854,7 @@ x_produce_glyphs (struct it *it)
       if (it->descent < 0)
         it->descent = 0;
 
-      if (it->glyph_row)
+      if (it->glyph_row && cmp->glyph_len > 0)
         append_composite_glyph (it);
     }
   else if (it->what == IT_COMPOSITION)
diff --git a/src/xterm.c b/src/xterm.c
index 7b9feeb9364..3581ea61eb2 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1,6 +1,6 @@
 /* X Communication module for terminals which understand the X protocol.
 
-Copyright (C) 1989, 1993-2012  Free Software Foundation, Inc.
+Copyright (C) 1989, 1993-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -10862,7 +10862,7 @@ selected window or cursor position is preserved.  */);
 A value of nil means Emacs doesn't use toolkit scroll bars.
 With the X Window system, the value is a symbol describing the
 X toolkit.  Possible values are: gtk, motif, xaw, or xaw3d.
-With MS Windows, the value is t.  */);
+With MS Windows or Nextstep, the value is t.  */);
 #ifdef USE_TOOLKIT_SCROLL_BARS
 #ifdef USE_MOTIF
   Vx_toolkit_scroll_bars = intern_c_string ("motif");