]> code.delx.au - gnu-emacs/commitdiff
Merged in changes from CVS trunk.
authorKaroly Lorentey <lorentey@elte.hu>
Tue, 19 Oct 2004 17:00:02 +0000 (17:00 +0000)
committerKaroly Lorentey <lorentey@elte.hu>
Tue, 19 Oct 2004 17:00:02 +0000 (17:00 +0000)
Patches applied:

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

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-621
   Merge from gnus--rel--5.10

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

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

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

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

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-51
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-52
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-53
   Merge from emacs--cvs-trunk--0

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

1  2 
lisp/buff-menu.el
lisp/frame.el
lisp/server.el
lisp/startup.el
lisp/subr.el
src/fontset.c
src/lisp.h
src/w32term.c
src/window.c
src/xdisp.c
src/xterm.h

index 33a8c3ec3f552dae02a754be764ecc2feff114c2,b00721e93ec0ee4c6dc470ff6bf73c19fa758d03..da21f5336d8f2558d98e52dac3615ddb9069783d
@@@ -592,7 -625,7 +625,9 @@@ For more information, see the function 
              'mouse-face 'highlight
              'keymap (let ((map (make-sparse-keymap)))
                        (define-key map [header-line mouse-2]
--                        `(lambda () (interactive)
++                        `(lambda (e)
++                           (interactive "e")
++                           (if e (set-buffer (window-buffer (posn-window (event-end e)))))
                             (Buffer-menu-sort ,column)))
                        map)))
  
diff --cc lisp/frame.el
Simple merge
diff --cc lisp/server.el
Simple merge
diff --cc lisp/startup.el
Simple merge
diff --cc lisp/subr.el
Simple merge
diff --cc src/fontset.c
Simple merge
diff --cc src/lisp.h
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/xterm.h
Simple merge