# HG changeset patch
# User Mats Lidell <matsl@xemacs.org>
# Date 1295043378 -3600
# Node ID 7ebbe334061ef0d4a68e7e4bf9afac6f14d35deb
# Parent  03545aab887413b9c17a3058b5e82a43edac4646# Parent  c9d31263ab7db633744accb5195727a4a343a3d7
Merge with trunk.

diff -r 03545aab8874 -r 7ebbe334061e lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jan 07 23:35:53 2011 +0100
+++ b/lisp/ChangeLog	Fri Jan 14 23:16:18 2011 +0100
@@ -1,3 +1,8 @@
+2011-01-10  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* dialog.el (make-dialog-box): Correct a misplaced parenthesis
+	here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
+
 2011-01-02  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* dialog.el (make-dialog-box):
diff -r 03545aab8874 -r 7ebbe334061e lisp/dialog.el
--- a/lisp/dialog.el	Fri Jan 07 23:35:53 2011 +0100
+++ b/lisp/dialog.el	Fri Jan 14 23:16:18 2011 +0100
@@ -661,9 +661,9 @@
        (remf rest :modal)
        (if modal
            (dialog-box-modal-loop `(make-dialog-box-internal ',type ',rest))
-         (make-dialog-box-internal type rest))))
-    (t
-     (make-dialog-box-internal type rest))))
+         (make-dialog-box-internal type rest)))
+      (t
+       (make-dialog-box-internal type rest)))))
 
 (defun dialog-box-finish (result)
   "Exit a modal dialog box, returning RESULT.
diff -r 03545aab8874 -r 7ebbe334061e lwlib/ChangeLog
--- a/lwlib/ChangeLog	Fri Jan 07 23:35:53 2011 +0100
+++ b/lwlib/ChangeLog	Fri Jan 14 23:16:18 2011 +0100
@@ -1,3 +1,10 @@
+2011-01-11  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* lwlib-fonts.c (xft_open_font_by_name):
+	Replace the POSIX index(3), not universally available even today,
+	with the C89 strchr(3), hopefully fixing a few of the buildbots'
+	problems.
+
 2010-06-13  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* lwlib-internal.h: Correct FSF address in permission notice.
diff -r 03545aab8874 -r 7ebbe334061e lwlib/lwlib-fonts.c
--- a/lwlib/lwlib-fonts.c	Fri Jan 07 23:35:53 2011 +0100
+++ b/lwlib/lwlib-fonts.c	Fri Jan 14 23:16:18 2011 +0100
@@ -74,7 +74,7 @@
   int count = 0;
   char *pos = name;
   /* extra parens shut up gcc */
-  while ((pos = index (pos, '-')))
+  while ((pos = strchr (pos, '-')))
     {
       count++;
       pos++;
@@ -84,7 +84,7 @@
   if (count == 14		/* fully-qualified XLFD */
       || (count < 14		/* heuristic for wildcarded XLFD */
 	  && count >= 5
-	  && index (name, '*')))
+	  && strchr (name, '*')))
     res = XftFontOpenXlfd (dpy, DefaultScreen (dpy), name);
   else
     res = XftFontOpenName (dpy, DefaultScreen (dpy), name);
diff -r 03545aab8874 -r 7ebbe334061e src/ChangeLog
--- a/src/ChangeLog	Fri Jan 07 23:35:53 2011 +0100
+++ b/src/ChangeLog	Fri Jan 14 23:16:18 2011 +0100
@@ -1,3 +1,8 @@
+2011-01-10  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* mc-alloc.c (get_used_list_index):
+	Replace some C++ comments with C-style /* comments.
+
 2011-01-02  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* fns.c (FdeleteX, FremoveX, Fnsubstitute, Fsubstitute, syms_of_fns): 
diff -r 03545aab8874 -r 7ebbe334061e src/mc-alloc.c
--- a/src/mc-alloc.c	Fri Jan 07 23:35:53 2011 +0100
+++ b/src/mc-alloc.c	Fri Jan 14 23:16:18 2011 +0100
@@ -1146,18 +1146,18 @@
 {
   if (size <= USED_LIST_MIN_OBJECT_SIZE)
     {
-      //      printf ("size %d -> index %d\n", size, 0);
+      /*      printf ("size %d -> index %d\n", size, 0); */
       return 0;
     }
   if (size <= (size_t) USED_LIST_UPPER_THRESHOLD)
     {
-      //      printf ("size %d -> index %d\n", size, 
-      //	      ((size - USED_LIST_MIN_OBJECT_SIZE - 1)
-      //	       / USED_LIST_LIN_STEP) + 1);
+      /*      printf ("size %d -> index %d\n", size, */
+      /*	      ((size - USED_LIST_MIN_OBJECT_SIZE - 1) */
+      /*	       / USED_LIST_LIN_STEP) + 1); */
       return ((size - USED_LIST_MIN_OBJECT_SIZE - 1)
 	      / USED_LIST_LIN_STEP) + 1;
     }
-  //  printf ("size %d -> index %d\n", size, N_USED_PAGE_LISTS - 1);
+  /*  printf ("size %d -> index %d\n", size, N_USED_PAGE_LISTS - 1); */
   return N_USED_PAGE_LISTS - 1;
 }