Merge from mainline.

7 files changed, 67 insertions, 53 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6673a25f74f..3719b61b413 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,29 @@
+2011-02-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * dired.c (Ffile_attributes): Increase size of modes from 10 to 12
+        as per recent filemodestring API change.  Reported by Jonas Öster in
+        <http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg01069.html>.
+
+2011-02-23  Ben Key  <bkey76@gmail.com>  (tiny change)
+
+        * nsterm.m (ns_draw_window_cursor): Obey the cursor_width argument
+        directly, for bar cursors.
+
+2011-02-23  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (set_frame_cursor_types): Don't write an undefined value
+        into the frame's cursor_width.
+
+2011-02-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * print.c (print_object): Never print old-style backquotes.
+        Obey escapeflag for hash tables as well.
+
+2011-02-23  Kenichi Handa  <handa@m17n.org>
+
+        * font.c (font_open_entity): Be sure to set scaled_pixel_size.
+        (font_find_for_lface): Check if attrs[LFACE_HEIGHT_INDEX] is integer.
+
 2011-02-22  Paul Eggert  <eggert@cs.ucla.edu>
 
         Work around some portability problems with symlinks.
diff --git a/src/bidi.c b/src/bidi.c
index 9740fe8f1d5..eeacf65bd5c 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -1520,7 +1520,7 @@ bidi_level_of_next_char (struct bidi_it *bidi_it)
   bidi_check_type (bidi_it->type);
 
   /* For L1 below, we need to know, for each WS character, whether
-     it belongs to a sequence of WS characters preceeding a newline
+     it belongs to a sequence of WS characters preceding a newline
      or a TAB or a paragraph separator.  */
   if (bidi_it->orig_type == NEUTRAL_WS
       && bidi_it->next_for_ws.type == UNKNOWN_BT)
diff --git a/src/dired.c b/src/dired.c
index eea4c7cfe40..ce2a3d105e5 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -937,7 +937,7 @@ so last access time will always be midnight of that day.  */)
   Lisp_Object dirname;
   struct stat sdir;
 #endif /* BSD4_2 */
-  char modes[10];
+  char modes[12];
   Lisp_Object handler;
   struct gcpro gcpro1;
   char *uname = NULL, *gname = NULL;
diff --git a/src/font.c b/src/font.c
index d77eafb6ad2..35821ae34f9 100644
--- a/src/font.c
+++ b/src/font.c
@@ -2806,7 +2806,7 @@ font_open_entity (FRAME_PTR f, Lisp_Object entity, int pixel_size)
   Lisp_Object objlist, size, val, font_object;
   struct font *font;
   int min_width, height;
-  int scaled_pixel_size;
+  int scaled_pixel_size = pixel_size;
 
   font_assert (FONT_ENTITY_P (entity));
   size = AREF (entity, FONT_SIZE_INDEX);
@@ -3121,7 +3121,7 @@ font_find_for_lface (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec, int c)
   XSETFRAME (frame, f);
   size = AREF (spec, FONT_SIZE_INDEX);
   pixel_size = font_pixel_size (f, spec);
