Merge from trunk.

5 files changed, 95 insertions, 70 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b74d831d707..74f0bd52a5d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -22,8 +22,6 @@
 
         * lisp.h (FIXNUM_OVERFLOW_P): Work even if arg is a NaN.
 
-2011-05-21  Paul Eggert  <eggert@cs.ucla.edu>
-
         * data.c: Avoid integer truncation in expressions involving floats.
         * data.c: Include <intprops.h>.
         (arith_driver): When there's an integer overflow in an expression
@@ -33,8 +31,6 @@
         most-negative-fixnum 0.5) should yield about -4.6e+18, not zero.
         Do not rely on undefined behavior after integer overflow.
 
-2011-05-20  Paul Eggert  <eggert@cs.ucla.edu>
-
         merge count_size_as_multibyte, parse_str_to_multibyte
         * character.c, character.h (count_size_as_multibyte):
         Renamed from parse_str_to_multibyte; all uses changed.
@@ -44,6 +40,40 @@
         a character than a buffer op, so better that it's in character.c.
         * fns.c, print.c: Adjust to above changes.
 
+2011-05-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * gnutls.c: Remove unused macros.
+        (fn_gnutls_transport_set_lowat, fn_gnutls_transport_set_pull_function):
+        (fn_gnutls_transport_set_push_function) [!WINDOWSNT]:
+        Remove macros that are defined and never used.
+        Caught by gcc -Wunused-macros (GCC 4.6.0, Fedora 14).
+
+2011-05-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xselect.c (syms_of_xselect): Remove unused symbol SAVE_TARGETS.
+        (Fx_get_selection_internal): Minor cleanup.
+        (Fx_own_selection_internal): Rename arguments for consistency with
+        select.el.
+
+2011-05-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * xselect.c (QSAVE_TARGETS): New static var, to fix build failure.
+
+2011-05-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xselect.c (syms_of_xselect): Include character.h; use DEFSYM.
+
+2011-05-21  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * dispnew.c (scrolling_window): Don't exclude the case that the
+        last enabled row in the desired matrix touches the bottom boundary.
+
+2011-05-21  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in ($(etc)/DOC): Make second command line even shorter.
+        (SOME_MACHINE_OBJECTS): Replace FONT_OBJ by its maximal expansion,
+        and add some more files.
+
 2011-05-20  Eli Zaretskii  <eliz@gnu.org>
 
         * callproc.c (Fcall_process) [MSDOS]: Fix arguments to
diff --git a/src/Makefile.in b/src/Makefile.in
index 557a6f54748..c4250b90633 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -149,11 +149,13 @@ M17N_FLT_LIBS = @M17N_FLT_LIBS@
 
 DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_LIBS = @DBUS_LIBS@
+## dbusbind.o if HAVE_DBUS, else empty.
 DBUS_OBJ = @DBUS_OBJ@
 
 GCONF_CFLAGS = @GCONF_CFLAGS@
 GCONF_LIBS = @GCONF_LIBS@
 
+## gtkutil.o if USE_GTK, else empty.
 GTK_OBJ=@GTK_OBJ@
 
 ## -ltermcap, or -lncurses, or -lcurses, or "".
@@ -198,7 +200,10 @@ OLDXMENU_DEPS=@OLDXMENU_DEPS@
 ## Else $(OLDXMENU).
 LIBXMENU=@LIBXMENU@
 
+## xmenu.o if HAVE_X_WINDOWS, else empty.
 XMENU_OBJ=@XMENU_OBJ@
+## xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o
+## xsettings.o xgselect.o if HAVE_X_WINDOWS, else empty.
 XOBJ=@XOBJ@
 
 TOOLKIT_LIBW=@TOOLKIT_LIBW@
@@ -241,7 +246,9 @@ MSDOS_X_OBJ =
 ns_appdir=@ns_appdir@
 ns_appbindir=@ns_appbindir@
 ns_appsrc=@ns_appsrc@
+## fontset.o fringe.o image.o if HAVE_NS, else empty.
 NS_OBJ=@NS_OBJ@
+## nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o if HAVE_NS.
 NS_OBJC_OBJ=@NS_OBJC_OBJ@
 ## Only set if NS_IMPL_GNUSTEP.
 GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@
@@ -333,12 +340,16 @@ obj = $(base_obj) $(NS_OBJC_OBJ)
 
 ## Object files used on some machine or other.
 ## These go in the DOC file on all machines in case they are needed.
+## Some of them have no DOC entries, but it does no harm to have them
+## in the list, in case they ever add any such entries.
 SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
   xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
   fontset.o dbusbind.o \
   nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \
   w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
-  w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_OBJ)
+  w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
+  w16select.o widget.o xfont.o ftfont.o xftfont.o ftxfont.o gtkutil.o \
+  xsettings.o xgselect.o termcap.o
 
 ## gmalloc.o if !SYSTEM_MALLOC && !DOUG_LEA_MALLOC, else empty.
 GMALLOC_OBJ=@GMALLOC_OBJ@
