upstream

10 files changed, 147 insertions, 56 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8e439f1a1d4..ef57223b9ca 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,48 @@
+2012-03-03  Glenn Morris  <rgm@gnu.org>
+
+        * alloc.c (Fgarbage_collect, misc-objects-consed): Doc fixes.
+
+2012-03-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (try_window_reusing_current_matrix): Don't move cursor
+        position past the first glyph_row that ends at ZV.  (Bug#10902)
+        (redisplay_window, next_element_from_string): Fix typos in
+        comments.
+        (redisplay_window): Pass to move_it_vertically the margin in
+        pixels, not in screen lines.
+
+2012-03-02  Glenn Morris  <rgm@gnu.org>
+
+        * buffer.c (buffer-list-update-hook): Doc fix.
+
+2012-02-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (get_overlay_strings_1): Under bidi redisplay, call
+        push_it before setting up the iterator for the first overlay
+        string, even if we have an empty string loaded.
+        (next_overlay_string): If there's an empty string on the iterator
+        stack, pop the stack.  (Bug#10903)
+
+2012-02-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Generalize fix for crash due to non-contiguous EMACS_INT (Bug#10780).
+        Suggested by Stefan Monnier in
+        <http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00692.html>.
+        * alloc.c (widen_to_Lisp_Object): New static function.
+        (mark_memory): Also mark Lisp_Objects by fetching pointer words
+        and widening them to Lisp_Objects.  This would work even if
+        USE_LSB_TAG is defined and wide integers are used, which might
+        happen in a future version of Emacs.
+
+2012-02-25  Chong Yidong  <cyd@gnu.org>
+
+        * fileio.c (Ffile_selinux_context, Fset_file_selinux_context):
+        Doc fix.
+
+        * xselect.c (Fx_selection_exists_p): Doc fix.
+        (x_clipboard_manager_save_all): Print an informative message
+        before saving to clipboard manager.
+
 2012-02-24  Chong Yidong  <cyd@gnu.org>
 
         * keyboard.c (process_special_events): Handle all X selection
@@ -6764,7 +6809,7 @@
         conversion specifiers.  For example, use "...%"pI"d..." rather
         than "...%"pEd"...".
         (pEd): Remove.  All uses replaced with similar uses of pI.
-        * src/m/amdx86-64.h, src/m/ia64.h, src/m/ibms390x.h: Likewise.
+        * m/amdx86-64.h, m/ia64.h, m/ibms390x.h: Likewise.
         * alloc.c (check_pure_size): Don't overflow by converting size to int.
         * bidi.c (bidi_dump_cached_states): Use pI to avoid cast.
         * data.c (Fnumber_to_string): Use pI instead of if-then-else-abort.
@@ -7746,8 +7791,7 @@
         Without this change, on typical 64-bit hosts error ("...%d...", N)
         was used to print both 32- and 64-bit integers N, which relied on
         undefined behavior.
-        * lisp.h, src/m/amdx86-64.h, src/m/ia64.h, src/m/ibms390x.h (pEd):
-        New macro.
+        * lisp.h, m/amdx86-64.h, m/ia64.h, m/ibms390x.h (pEd): New macro.
         * lisp.h (error, verror): Mark as printf-like functions.
         * eval.c (verror): Use vsnprintf, not doprnt, to do the real work.
         Report overflow in size calculations when allocating printf buffer.
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 5baeb877939..10de7e53794 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -20972,7 +20972,7 @@
 
 2002-12-30  Richard Dawe  <rich@phekda.freeserve.co.uk>
 
-        * src/config.in (!HAVE_SIZE_T): Fix order of arguments in
+        * config.in (!HAVE_SIZE_T): Fix order of arguments in
         type definition of size_t.
 
 2003-01-02  Steven Tamm  <steventamm@mac.com>
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index e8bfd964312..2e5404779b1 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -533,8 +533,8 @@
         * deps.mk (getloadavg.o): Remove; gnulib now does this.
         * lisp.h (getloadavg) [!defined HAVE_GETLOADAVG]: Remove; gnulib
         now does this.
-        * src/s/freebsd.h (HAVE_GETLOADAVG): Remove; gnulib now does this.
-        * src/s/netbsd.h (HAVE_GETLOADAVG): Likewise.
+        * s/freebsd.h (HAVE_GETLOADAVG): Remove; gnulib now does this.
+        * s/netbsd.h (HAVE_GETLOADAVG): Likewise.
         * config.in: Regenerate.
 
 2011-02-15  Eli Zaretskii  <eliz@gnu.org>
@@ -12539,7 +12539,7 @@
 
 2009-06-23  Jim Meyering  <meyering@redhat.com>
 
-        * src/ftfont.c (setup_otf_gstring, ftfont_shape_by_flt):
+        * ftfont.c (setup_otf_gstring, ftfont_shape_by_flt):
         Use xmalloc and xrealloc (not malloc and realloc), so subsequent heap
         pointer dereferences are guaranteed to be valid.
 
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index 891c1ca081a..0952826e8c6 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -331,7 +331,7 @@
 
 1998-07-30  Paul Eggert  <eggert@twinsun.com>
 
-        * src/Makefile.in (widget.o, xfns.o, xmenu.o):
+        * Makefile.in (widget.o, xfns.o, xmenu.o):
         Prepend $(srcdir)/ to rule dependencies outside this dir.
 
 1998-07-29  Kenichi Handa  <handa@etl.go.jp>
@@ -4884,14 +4884,13 @@
         The new GNU C library strftime needs the underlying host's
         strftime for locale dependent formats.
 
-        * configure.in (AC_CHECK_FUNCS): Add strftime.
-        * src/config.in (HAVE_STRFTIME): New undef.
-        * src/editfns.c (emacs_strftime): New decl.
+        * config.in (HAVE_STRFTIME): New undef.
+        * editfns.c (emacs_strftime): New decl.
         (Fformat_time_string): Doc fix: %b, %h, %B, %a, %A, and %p depend on
         locale; don't use actual chars to describe %n and %t.
 
-        * src/Makefile.in (strftime.o):
-        * src/makefile.nt ($(BLD)\strftime.obj):
+        * Makefile.in (strftime.o):
+        * makefile.nt ($(BLD)\strftime.obj):
         No need to compile with -Dstrftime=emacs_strftime any more.
 
 1997-11-22  Richard Stallman  <rms@gnu.org>
diff --git a/src/alloc.c b/src/alloc.c
index 044e750413b..f85661415cd 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1,6 +1,7 @@
 /* Storage allocation and gc for GNU Emacs Lisp interpreter.
-   Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2012
-      Free Software Foundation, Inc.
+
+Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2012
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1582,6 +1583,21 @@ make_number (EMACS_INT n)
 }
 #endif
 
+/* Convert the pointer-sized word P to EMACS_INT while preserving its
+   type and ptr fields.  */
+static Lisp_Object
+widen_to_Lisp_Object (void *p)
+{
+  intptr_t i = (intptr_t) p;
+#ifdef USE_LISP_UNION_TYPE
+  Lisp_Object obj;
+  obj.i = i;
+  return obj;
+#else
+  return i;
+#endif
+}
+
 /***********************************************************************
                           String Allocation
  ***********************************************************************/
@@ -4293,7 +4309,19 @@ mark_memory (void *start, void *end)
 
   for (pp = start; (void *) pp < end; pp++)
     for (i = 0; i < sizeof *pp; i += GC_POINTER_ALIGNMENT)
-      mark_maybe_pointer (*(void **) ((char *) pp + i));
+      {
+        void *w = *(void **) ((char *) pp + i);
+        mark_maybe_pointer (w);
+
+#ifdef USE_LSB_TAG
+        /* A host where a Lisp_Object is wider than a pointer might
+           allocate a Lisp_Object in non-adjacent halves.  If
+           USE_LSB_TAG, the bottom half is not a valid pointer, so
+           widen it to to a Lisp_Object and check it that way.  */
+        if (sizeof w < sizeof (Lisp_Object))
+          mark_maybe_object (widen_to_Lisp_Object (w));
+#endif
+      }
 }
 
 /* setjmp will work with GCC unless NON_SAVING_SETJMP is defined in
@@ -4983,11 +5011,12 @@ Garbage collection happens automatically if you cons more than
 `gc-cons-threshold' bytes of Lisp data since previous garbage collection.
 `garbage-collect' normally returns a list with info on amount of space in use:
  ((USED-CONSES . FREE-CONSES) (USED-SYMS . FREE-SYMS)
-  (USED-MARKERS . FREE-MARKERS) USED-STRING-CHARS USED-VECTOR-SLOTS
+  (USED-MISCS . FREE-MISCS) USED-STRING-CHARS USED-VECTOR-SLOTS
   (USED-FLOATS . FREE-FLOATS) (USED-INTERVALS . FREE-INTERVALS)
   (USED-STRINGS . FREE-STRINGS))
 However, if there was overflow in pure space, `garbage-collect'
-returns nil, because real GC can't be done.  */)
+returns nil, because real GC can't be done.
+See Info node `(elisp)Garbage Collection'.  */)
   (void)
 {
   register struct specbinding *bind;
@@ -6417,7 +6446,9 @@ If this portion is smaller than `gc-cons-threshold', this is ignored.  */);
               doc: /* Number of string characters that have been consed so far.  */);
 
   DEFVAR_INT ("misc-objects-consed", misc_objects_consed,
-              doc: /* Number of miscellaneous objects that have been consed so far.  */);
+              doc: /* Number of miscellaneous objects that have been consed so far.
+These include markers and overlays, plus certain objects not visible
+to users.  */);
 
   DEFVAR_INT ("intervals-consed", intervals_consed,
               doc: /* Number of intervals that have been consed so far.  */);
