[Emacs-diffs] Changes to emacs/lisp/term/x-win.el

[John Paul Wallington]

Index: emacs/lisp/term/x-win.el
diff -c emacs/lisp/term/x-win.el:1.160 emacs/lisp/term/x-win.el:1.161
*** emacs/lisp/term/x-win.el:1.160      Tue Feb  4 08:28:06 2003
--- emacs/lisp/term/x-win.el    Mon Mar 10 08:29:05 2003
***************
*** 1202,1210 ****
  ;;;; Keysyms
  
  (defun vendor-specific-keysyms (vendor)
!   "Return the appropriate value of system-key-alist for VENDOR.
  VENDOR is a string containing the name of the X Server's vendor,
! as returned by (x-server-vendor)."
    ;; Fixme: Drop Apollo now?
    (cond ((string-equal vendor "Apollo Computer Inc.")
         '((65280 . linedel)
--- 1202,1210 ----
  ;;;; Keysyms
  
  (defun vendor-specific-keysyms (vendor)
!   "Return the appropriate value of `system-key-alist' for VENDOR.
  VENDOR is a string containing the name of the X Server's vendor,
! as returned by `x-server-vendor'."
    ;; Fixme: Drop Apollo now?
    (cond ((string-equal vendor "Apollo Computer Inc.")
         '((65280 . linedel)
***************
*** 2098,2109 ****
  (defvar x-last-selected-text-clipboard nil
    "The value of the CLIPBOARD X selection last time we selected or
  pasted text.")
! (defvar x-last-selected-text-primary   nil
    "The value of the PRIMARY X selection last time we selected or
  pasted text.")
! (defvar x-last-selected-text-cut       nil
!   "The vaue of the X cut buffer last time we selected or
! pasted text.")
  
  ;;; It is said that overlarge strings are slow to put into the cut buffer.
  ;;; Note this value is overridden below.
--- 2098,2108 ----
  (defvar x-last-selected-text-clipboard nil
    "The value of the CLIPBOARD X selection last time we selected or
  pasted text.")
! (defvar x-last-selected-text-primary nil
    "The value of the PRIMARY X selection last time we selected or
  pasted text.")
! (defvar x-last-selected-text-cut nil
!   "The value of the X cut buffer last time we selected or pasted text.")
  
  ;;; It is said that overlarge strings are slow to put into the cut buffer.
  ;;; Note this value is overridden below.
***************
*** 2345,2351 ****
        (setq x-selection-timeout (string-to-number res-selection-timeout))))
  
  (defun x-win-suspend-error ()
!   (error "Suspending an emacs running under X makes no sense"))
  (add-hook 'suspend-hook 'x-win-suspend-error)
  
  ;;; Arrange for the kill and yank functions to set and check the clipboard.
--- 2344,2350 ----
        (setq x-selection-timeout (string-to-number res-selection-timeout))))
  
  (defun x-win-suspend-error ()
!   (error "Suspending an Emacs running under X makes no sense"))
  (add-hook 'suspend-hook 'x-win-suspend-error)
  
  ;;; Arrange for the kill and yank functions to set and check the clipboard.