-  if (pixel_size == 0)
+  if (pixel_size == 0 && INTEGERP (attrs[LFACE_HEIGHT_INDEX]))
     {
       double pt = XINT (attrs[LFACE_HEIGHT_INDEX]);
 
diff --git a/src/nsterm.m b/src/nsterm.m
index 038709869a9..8e77c89c3f7 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1072,7 +1072,7 @@ x_set_offset (struct frame *f, int xoff, int yoff, int change_grav)
         : f->left_pos;
       /* We use visibleFrame here to take menu bar into account.
          Ideally we should also adjust left/top with visibleFrame.origin.  */
-      
+
       f->top_pos = f->size_hint_flags & YNegative
         ? ([screen visibleFrame].size.height + f->top_pos
            - FRAME_PIXEL_HEIGHT (f) - FRAME_NS_TITLEBAR_HEIGHT (f)
@@ -1154,7 +1154,7 @@ x_set_window_size (struct frame *f, int change_grav, int cols, int rows)
     FRAME_TOOLBAR_HEIGHT (f) = 0;
 
   wr.size.width = pixelwidth + f->border_width;
-  wr.size.height = pixelheight + FRAME_NS_TITLEBAR_HEIGHT (f) 
+  wr.size.height = pixelheight + FRAME_NS_TITLEBAR_HEIGHT (f)
                   + FRAME_TOOLBAR_HEIGHT (f);
 
   /* Do not try to constrain to this screen.  We may have multiple
@@ -2230,11 +2230,8 @@ ns_draw_window_cursor (struct window *w, struct glyph_row *glyph_row,
                        int x, int y, int cursor_type, int cursor_width,
                        int on_p, int active_p)
 /* --------------------------------------------------------------------------
-     External call (RIF): draw cursor
-     (modeled after x_draw_window_cursor
-     FIXME: cursor_width is effectively bogus -- it sometimes gets set
-     in xdisp.c set_frame_cursor_types, sometimes left uninitialized;
-     DON'T USE IT (no other terms do)
+     External call (RIF): draw cursor.
+     Note that CURSOR_WIDTH is meaningful only for (h)bar cursors.
    -------------------------------------------------------------------------- */
 {
   NSRect r, s;
@@ -2251,7 +2248,6 @@ ns_draw_window_cursor (struct window *w, struct glyph_row *glyph_row,
      and mini-buffer.  */
 
   NSTRACE (dumpcursor);
-//fprintf(stderr, "drawcursor (%d,%d) activep = %d\tonp = %d\tc_type = %d\twidth = %d\n",x,y, active_p,on_p,cursor_type,cursor_width);
 
   if (!on_p)
     return;
@@ -2276,8 +2272,22 @@ ns_draw_window_cursor (struct window *w, struct glyph_row *glyph_row,
       return;
     }
 
+  /* We draw the cursor (with NSRectFill), then draw the glyph on top
+     (other terminals do it the other way round).  We must set
+     w->phys_cursor_width to the cursor width.  For bar cursors, that
+     is CURSOR_WIDTH; for box cursors, it is the glyph width.  */
   get_phys_cursor_geometry (w, glyph_row, phys_cursor_glyph, &fx, &fy, &h);
 
+  /* The above get_phys_cursor_geometry call set w->phys_cursor_width
+     to the glyph width; replace with CURSOR_WIDTH for bar cursors. */
+  if (cursor_type == BAR_CURSOR || cursor_type == HBAR_CURSOR)
+    {
+      if (cursor_width < 0)
+        cursor_width = FRAME_CURSOR_WIDTH (f);
+      cursor_width = min (cursor_width, 1);
+      w->phys_cursor_width = cursor_width;
+    }
+
   r.origin.x = fx, r.origin.y = fy;
   r.size.height = h;
   r.size.width = w->phys_cursor_width;
@@ -2285,7 +2295,7 @@ ns_draw_window_cursor (struct window *w, struct glyph_row *glyph_row,
   /* FIXME: if we overwrite the internal border area, it does not get erased;
      fix by truncating cursor, but better would be to erase properly */
   overspill = r.origin.x + r.size.width -
-    WINDOW_TEXT_TO_FRAME_PIXEL_X (w, WINDOW_BOX_RIGHT_EDGE_X (w) 
+    WINDOW_TEXT_TO_FRAME_PIXEL_X (w, WINDOW_BOX_RIGHT_EDGE_X (w)
       - WINDOW_TOTAL_FRINGE_WIDTH (w) - FRAME_INTERNAL_BORDER_WIDTH (f));
   if (overspill > 0)
     r.size.width -= overspill;
@@ -2335,8 +2345,6 @@ ns_draw_window_cursor (struct window *w, struct glyph_row *glyph_row,
       break;
     case BAR_CURSOR:
       s = r;
-      s.size.width = min (cursor_width, 2); //FIXME(see above)
-
       /* If the character under cursor is R2L, draw the bar cursor
          on the right of its glyph, rather than on the left.  */
       cursor_glyph = get_phys_cursor_glyph (w);
@@ -2984,7 +2992,7 @@ ns_draw_glyph_string (struct glyph_string *s)
           NS_FACE_BACKGROUND (s->face) = NS_FACE_FOREGROUND (s->face);
           NS_FACE_FOREGROUND (s->face) = tmp;
         }
-                    
+
       ns_tmp_font->font.driver->draw
         (s, 0, s->nchars, s->x, s->y,
          (ns_tmp_flags == NS_DUMPGLYPH_NORMAL && !s->background_filled_p)
@@ -3010,9 +3018,9 @@ ns_draw_glyph_string (struct glyph_string *s)
       else
         ns_maybe_dumpglyphs_background
           (s, s->first_glyph->type == COMPOSITE_GLYPH);
-      /* ... */ 
+      /* ... */
       /* Not yet implemented.  */
-      /* ... */ 
+      /* ... */
       ns_unfocus (s->f);
       break;
 
@@ -3785,7 +3793,7 @@ ns_term_init (Lisp_Object display_name)
   strncpy (terminal->name, SDATA (display_name), SBYTES (display_name));
   terminal->name[SBYTES (display_name)] = 0;
 
-  UNBLOCK_INPUT; 
+  UNBLOCK_INPUT;
 
   if (!inhibit_x_resources)
     {
@@ -3802,7 +3810,7 @@ ns_term_init (Lisp_Object display_name)
                          stringForKey: @"AppleHighlightColor"];
   if (ns_selection_color == nil)
     ns_selection_color = NS_SELECTION_COLOR_DEFAULT;
-  
+
   {
     NSColorList *cl = [NSColorList colorListNamed: @"Emacs"];
 
@@ -3898,7 +3906,7 @@ ns_term_init (Lisp_Object display_name)
                    keyEquivalent: @"q"
                          atIndex: 9];
 
-    item = [mainMenu insertItemWithTitle: ns_app_name                       
+    item = [mainMenu insertItemWithTitle: ns_app_name
                                   action: @selector (menuDown:)
                            keyEquivalent: @""
                                  atIndex: 0];
@@ -4103,7 +4111,7 @@ ns_term_shutdown (int sig)
         -appShouldTerminate
           Cancel -> Nothing else
           Accept ->
-          
+
           -terminate
           KEY_NS_POWER_OFF, (save-buffers-kill-emacs)
           ns_term_shutdown()
@@ -4113,10 +4121,10 @@ ns_term_shutdown (int sig)
 - (void) terminate: (id)sender
 {
   struct frame *emacsframe = SELECTED_FRAME ();
-  
+
   if (!emacs_event)
     return;
-  
+
   emacs_event->kind = NS_NONKEY_EVENT;
   emacs_event->code = KEY_NS_POWER_OFF;
   emacs_event->arg = Qt; /* mark as non-key event */
@@ -4418,7 +4426,7 @@ ns_term_shutdown (int sig)
       code = ([[theEvent charactersIgnoringModifiers] length] == 0) ?
         0 : [[theEvent charactersIgnoringModifiers] characterAtIndex: 0];
       /* (Carbon way: [theEvent keyCode]) */
-      
+
       /* is it a "function key"? */
       fnKeysym = ns_convert_key (code);
       if (fnKeysym)
@@ -5446,7 +5454,7 @@ ns_term_shutdown (int sig)
 
   /*
     drawRect: may be called (at least in OS X 10.5) for invisible
-    views as well for some reason.  Thus, do not infer visibility 
+    views as well for some reason.  Thus, do not infer visibility
     here.
 
     emacsframe->async_visible = 1;
diff --git a/src/print.c b/src/print.c
index 299cfd41814..29a4bfab790 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1683,26 +1683,6 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
         {
           PRINTCHAR ('(');
 
-          /* If the first element is a backquote form,
-             print it old-style so it won't be misunderstood.  */
-          if (print_quoted && CONSP (XCAR (obj))
-              && CONSP (XCDR (XCAR (obj)))
-              && NILP (XCDR (XCDR (XCAR (obj))))
-              && EQ (XCAR (XCAR (obj)), Qbackquote))
-            {
-              Lisp_Object tem;
-              tem = XCAR (obj);
-              PRINTCHAR ('(');
-
-              print_object (Qbackquote, printcharfun, 0);
-              PRINTCHAR (' ');
-
-              print_object (XCAR (XCDR (tem)), printcharfun, 0);
-              PRINTCHAR (')');
-
-              obj = XCDR (obj);
-            }
-
           {
             EMACS_INT print_length;
             int i;
@@ -1906,25 +1886,25 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
           if (!NILP (h->test))
             {
               strout (" test ", -1, -1, printcharfun, 0);
-              print_object (h->test, printcharfun, 0);
+              print_object (h->test, printcharfun, escapeflag);
             }
 
           if (!NILP (h->weak))
             {
               strout (" weakness ", -1, -1, printcharfun, 0);
-              print_object (h->weak, printcharfun, 0);
+              print_object (h->weak, printcharfun, escapeflag);
             }
 
           if (!NILP (h->rehash_size))
             {
               strout (" rehash-size ", -1, -1, printcharfun, 0);
-              print_object (h->rehash_size, printcharfun, 0);
+              print_object (h->rehash_size, printcharfun, escapeflag);
             }
 
           if (!NILP (h->rehash_threshold))
             {
               strout (" rehash-threshold ", -1, -1, printcharfun, 0);
-              print_object (h->rehash_threshold, printcharfun, 0);
+              print_object (h->rehash_threshold, printcharfun, escapeflag);
             }
 
           strout (" data ", -1, -1, printcharfun, 0);
@@ -1943,9 +1923,9 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
             if (!NILP (HASH_HASH (h, i)))
               {
                 if (i) PRINTCHAR (' ');
-                print_object (HASH_KEY (h, i), printcharfun, 1);
+                print_object (HASH_KEY (h, i), printcharfun, escapeflag);
                 PRINTCHAR (' ');
-                print_object (HASH_VALUE (h, i), printcharfun, 1);
+                print_object (HASH_VALUE (h, i), printcharfun, escapeflag);
               }
 
           if (size < real_size)
diff --git a/src/xdisp.c b/src/xdisp.c
index e144237d34e..35f4859f1b3 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -23252,7 +23252,7 @@ get_specified_cursor_type (Lisp_Object arg, int *width)
 void
 set_frame_cursor_types (struct frame *f, Lisp_Object arg)
 {
-  int width;
+  int width = 1;
   Lisp_Object tem;
 
   FRAME_DESIRED_CURSOR (f) = get_specified_cursor_type (arg, &width);