@@ -411,7 +422,7 @@ emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp)
 $(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp)
         -rm -f $(etc)/DOC
         $(libsrc)/make-docfile -d $(srcdir) $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC
-        $(libsrc)/make-docfile -a $(etc)/DOC -d $(srcdir) `sed -n -e 's| \\\\||' -e 's|^[       ]*$$(lispsource)|../lisp|p' $(srcdir)/lisp.mk`
+        $(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) `sed -n -e 's| \\\\||' -e 's|^[   ]*$$(lispsource)/||p' $(srcdir)/lisp.mk`
 
 $(libsrc)/make-docfile$(EXEEXT):
         cd $(libsrc); $(MAKE) $(MFLAGS) make-docfile$(EXEEXT)
diff --git a/src/dispnew.c b/src/dispnew.c
index 0457d650b3a..41f486baf16 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -4330,23 +4330,29 @@ scrolling_window (struct window *w, int header_line_p)
 
   first_old = first_new = i;
 
-  /* Set last_new to the index + 1 of the last enabled row in the
-     desired matrix.  */
+  /* Set last_new to the index + 1 of the row that reaches the
+     bottom boundary in the desired matrix.  Give up if we find a
+     disabled row before we reach the bottom boundary.  */
   i = first_new + 1;
-  while (i < desired_matrix->nrows - 1
-         && MATRIX_ROW (desired_matrix, i)->enabled_p
-         && MATRIX_ROW_BOTTOM_Y (MATRIX_ROW (desired_matrix, i)) <= yb)
-    ++i;
+  while (i < desired_matrix->nrows - 1)
+    {
+      int bottom;
 
-  if (!MATRIX_ROW (desired_matrix, i)->enabled_p)
-    return 0;
+      if (!MATRIX_ROW (desired_matrix, i)->enabled_p)
+        return 0;
+      bottom = MATRIX_ROW_BOTTOM_Y (MATRIX_ROW (desired_matrix, i));
+      if (bottom <= yb)
+        ++i;
+      if (bottom >= yb)
+        break;
+    }
 
   last_new = i;
 
-  /* Set last_old to the index + 1 of the last enabled row in the
-     current matrix.  We don't look at the enabled flag here because
-     we plan to reuse part of the display even if other parts are
-     disabled.  */
+  /* Set last_old to the index + 1 of the row that reaches the bottom
+     boundary in the current matrix.  We don't look at the enabled
+     flag here because we plan to reuse part of the display even if
+     other parts are disabled.  */
   i = first_old + 1;
   while (i < current_matrix->nrows - 1)
     {
diff --git a/src/gnutls.c b/src/gnutls.c
index 540bfaac25c..5558fb9ee0b 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -221,10 +221,7 @@ init_gnutls_functions (Lisp_Object libraries)
 #define fn_gnutls_record_send                   gnutls_record_send
 #define fn_gnutls_strerror                      gnutls_strerror
 #define fn_gnutls_transport_set_errno           gnutls_transport_set_errno
-#define fn_gnutls_transport_set_lowat           gnutls_transport_set_lowat
 #define fn_gnutls_transport_set_ptr2            gnutls_transport_set_ptr2
-#define fn_gnutls_transport_set_pull_function   gnutls_transport_set_pull_function
-#define fn_gnutls_transport_set_push_function   gnutls_transport_set_push_function
 #define fn_gnutls_x509_crt_check_hostname       gnutls_x509_crt_check_hostname
 #define fn_gnutls_x509_crt_deinit               gnutls_x509_crt_deinit
 #define fn_gnutls_x509_crt_import               gnutls_x509_crt_import
diff --git a/src/xselect.c b/src/xselect.c
index 3ddd4c54b49..c4e9fbf9ff7 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -38,6 +38,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "process.h"
 #include "termhooks.h"
 #include "keyboard.h"
+#include "character.h"
 
 #include <X11/Xproto.h>
 
@@ -400,17 +401,6 @@ x_get_local_selection (Lisp_Object selection_symbol, Lisp_Object target_type, in
       handler_fn = Qnil;
       value = XCAR (XCDR (XCDR (local_value)));
     }
-#if 0
-  else if (EQ (target_type, QDELETE))
-    {
-      handler_fn = Qnil;
-      Fx_disown_selection_internal
-        (selection_symbol,
-         XCAR (XCDR (XCDR (local_value))));
-      value = QNULL;
-    }
-#endif
-
 #if 0 /* #### MULTIPLE doesn't work yet */
   else if (CONSP (target_type)
            && XCAR (target_type) == QMULTIPLE)
@@ -2006,18 +1996,18 @@ x_handle_selection_notify (XSelectionEvent *event)
 
 DEFUN ("x-own-selection-internal", Fx_own_selection_internal,
        Sx_own_selection_internal, 2, 2, 0,
-       doc: /* Assert an X selection of the given TYPE with the given VALUE.
-TYPE is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
+       doc: /* Assert an X selection of type SELECTION and value VALUE.
+SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
 \(Those are literal upper-case symbol names, since that's what X expects.)
 VALUE is typically a string, or a cons of two markers, but may be
 anything that the functions on `selection-converter-alist' know about.  */)
-  (Lisp_Object selection_name, Lisp_Object selection_value)
+  (Lisp_Object selection, Lisp_Object value)
 {
   check_x ();
-  CHECK_SYMBOL (selection_name);
-  if (NILP (selection_value)) error ("SELECTION-VALUE may not be nil");
-  x_own_selection (selection_name, selection_value);
-  return selection_value;
+  CHECK_SYMBOL (selection);
+  if (NILP (value)) error ("VALUE may not be nil");
+  x_own_selection (selection, value);
+  return value;
 }
 
 
@@ -2056,22 +2046,16 @@ selections.  If omitted, defaults to the time for the last event.  */)
   val = x_get_local_selection (selection_symbol, target_type, 1);
 
   if (NILP (val))
