Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-77

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 504-513)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: .cvsignore: Add `lock'.

 * gnus--rel--5.10  (patch 99-103)

   - Update from CVS

3 files changed, 22 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e23f9bdacbf..fb8664b9fb6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2005-08-02  Richard M. Stallman  <rms@gnu.org>
+
+	* frame.c (Fframe_char_width): Doc fix.
+
+2005-07-30  Juanma Barranquero  <lekktu@gmail.com>
+
+	* xdisp.c (syms_of_xdisp) <redisplay-end-trigger-functions>:
+	Defvar it.
+
 2005-07-28  Juanma Barranquero  <lekktu@gmail.com>
 
 	* w32fns.c (my_set_window_pos, my_show_window): Don't declare.
@@ -130,6 +139,11 @@
 	* w32fns.c (Vx_hand_shape): Variable removed.
 	(syms_of_w32fns): Intern and staticpro Qw32_charset_default.
 
+2005-07-19  Kenichi Handa  <handa@m17n.org>
+
+	* fns.c (Fstring_as_multibyte): Escape backslashes in the
+	docstring.
+
 2005-07-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* buffer.h (Fgenerate_new_buffer_name): Declare (for use in coding.c).
diff --git a/src/frame.c b/src/frame.c
index a9f006ae8e0..436bc45cd3d 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2353,8 +2353,7 @@ DEFUN ("frame-char-width", Fframe_char_width, Sframe_char_width,
        0, 1, 0,
        doc: /* Width in pixels of characters in the font in frame FRAME.
 If FRAME is omitted, the selected frame is used.
-The width is the same for all characters, because
-currently Emacs supports only fixed-width fonts.
+On a graphical screen, the width is the standard width of the default font.
 For a terminal screen, the value is always 1.  */)
      (frame)
      Lisp_Object frame;
diff --git a/src/xdisp.c b/src/xdisp.c
index f1316969577..5ba2b847600 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -232,7 +232,7 @@ extern Lisp_Object Qhelp_echo;
 
 Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;
 Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
-Lisp_Object Qredisplay_end_trigger_functions;
+Lisp_Object Qredisplay_end_trigger_functions, Vredisplay_end_trigger_functions;
 Lisp_Object Qinhibit_point_motion_hooks;
 Lisp_Object QCeval, QCfile, QCdata, QCpropertize;
 Lisp_Object Qfontified;
@@ -23277,6 +23277,12 @@ and its new display-start position.  Note that the value of `window-end'
 is not valid when these functions are called.  */);
   Vwindow_scroll_functions = Qnil;
 
+  DEFVAR_LISP ("redisplay-end-trigger-functions", &Vredisplay_end_trigger_functions,
+    doc: /* Functions called when redisplay of a window reaches the end trigger.
+Each function is called with two arguments, the window and the end trigger value.
+See `set-window-redisplay-end-trigger'.  */);
+  Vredisplay_end_trigger_functions = Qnil;
+
   DEFVAR_BOOL ("mouse-autoselect-window", &mouse_autoselect_window,
     doc: /* *Non-nil means autoselect window with mouse pointer.  */);
   mouse_autoselect_window = 0;