8 files changed, 121 insertions, 38 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3e6c8f24398..b52d6c1dffe 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,44 @@
+2010-06-22  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (x_scroll_bar_create): Remove call to xg_show_scroll_bar.
+
+        * gtkutil.h (xg_show_scroll_bar): : Remove.
+
+        * gtkutil.c (xg_update_scrollbar_pos): Show/hide scroll bar as needed
+        if height is less than scroll bar min size.
+        (xg_show_scroll_bar): Remove, show moved to xg_update_scrollbar_pos.
+
+        * xfns.c (x_default_font_parameter): Try to open font from system
+        before using it (bug#6478).  Rename got_from_gconf to got_from_system.
+
+2010-06-22  Keith Packard <keithp@keithp.com> (tiny change)
+
+        * font.c (font_parse_fcname): Allow . for sizes like 7.5 (bug#6437).
+
+2010-06-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (try_scrolling): When scroll-conservatively is set to
+        most-positive-fixnum, be extra accurate when scrolling window
+        start, to avoid missing the cursor line.
+
+2010-06-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (try_scrolling): Compute the limit for searching point
+        in forward scroll from scroll_max, instead of an arbitrary limit
+        of 10 screen lines.  See
+        http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00766.html
+        and
+        http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00773.html
+        for details.
+
+2010-06-16  Glenn Morris  <rgm@gnu.org>
+
+        * editfns.c (Fbyte_to_string): Pacify compiler.
+
+2010-06-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lread.c (read1): Phase out old-style backquotes a bit more.
+
 2010-06-12  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in ($(BLD)/bidi.$(O)): Depend on biditype.h and
@@ -7,8 +48,7 @@
 
         * bidi.c (bidi_initialize): Remove explicit initialization of
         bidi_type_table; include biditype.h instead.  Don't support
-        entries whose second codepoint is zero.  Initialize
-        bidi_mirror_table.
+        entries whose second codepoint is zero.  Initialize bidi_mirror_table.
         (bidi_mirror_char): Use bidi_mirror_table.
 
         * biditype.h: New file.
diff --git a/src/font.c b/src/font.c
index e07dbc5dd16..f9c2381fa70 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1544,7 +1544,7 @@ font_parse_fcname (name, font)
               int size_found = 1;
 
               for (q = p + 1; *q && *q != ' '; q++)
-                if (! isdigit (*q))
+                if (! isdigit (*q) && *q != '.')
                   {
                     size_found = 0;
                     break;
diff --git a/src/gtkutil.c b/src/gtkutil.c
index f77669c419d..8e7fec39134 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -3178,17 +3178,6 @@ xg_create_scroll_bar (f, bar, scroll_callback, end_callback, scroll_bar_name)
   bar->x_window = scroll_id;
 }
 
-/* Make the scroll bar represented by SCROLLBAR_ID visible.  */
-
-void
-xg_show_scroll_bar (scrollbar_id)
-     int scrollbar_id;
-{
-  GtkWidget *w = xg_get_widget_from_map (scrollbar_id);
-  if (w)
-    gtk_widget_show_all (gtk_widget_get_parent (w));
-}
-
 /* Remove the scroll bar represented by SCROLLBAR_ID from the frame F.  */
 
 void
@@ -3247,10 +3236,23 @@ xg_update_scrollbar_pos (f, scrollbar_id, top, left, width, height)
 
       /* Move and resize to new values.  */
       gtk_fixed_move (GTK_FIXED (wfixed), wparent, left, top);
-      gtk_widget_set_size_request (wscroll, width, height);
+      gint msl;
+      gtk_widget_style_get (wscroll, "min-slider-length", &msl, NULL);
+      if (msl > height)
+        {
+          /* No room.  Hide scroll bar as some themes output a warning if
+             the height is less than the min size.  */
+          gtk_widget_hide (wparent);
+          gtk_widget_hide (wscroll);
+        }
+      else
+        {
+          gtk_widget_show_all (wparent);
+          gtk_widget_set_size_request (wscroll, width, height);
+        }
       gtk_widget_queue_draw (wfixed);
       gdk_window_process_all_updates ();
-      if (oldx != -1) 
+      if (oldx != -1 && oldw > 0 && oldh > 0)
         {
           /* Clear under old scroll bar position.  This must be done after
              the gtk_widget_queue_draw and gdk_window_process_all_updates
diff --git a/src/gtkutil.h b/src/gtkutil.h
index 602228f97be..4eba4710ea3 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -163,7 +163,6 @@ extern void xg_create_scroll_bar P_ ((FRAME_PTR f,
                                       GCallback scroll_callback,
                                       GCallback end_callback,
                                       char *scroll_bar_name));
-extern void xg_show_scroll_bar P_ ((int scrollbar_id));
 extern void xg_remove_scroll_bar P_ ((FRAME_PTR f, int scrollbar_id));
 
 extern void xg_update_scrollbar_pos P_ ((FRAME_PTR f,
diff --git a/src/lread.c b/src/lread.c
index 3a77a62b27f..c73f7f32e51 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -2683,7 +2683,17 @@ read1 (readcharfun, pch, first_in_list)
       }
 
     case '`':
-      if (first_in_list)
+      /* Transition from old-style to new-style:
+         If we see "(`" it used to mean old-style, which usually works
+         fine because ` should almost never appear in such a position
+         for new-style.  But occasionally we need "(`" to mean new
+         style, so we try to distinguish the two by the fact that we
+         can either write "( `foo" or "(` foo", where the first
+         intends to use new-style whereas the second intends to use
+         old-style.  For Emacs-25, we should completely remove this
+         first_in_list exception (old-style can still be obtained via
+         "(\`" anyway).  */
+      if (first_in_list && (c = READCHAR, UNREAD (c), c == ' '))
         {
           Vold_style_backquotes = Qt;
           goto default_label;
diff --git a/src/xdisp.c b/src/xdisp.c
index 7e1869bc963..7bb0b9063f9 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13490,14 +13490,22 @@ try_scrolling (window, just_this_one_p, scroll_conservatively,
       if (PT > CHARPOS (it.current.pos))
         {
           int y0 = line_bottom_y (&it);
-
-          /* Compute the distance from the scroll margin to PT
-             (including the height of the cursor line).  Moving the
-             iterator unconditionally to PT can be slow if PT is far
-             away, so stop 10 lines past the window bottom (is there a
-             way to do the right thing quickly?).  */
-          move_it_to (&it, PT, -1,
-                      it.last_visible_y + 10 * FRAME_LINE_HEIGHT (f),
+          /* Compute how many pixels below window bottom to stop searching
+             for PT.  This avoids costly search for PT that is far away if
+             the user limited scrolling by a small number of lines, but
+             always finds PT if scroll_conservatively is set to a large
+             number, such as most-positive-fixnum.  */
+          int slack = max (scroll_max, 10 * FRAME_LINE_HEIGHT (f));
+          int y_to_move =
+            slack >= INT_MAX - it.last_visible_y
+            ? INT_MAX
+            : it.last_visible_y + slack;
+
+          /* Compute the distance from the scroll margin to PT or to
+             the scroll limit, whichever comes first.  This should
+             include the height of the cursor line, to make that line
+             fully visible.  */
+          move_it_to (&it, PT, -1, y_to_move,
                       -1, MOVE_TO_POS | MOVE_TO_Y);
           dy = line_bottom_y (&it) - y0;
 
@@ -13537,7 +13545,26 @@ try_scrolling (window, just_this_one_p, scroll_conservatively,
         return SCROLLING_FAILED;
 
       start_display (&it, w, startp);
-      move_it_vertically (&it, amount_to_scroll);
+      if (scroll_max < INT_MAX)
+        move_it_vertically (&it, amount_to_scroll);
+      else
+        {
+          /* Extra precision for users who set scroll-conservatively
+             to most-positive-fixnum: make sure the amount we scroll
+             the window start is never less than amount_to_scroll,
+             which was computed as distance from window bottom to
+             point.  This matters when lines at window top and lines
+             below window bottom have different height.  */
+          struct it it1 = it;
+          /* We use a temporary it1 because line_bottom_y can modify
+             its argument, if it moves one line down; see there.  */
+          int start_y = line_bottom_y (&it1);
+
+          do {
+            move_it_by_lines (&it, 1, 1);
+            it1 = it;
+          } while (line_bottom_y (&it1) - start_y < amount_to_scroll);
+        }
 
       /* If STARTP is unchanged, move it down another screen line.  */
       if (CHARPOS (it.current.pos) == CHARPOS (startp))
diff --git a/src/xfns.c b/src/xfns.c
index 9072dabf355..963cd1ce0ca 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3064,8 +3064,8 @@ x_default_font_parameter (f, parms)
   struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
   Lisp_Object font_param = x_get_arg (dpyinfo, parms, Qfont, NULL, NULL,
                                       RES_TYPE_STRING);
-  Lisp_Object font;
-  int got_from_gconf = 0;
+  Lisp_Object font = Qnil;
+  int got_from_system = 0;
   if (EQ (font_param, Qunbound))
     font_param = Qnil;
 
@@ -3075,14 +3075,20 @@ x_default_font_parameter (f, parms)
          regardless of font-use-system-font because .emacs may not have been
          read yet.  */
       const char *system_font = xsettings_get_system_font ();
-      if (system_font) font_param = make_string (system_font,
-                                                 strlen (system_font));
+      if (system_font)
+        {
+          char *name = xstrdup (system_font);
+          font = font_open_by_name (f, name);
+          got_from_system = ! NILP (font);
+          free (name);
+        }
     }
-  
-  font = !NILP (font_param) ? font_param
-    : x_get_arg (dpyinfo, parms, Qfont, "font", "Font", RES_TYPE_STRING);
 
-  if (! STRINGP (font))
+  if (NILP (font))
+      font = !NILP (font_param) ? font_param
+      : x_get_arg (dpyinfo, parms, Qfont, "font", "Font", RES_TYPE_STRING);
+
+  if (! FONTP (font) && ! STRINGP (font))
     {
       char *names[]
         = {
@@ -3120,8 +3126,8 @@ x_default_font_parameter (f, parms)
     }
 
   x_default_parameter (f, parms, Qfont, font,
-                       got_from_gconf ? NULL : "font",
-                       got_from_gconf ? NULL : "Font",
+                       got_from_system ? NULL : "font",
+                       got_from_system ? NULL : "Font",
                        RES_TYPE_STRING);
 }
 
diff --git a/src/xterm.c b/src/xterm.c
index 519ece2a2d3..ac6ee55954b 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -5005,7 +5005,6 @@ x_scroll_bar_create (w, top, left, width, height)
                              left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,
                              width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2,
                              max (height, 1));
-    xg_show_scroll_bar (bar->x_window);
 #else /* not USE_GTK */
     Widget scroll_bar = SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar);
     XtConfigureWidget (scroll_bar,