Mercurial > emacs
diff lisp/term/x-win.el @ 83353:532e0a9335a9
Merged in changes from CVS trunk. Plus added lisp/term tweaks.
Patches applied:
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--base-0
tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-474
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-1
Add CVS metadata files.
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-2
Update from CVS.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-393
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sun, 04 Sep 2005 03:48:17 +0000 |
| parents | 7372c2f9daac ba3854e2c98c |
| children | 08b4dd6a6e87 |
line wrap: on
line diff
--- a/lisp/term/x-win.el Thu Aug 25 12:03:34 2005 +0000 +++ b/lisp/term/x-win.el Sun Sep 04 03:48:17 2005 +0000 @@ -1,6 +1,7 @@ ;;; x-win.el --- parse relevant switches and set up for X -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 1993, 1994, 2001, 2002, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: FSF ;; Keywords: terminals, i18n @@ -86,6 +87,10 @@ (require 'server) (defvar x-invocation-args) +(defvar x-keysym-table) +(defvar x-selection-timeout) +(defvar x-session-id) +(defvar x-session-previous-id) (defvar x-command-line-resources nil)