merge from trunk, no conflicts

8 files changed, 67 insertions, 10 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index bfc2f3582a6..45cccea1ebb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,44 @@
+2010-08-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * eval.c (Fdefmacro): Only obey one declaration.
+
+        * casefiddle.c (casify_region): Setup gl_state.
+
+2010-08-18  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (ns_define_frame_cursor): Call x_update_cursor (Bug#6868).
+
+2010-08-18  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (update_frame_tool_bar): Literal stings are const char*.
+
+2010-08-18  David De La Harpe Golden  <david@harpegolden.net>
+
+        * nsselect.m (QCLIPBOARD, NXPrimaryPboard): Define.
+        (symbol_to_nsstring): Map QCLIPBOARD => NSGeneralPboard,
+        QPRIMARY => NXPrimaryPboard.
+        (ns_string_to_symbol): NSGeneralPboard => QCLIPBOARD,
+        NXPrimaryPboard => QPRIMARY.
+        (nxatoms_of_nsselect): NXPrimaryPboard = PrimarySelection,
+        NXSecondaryPboard = SecondarySelection.
+        (syms_of_nsselect): Intern QCLIPBOARD (Bug#6677).
+
+2010-08-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * gtkutil.c (update_frame_tool_bar): Don't assume TOOL_BAR_ITEM_LABEL
+        is a string.
+
+2010-08-17  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsfns.m (ns_frame_parm_handlers): Add a slot for the
+        x_set_tool_bar_position handler.
+
+2010-08-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c <w32_frame_parm_handlers>: Add a slot for the
+        x_set_tool_bar_position handler, needed to support changes from
+        2010-07-29T16:49:59Z!jan.h.d@swipnet.se for positioning the tool bar.  (Bug#6796)
+
 2010-08-16  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsselect.m: include keyboard.h for QPRIMARY, remove its
@@ -30,8 +71,9 @@
 
 2010-08-15  Jan Djärv  <jan.h.d@swipnet.se>
 
-        * keyboard.c (parse_tool_bar_item): malloc buf.  Set TOOL_BAR_ITEM_LABEL
-        to empty string if not set to new_lbl (Bug#6855).
+        * keyboard.c (parse_tool_bar_item): malloc buf.
+        Set TOOL_BAR_ITEM_LABEL to empty string if not set to
+        new_lbl (Bug#6855).
 
 2010-08-14  Eli Zaretskii  <eliz@gnu.org>
 
@@ -39,8 +81,8 @@
         * w32term.c (x_draw_stretch_glyph_string): In R2L rows, display
         the cursor on the right edge of the stretch glyph.
 
-        * xdisp.c (window_box_right_offset, window_box_right): Fix
-        commentary.
+        * xdisp.c (window_box_right_offset, window_box_right):
+        Fix commentary.
 
         * xdisp.c (Fcurrent_bidi_paragraph_direction): Fix paragraph
         direction when point is inside a run of whitespace characters.
diff --git a/src/casefiddle.c b/src/casefiddle.c
index 815f684e26a..b6551618b2f 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -221,6 +221,8 @@ casify_region (enum case_action flag, Lisp_Object b, Lisp_Object e)
   start_byte = CHAR_TO_BYTE (start);
   end_byte = CHAR_TO_BYTE (end);
 
+  SETUP_BUFFER_SYNTAX_TABLE();  /* For syntax_prefix_flag_p.  */
+
   while (start < end)
     {
       int c2, len;
diff --git a/src/eval.c b/src/eval.c
index f127ef03293..5c6b268187b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -690,8 +690,8 @@ usage: (defmacro NAME ARGLIST [DOCSTRING] [DECL] BODY...)  */)
       tail = XCDR (tail);
     }
 
-  while (CONSP (Fcar (tail))
-         && EQ (Fcar (Fcar (tail)), Qdeclare))
+  if (CONSP (Fcar (tail))
+      && EQ (Fcar (Fcar (tail)), Qdeclare))
     {
       if (!NILP (Vmacro_declaration_function))
         {
diff --git a/src/gtkutil.c b/src/gtkutil.c
index fd89015aedc..dbd48eb5272 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -4292,7 +4292,8 @@ update_frame_tool_bar (FRAME_PTR f)
       GtkWidget *wbutton = NULL;
       GtkWidget *weventbox;
       Lisp_Object specified_file;
-      char *label = SSDATA (PROP (TOOL_BAR_ITEM_LABEL));
+      const char *label = (STRINGP (PROP (TOOL_BAR_ITEM_LABEL))
+                           ? SSDATA (PROP (TOOL_BAR_ITEM_LABEL)) : "");
       
       ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), i);
 
diff --git a/src/nsfns.m b/src/nsfns.m
index aac2ef0ed3a..576131e0bdf 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1041,6 +1041,7 @@ frame_parm_handler ns_frame_parm_handlers[] =
   x_set_font_backend, /* generic OK */
   x_set_alpha,
   0, /* x_set_sticky */  
+  0, /* x_set_tool_bar_position */  
 };
 
 
diff --git a/src/nsselect.m b/src/nsselect.m
index f7e69964910..597d6e76253 100644
--- a/src/nsselect.m
+++ b/src/nsselect.m
@@ -37,7 +37,7 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu)
 
 #define CUT_BUFFER_SUPPORT
 
-Lisp_Object QSECONDARY, QTEXT, QFILE_NAME;
+Lisp_Object QCLIPBOARD, QSECONDARY, QTEXT, QFILE_NAME;
 
 static Lisp_Object Vns_sent_selection_hooks;
 static Lisp_Object Vns_lost_selection_hooks;
@@ -46,6 +46,8 @@ static Lisp_Object Vselection_converter_alist;
 
 static Lisp_Object Qforeign_selection;
 
+/* NSGeneralPboard is pretty much analogous to X11 CLIPBOARD */
+NSString *NXPrimaryPboard;
 NSString *NXSecondaryPboard;
 
 
@@ -61,7 +63,8 @@ static NSString *
 symbol_to_nsstring (Lisp_Object sym)
 {
   CHECK_SYMBOL (sym);
-  if (EQ (sym, QPRIMARY))     return NSGeneralPboard;
+  if (EQ (sym, QCLIPBOARD))     return NSGeneralPboard;
+  if (EQ (sym, QPRIMARY))     return NXPrimaryPboard;
   if (EQ (sym, QSECONDARY))   return NXSecondaryPboard;
   if (EQ (sym, QTEXT))        return NSStringPboardType;
   return [NSString stringWithUTF8String: SDATA (XSYMBOL (sym)->xname)];
@@ -72,6 +75,8 @@ static Lisp_Object
 ns_string_to_symbol (NSString *t)
 {
   if ([t isEqualToString: NSGeneralPboard])
+    return QCLIPBOARD;
+  if ([t isEqualToString: NXPrimaryPboard])
     return QPRIMARY;
   if ([t isEqualToString: NXSecondaryPboard])
     return QSECONDARY;
@@ -537,12 +542,14 @@ DEFUN ("ns-store-cut-buffer-internal", Fns_store_cut_buffer_internal,
 void
 nxatoms_of_nsselect (void)
 {
-  NXSecondaryPboard = @"Selection";
+  NXPrimaryPboard = @"PrimarySelection";
+  NXSecondaryPboard = @"SecondarySelection";
 }
 
 void
 syms_of_nsselect (void)
 {
+  QCLIPBOARD = intern ("CLIPBOARD");    staticpro (&QCLIPBOARD);
   QSECONDARY = intern ("SECONDARY");    staticpro (&QSECONDARY);
   QTEXT      = intern ("TEXT");         staticpro (&QTEXT);
   QFILE_NAME = intern ("FILE_NAME");    staticpro (&QFILE_NAME);
diff --git a/src/nsterm.m b/src/nsterm.m
index 88d47d41972..2eb84607562 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1792,6 +1792,9 @@ ns_define_frame_cursor (struct frame *f, Cursor cursor)
       EmacsView *view = FRAME_NS_VIEW (f);
       FRAME_POINTER_TYPE (f) = cursor;
       [[view window] invalidateCursorRectsForView: view];
+      /* Redisplay assumes this function also draws the changed frame
+         cursor, but this function doesn't, so do it explicitly.  */
+      x_update_cursor (f, 1);
     }
 }
 
diff --git a/src/w32fns.c b/src/w32fns.c
index d1f21e8acdd..64d0d8cb6d1 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -6812,6 +6812,7 @@ frame_parm_handler w32_frame_parm_handlers[] =
   x_set_font_backend,
   x_set_alpha,
   0, /* x_set_sticky */
+  0, /* x_set_tool_bar_position */
 };
 
 void