From: Karoly Lorentey <lorentey@elte.hu>
Date: Sun, 7 Mar 2004 15:30:22 +0000 (+0000)
Subject: Merged in changes from CVS HEAD
X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/54e81dc64794f315efdf418518a5e00f419cbcbd

Merged in changes from CVS HEAD

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-126
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-127
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-128
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-129
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-130
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-131
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-132
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-133
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-134
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-135
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-136
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-137
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-112
---

54e81dc64794f315efdf418518a5e00f419cbcbd
diff --cc lisp/allout.el
index 32ecb35e07,ccd2c1313a..bd5cd6c36e
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@@ -5,7 -5,7 +5,7 @@@
  ;; Author: Ken Manheimer <klm@zope.com>
  ;; Maintainer: Ken Manheimer <klm@zope.com>
  ;; Created: Dec 1991 - first release to usenet
--;; Version: $Id: allout.el,v 1.45 2003/10/16 16:28:30 eliz Exp $||
++;; Version: $Id: allout.el,v 1.46 2004/03/01 22:44:04 lektu Exp $||
  ;; Keywords: outlines mode wp languages
  
  ;; This file is part of GNU Emacs.
@@@ -508,7 -508,7 +508,7 @@@ behavior.
  ;;;_  : Version
  ;;;_   = allout-version
  (defvar allout-version
--  (let ((rcs-rev "$Revision: 1.45 $"))
++  (let ((rcs-rev "$Revision: 1.46 $"))
      (condition-case err
  	(save-match-data
  	  (string-match "Revision: \\([0-9]+\\.[0-9]+\\)" rcs-rev)
diff --cc src/xdisp.c
index 67f2144632,fb66bf0beb..bb7ce740a6
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@@ -10076,11 -10236,11 +10232,11 @@@ redisplay_internal (preserve_echo_area
  	     consider_all_windows_p is set.  */
  	  mark_window_display_accurate_1 (w, 1);
  
- 	  last_arrow_position = COERCE_MARKER (Voverlay_arrow_position);
- 	  last_arrow_string = Voverlay_arrow_string;
+ 	  /* Say overlay arrows are up to date.  */
+ 	  update_overlay_arrows (1);
  
 -	  if (frame_up_to_date_hook != 0)
 -	    frame_up_to_date_hook (sf);
 +	  if (FRAME_DISPLAY (sf)->frame_up_to_date_hook != 0)
 +	    FRAME_DISPLAY (sf)->frame_up_to_date_hook (sf);
  	}
  
        update_mode_lines = 0;