From: Miles Bader <miles@gnu.org>
Date: Wed, 30 May 2007 14:40:46 +0000 (+0000)
Subject: Merge from emacs--devo--0
X-Git-Tag: emacs-pretest-23.0.90~8295^2~491
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=62390cbfc25653003034b812258be9cfb5f3edee;p=emacs.git

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 774-780)

   - Update from CVS
   - Merge from emacs--rel--22, gnus--rel--5.10
   - Merge from emacs--rel--22
   - Fix tq.el edge case

 * emacs--rel--22  (patch 28-32)

   - Update from CVS

 * gnus--rel--5.10  (patch 224-225)

   - Merge from emacs--devo--0, emacs--rel--22
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-213
---

62390cbfc25653003034b812258be9cfb5f3edee
diff --cc src/term.c
index b8e972043a4,6a39544c00c..f23963cc39c
--- a/src/term.c
+++ b/src/term.c
@@@ -3155,15 -3053,11 +3165,12 @@@ term_init (terminal_type
    int status;
    struct frame *sf = XFRAME (selected_frame);
  
 -  encode_terminal_bufsize = 0;
 +  encode_terminal_src_size = 0;
 +  encode_terminal_dst_size = 0;
  
  #ifdef HAVE_GPM
-   /* TODO: Can't get Gpm_Snapshot in term_mouse_position to work: test with
-      (mouse-position).  Also set-mouse-position won't work as is.  */
-   /* mouse_position_hook = term_mouse_position;  */
- 
-   mouse_face_window = Qnil;
+   mouse_position_hook = term_mouse_position;
+   Qmouse_face_window = Qnil;
  #endif
  
  #ifdef WINDOWSNT