]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from emacs--devo--0
authorMiles Bader <miles@gnu.org>
Wed, 30 May 2007 14:44:47 +0000 (14:44 +0000)
committerMiles Bader <miles@gnu.org>
Wed, 30 May 2007 14:44:47 +0000 (14:44 +0000)
Patches applied:

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

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

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

   - Update from CVS
   - lisp/vc-hooks.el (vc-find-root): Fix file attribute test

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

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

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-18

14 files changed:
1  2 
lisp/edmacro.el
lisp/xt-mouse.el
src/data.c
src/fns.c
src/frame.c
src/image.c
src/macterm.c
src/msdos.c
src/sysdep.c
src/term.c
src/termhooks.h
src/window.c
src/xdisp.c
src/xfaces.c

diff --cc lisp/edmacro.el
Simple merge
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/image.c
Simple merge
diff --cc src/macterm.c
Simple merge
diff --cc src/msdos.c
Simple merge
diff --cc src/sysdep.c
Simple merge
diff --cc src/term.c
index 1d8e885ade931fe7ea3b81bfd96a2c633ec7cb16,6a39544c00c4a3d3b74a20d83a0fc5a28767f6b6..f6b9306dc6bb4f37e332253b9b434cb438b6148c
@@@ -3899,10 -3510,12 +3906,12 @@@ bigger, or it may make it blink, or it 
  #ifdef HAVE_GPM
    defsubr (&Sterm_open_connection);
    defsubr (&Sterm_close_connection);
+   staticpro (&Qmouse_face_window);
  #endif /* HAVE_GPM */
 -
 -  fullscreen_hook = NULL;
  }
  
 +
 +
  /* arch-tag: 498e7449-6f2e-45e2-91dd-b7d4ca488193
     (do not change this comment) */
diff --cc src/termhooks.h
index 373d1e34987071d1241f487d862f9cf61f83ecb8,ee6e707e6b5c397d789a527293c9fb0b44854a33..1ca9234cac218bc6f711d33b121c9bd03fbc1bdd
@@@ -296,7 -452,8 +296,8 @@@ enum 
  
  #ifdef HAVE_GPM
  #include <gpm.h>
 -extern int handle_one_term_event (Gpm_Event *, struct input_event *);
 +extern int handle_one_term_event (struct tty_display_info *, Gpm_Event *, struct input_event *);
+ extern void term_mouse_moveto (int, int);
  
  /* Nonzero means mouse is enabled on Linux console */
  extern int term_gpm;
diff --cc src/window.c
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xfaces.c
Simple merge