Merge from emacs--devo--0
authorMiles Bader <miles@gnu.org>
Wed, 30 May 2007 14:40:46 +0000 (14:40 +0000)
committerMiles Bader <miles@gnu.org>
Wed, 30 May 2007 14:40:46 +0000 (14:40 +0000)
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

13 files changed:
1  2 
etc/PROBLEMS
lisp/textmodes/sgml-mode.el
src/ChangeLog
src/ccl.c
src/data.c
src/fns.c
src/frame.c
src/macterm.c
src/msdos.c
src/term.c
src/window.c
src/xdisp.c
src/xfaces.c

diff --cc etc/PROBLEMS
Simple merge
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/ccl.c
Simple merge
diff --cc src/data.c
Simple merge
diff --cc src/fns.c
Simple merge
diff --cc src/frame.c
Simple merge
diff --cc src/macterm.c
Simple merge
diff --cc src/msdos.c
Simple merge
diff --cc 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
diff --cc src/window.c
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xfaces.c
Simple merge