diff --git a/src/buffer.c b/src/buffer.c
index 71a5e199c6f..1577254d92a 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1,6 +1,6 @@
 /* Buffer manipulation primitives for GNU Emacs.
 
-Copyright (C) 1985-1989, 1993-1995, 1997-2012  Free Software Foundation, Inc.
+Copyright (C) 1985-1989, 1993-1995, 1997-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1717,7 +1717,7 @@ record_buffer (Lisp_Object buffer)
 /* Move BUFFER to the end of the buffer (a)lists.  Do nothing if the
    buffer is killed.  For the selected frame's buffer list this moves
    BUFFER to its end even if it was never shown in that frame.  If
-   this happens we have a feature, hence `unrecord-buffer' should be
+   this happens we have a feature, hence `bury-buffer-internal' should be
    called only when BUFFER was shown in the selected frame.  */
 
 DEFUN ("bury-buffer-internal", Fbury_buffer_internal, Sbury_buffer_internal,
@@ -5996,7 +5996,7 @@ The function `kill-all-local-variables' runs this before doing anything else.  *
                doc: /* Hook run when the buffer list changes.
 Functions running this hook are `get-buffer-create',
 `make-indirect-buffer', `rename-buffer', `kill-buffer',
-`record-buffer' and `unrecord-buffer'.  */);
+and `bury-buffer-internal'.  */);
   Vbuffer_list_update_hook = Qnil;
   DEFSYM (Qbuffer_list_update_hook, "buffer-list-update-hook");
 
diff --git a/src/fileio.c b/src/fileio.c
index 839dc07b6ce..7efe919a9f0 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2798,9 +2798,13 @@ See `file-symlink-p' to distinguish symlinks.  */)
 
 DEFUN ("file-selinux-context", Ffile_selinux_context,
        Sfile_selinux_context, 1, 1, 0,
-       doc: /* Return SELinux context of file named FILENAME,
-as a list ("user", "role", "type", "range"). Return (nil, nil, nil, nil)
-if file does not exist, is not accessible, or SELinux is disabled */)
+       doc: /* Return SELinux context of file named FILENAME.
+The return value is a list (USER ROLE TYPE RANGE), where the list
+elements are strings naming the user, role, type, and range of the
+file's SELinux security context.
+
+Return (nil nil nil nil) if the file is nonexistent or inaccessible,
+or if SELinux is disabled, or if Emacs lacks SELinux support.  */)
   (Lisp_Object filename)
 {
   Lisp_Object absname;
@@ -2853,9 +2857,12 @@ if file does not exist, is not accessible, or SELinux is disabled */)
 
 DEFUN ("set-file-selinux-context", Fset_file_selinux_context,
        Sset_file_selinux_context, 2, 2, 0,
-       doc: /* Set SELinux context of file named FILENAME to CONTEXT
-as a list ("user", "role", "type", "range"). Has no effect if SELinux
-is disabled. */)
+       doc: /* Set SELinux context of file named FILENAME to CONTEXT.
+CONTEXT should be a list (USER ROLE TYPE RANGE), where the list
+elements are strings naming the components of a SELinux context.
+
+This function does nothing if SELinux is disabled, or if Emacs was not
+compiled with SELinux support.  */)
   (Lisp_Object filename, Lisp_Object context)
 {
   Lisp_Object absname;
diff --git a/src/lisp.h b/src/lisp.h
index 8ddc7ef143d..f2177ad789d 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -197,22 +197,8 @@ extern int suppress_checking EXTERNALLY_VISIBLE;
 # if defined DECL_ALIGN
 /* On hosts where VALBITS is greater than the pointer width in bits,
    USE_LSB_TAG is:
-
-    a. unnecessary, because the top bits of an EMACS_INT are unused,
-
-    b. slower, because it typically requires extra masking, and
-
-    c. harmful, because it can create Lisp_Object values that are so scrambled
-       that mark_maybe_object cannot decipher them.  mark_maybe_object assumes
-       that EMACS_INT values are contiguous, but a host where EMACS_INT is
-       wider than a pointer might allocate the top half of an EMACS_INT in
-       (say) a 32-bit word on the stack, putting the bottom half in a 32-bit
-       register that is saved elsewhere in a jmp_buf.  When this happens,
-       since USE_LSB_TAG is not defined the bottom half alone is a valid
-       pointer that mark_maybe_pointer can follow; but if USE_LSB_TAG were
-       defined, the bottom half would not be a valid pointer and neither
-       mark_maybe_object nor mark_maybe_pointer would follow it.
-
+    a. unnecessary, because the top bits of an EMACS_INT are unused, and
+    b. slower, because it typically requires extra masking.
    So, define USE_LSB_TAG only on hosts where it might be useful.  */
 #  if UINTPTR_MAX >> VALBITS != 0
 #   define USE_LSB_TAG
diff --git a/src/xdisp.c b/src/xdisp.c
index 6e5b1da284d..47eb75221e9 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5181,6 +5181,12 @@ next_overlay_string (struct it *it)
       it->current.overlay_string_index = -1;
       it->n_overlay_strings = 0;
       it->overlay_strings_charpos = -1;
+      /* If there's an empty display string on the stack, pop the
+         stack, to resync the bidi iterator with IT's position.  Such
+         empty strings are pushed onto the stack in
+         get_overlay_strings_1.  */
+      if (it->sp > 0 && STRINGP (it->string) && !SCHARS (it->string))
+        pop_it (it);
 
       /* If we're at the end of the buffer, record that we have
          processed the overlay strings there already, so that
@@ -5478,8 +5484,15 @@ get_overlay_strings_1 (struct it *it, EMACS_INT charpos, int compute_stop_p)
       xassert (!compute_stop_p || it->sp == 0);
 
       /* When called from handle_stop, there might be an empty display
-         string loaded.  In that case, don't bother saving it.  */
-      if (!STRINGP (it->string) || SCHARS (it->string))
+         string loaded.  In that case, don't bother saving it.  But
+         don't use this optimization with the bidi iterator, since we
+         need the corresponding pop_it call to resync the bidi
+         iterator's position with IT's position, after we are done
+         with the overlay strings.  (The corresponding call to pop_it
+         in case of an empty display string is in
+         next_overlay_string.)  */
+      if (!(!it->bidi_p
+            && STRINGP (it->string) && !SCHARS (it->string)))
         push_it (it, NULL);
 
       /* Set up IT to deliver display elements from the first overlay
@@ -7390,7 +7403,7 @@ next_element_from_string (struct it *it)
   if (it->current.overlay_string_index >= 0)
     {
       /* Get the next character from an overlay string.  In overlay
-         strings, There is no field width or padding with spaces to
+         strings, there is no field width or padding with spaces to
          do.  */
       if (IT_STRING_CHARPOS (*it) >= SCHARS (it->string))
         {
@@ -15650,7 +15663,7 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
              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
+             the character position 1 (BEGV) because we did not yet
              have chance to display the buffer even once.  */
           && BEGV <= CHARPOS (startp) && CHARPOS (startp) <= ZV)
         {
@@ -15659,7 +15672,7 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
 
           SAVE_IT (it1, it, it1data);
           start_display (&it1, w, startp);
-          move_it_vertically (&it1, margin);
+          move_it_vertically (&it1, margin * FRAME_LINE_HEIGHT (f));
           margin_pos = IT_CHARPOS (it1);
           RESTORE_IT (&it, &it, it1data);
         }
@@ -16384,7 +16397,10 @@ try_window_reusing_current_matrix (struct window *w)
            ++first_row_to_display)
         {
           if (PT >= MATRIX_ROW_START_CHARPOS (first_row_to_display)
-              && PT < MATRIX_ROW_END_CHARPOS (first_row_to_display))
+              && (PT < MATRIX_ROW_END_CHARPOS (first_row_to_display)
+                  || (PT == MATRIX_ROW_END_CHARPOS (first_row_to_display)
+                      && first_row_to_display->ends_at_zv_p
+                      && pt_row == NULL)))
             pt_row = first_row_to_display;
         }
 
