From: John Paul Wallington <jpw@pobox.com>
Date: Mon, 10 Mar 2003 13:30:22 +0000 (+0000)
Subject: (vendor-specific-keysyms, x-last-selected-text-primary): Doc fixes.
X-Git-Tag: ttn-vms-21-2-B4~10951
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=089bc712c0d71f238435f95b44b3ad391e9c92f9;p=emacs.git

(vendor-specific-keysyms, x-last-selected-text-primary): Doc fixes.
(x-win-suspend-error): Use proper noun in error message.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 51c07e559db..e986c6604b6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -10,9 +10,15 @@
 
 2003-03-10  John Paul Wallington  <jpw@gnu.org>
 
+	* subr.el (posn-col-row): Take into account `line-spacing'.
+
 	* ebuff-menu.el (electric-buffer-update-highlight): Do nothing
 	if major mode isn't `Electric-buffer-menu-mode'.
 
+	* term/x-win.el (vendor-specific-keysyms)
+	(x-last-selected-text-primary): Doc fixes.
+	(x-win-suspend-error): Use proper noun in error message.
+
 2003-03-09  Kai Gro,A_(Bjohann  <kai.grossjohann@uni-duisburg.de>
 
 	* man.el (Man-getpage-in-background): Always use `setenv' for
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 6be4e4b7a72..5665d5a9471 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1202,9 +1202,9 @@ XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp")
 ;;;; Keysyms
 
 (defun vendor-specific-keysyms (vendor)
-  "Return the appropriate value of system-key-alist for 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)."
+as returned by `x-server-vendor'."
   ;; Fixme: Drop Apollo now?
   (cond ((string-equal vendor "Apollo Computer Inc.")
 	 '((65280 . linedel)
@@ -2098,12 +2098,11 @@ as returned by (x-server-vendor)."
 (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
+(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.")
+(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,7 +2344,7 @@ This is in addition to, but in preference to, the primary selection."
       (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"))
+  (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.