]> git.eshelyaron.com Git - emacs.git/commitdiff
Merged from emacs@sv.gnu.org
authorKaroly Lorentey <lorentey@elte.hu>
Sun, 12 Mar 2006 04:51:49 +0000 (04:51 +0000)
committerKaroly Lorentey <lorentey@elte.hu>
Sun, 12 Mar 2006 04:51:49 +0000 (04:51 +0000)
Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-144
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-145
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-146
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-147
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-148
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-149
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-150
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-151
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-152
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-56
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-57
   Copy/update icons from Gnus trunk

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

14 files changed:
1  2 
lisp/files.el
lisp/international/mule.el
lisp/simple.el
src/alloc.c
src/coding.c
src/keymap.c
src/lisp.h
src/macterm.c
src/process.c
src/w32term.c
src/window.c
src/xdisp.c
src/xfns.c
src/xterm.c

diff --cc lisp/files.el
Simple merge
Simple merge
diff --cc lisp/simple.el
Simple merge
diff --cc src/alloc.c
Simple merge
diff --cc src/coding.c
Simple merge
diff --cc src/keymap.c
Simple merge
diff --cc src/lisp.h
Simple merge
diff --cc src/macterm.c
Simple merge
diff --cc src/process.c
Simple merge
diff --cc src/w32term.c
Simple merge
diff --cc src/window.c
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xfns.c
index d3067e00fe8ca9f365dc3c7c54d325518ca03839,2ab185a3c2d335f218a9621341ec9663341c1f95..f2d5530a39c7e4164bc6ca8d485e96a90d7a7fac
@@@ -4610,6 -4608,6 +4610,7 @@@ unwind_create_tip_frame (frame
    return deleted;
  }
  
++  parms = Fcopy_alist (parms);
  
  /* Create a frame for a tooltip on the display described by DPYINFO.
     PARMS is a list of frame parameters.  TEXT is the string to
diff --cc src/xterm.c
Simple merge