@@ -16476,7 +16492,9 @@ try_window_reusing_current_matrix (struct window *w)
       if (pt_row)
         {
           for (row = MATRIX_ROW (w->current_matrix, w->cursor.vpos);
-               row < bottom_row && PT >= MATRIX_ROW_END_CHARPOS (row);
+               row < bottom_row
+                 && PT >= MATRIX_ROW_END_CHARPOS (row)
+                 && !row->ends_at_zv_p;
                row++)
             {
               w->cursor.vpos++;
diff --git a/src/xselect.c b/src/xselect.c
index 49955f03fd0..173cf78bdaa 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -2142,9 +2142,9 @@ DEFUN ("x-selection-exists-p", Fx_selection_exists_p, Sx_selection_exists_p,
        0, 2, 0,
        doc: /* Whether there is an owner for the given X selection.
 SELECTION should be the name of the selection in question, typically
-one of the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'.  (X expects
-these literal upper-case names.)  The symbol nil is the same as
-`PRIMARY', and t is the same as `SECONDARY'.
+one of the symbols `PRIMARY', `SECONDARY', `CLIPBOARD', or
+`CLIPBOARD_MANAGER' (X expects these literal upper-case names.)  The
+symbol nil is the same as `PRIMARY', and t is the same as `SECONDARY'.
 
 TERMINAL should be a terminal object or a frame specifying the X
 server to query.  If omitted or nil, that stands for the selected
@@ -2273,8 +2273,14 @@ x_clipboard_manager_save_all (void)
 
       local_frame = XCAR (XCDR (XCDR (XCDR (local_selection))));
       if (FRAME_LIVE_P (XFRAME (local_frame)))
-        internal_condition_case_1 (x_clipboard_manager_save, local_frame,
-                                   Qt, x_clipboard_manager_error_2);
+        {
+          Lisp_Object args[1];
+          args[0] = build_string ("Saving clipboard to X clipboard manager...");
+          Fmessage (1, args);
+
+          internal_condition_case_1 (x_clipboard_manager_save, local_frame,
+                                     Qt, x_clipboard_manager_error_2);
+        }
     }
 }