-    {
-      val = x_get_foreign_selection (selection_symbol, target_type, time_stamp);
-      goto DONE;
-    }
+    RETURN_UNGCPRO (x_get_foreign_selection (selection_symbol,
+                                             target_type, time_stamp));
 
-  if (CONSP (val)
-      && SYMBOLP (XCAR (val)))
+  if (CONSP (val) && SYMBOLP (XCAR (val)))
     {
       val = XCDR (val);
       if (CONSP (val) && NILP (XCDR (val)))
         val = XCAR (val);
     }
-  val = clean_local_selection_data (val);
- DONE:
-  UNGCPRO;
-  return val;
+  RETURN_UNGCPRO (clean_local_selection_data (val));
 }
 
 DEFUN ("x-disown-selection-internal", Fx_disown_selection_internal,
@@ -2651,25 +2635,22 @@ A value of 0 means wait as long as necessary.  This is initialized from the
   x_selection_timeout = 0;
 
   /* QPRIMARY is defined in keyboard.c.  */
-  QSECONDARY = intern_c_string ("SECONDARY");   staticpro (&QSECONDARY);
-  QSTRING    = intern_c_string ("STRING");      staticpro (&QSTRING);
-  QINTEGER   = intern_c_string ("INTEGER");     staticpro (&QINTEGER);
-  QCLIPBOARD = intern_c_string ("CLIPBOARD");   staticpro (&QCLIPBOARD);
-  QTIMESTAMP = intern_c_string ("TIMESTAMP");   staticpro (&QTIMESTAMP);
-  QTEXT      = intern_c_string ("TEXT");        staticpro (&QTEXT);
-  QCOMPOUND_TEXT = intern_c_string ("COMPOUND_TEXT"); staticpro (&QCOMPOUND_TEXT);
-  QUTF8_STRING = intern_c_string ("UTF8_STRING"); staticpro (&QUTF8_STRING);
-  QDELETE    = intern_c_string ("DELETE");      staticpro (&QDELETE);
-  QMULTIPLE  = intern_c_string ("MULTIPLE");    staticpro (&QMULTIPLE);
-  QINCR      = intern_c_string ("INCR");                staticpro (&QINCR);
-  QEMACS_TMP = intern_c_string ("_EMACS_TMP_"); staticpro (&QEMACS_TMP);
-  QTARGETS   = intern_c_string ("TARGETS");     staticpro (&QTARGETS);
-  QATOM      = intern_c_string ("ATOM");                staticpro (&QATOM);
-  QATOM_PAIR = intern_c_string ("ATOM_PAIR");   staticpro (&QATOM_PAIR);
-  QNULL      = intern_c_string ("NULL");                staticpro (&QNULL);
-  Qcompound_text_with_extensions = intern_c_string ("compound-text-with-extensions");
-  staticpro (&Qcompound_text_with_extensions);
-
-  Qforeign_selection = intern_c_string ("foreign-selection");
-  staticpro (&Qforeign_selection);
+  DEFSYM (QSECONDARY, "SECONDARY");
+  DEFSYM (QSTRING, "STRING");
+  DEFSYM (QINTEGER, "INTEGER");
+  DEFSYM (QCLIPBOARD, "CLIPBOARD");
+  DEFSYM (QTIMESTAMP, "TIMESTAMP");
+  DEFSYM (QTEXT, "TEXT");
+  DEFSYM (QCOMPOUND_TEXT, "COMPOUND_TEXT");
+  DEFSYM (QUTF8_STRING, "UTF8_STRING");
+  DEFSYM (QDELETE, "DELETE");
+  DEFSYM (QMULTIPLE, "MULTIPLE");
+  DEFSYM (QINCR, "INCR");
+  DEFSYM (QEMACS_TMP, "_EMACS_TMP_");
+  DEFSYM (QTARGETS, "TARGETS");
+  DEFSYM (QATOM, "ATOM");
+  DEFSYM (QATOM_PAIR, "ATOM_PAIR");
+  DEFSYM (QNULL, "NULL");
+  DEFSYM (Qcompound_text_with_extensions, "compound-text-with-extensions");
+  DEFSYM (Qforeign_selection, "foreign-selection");
 }