aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Paul Wallington2003-03-10 13:30:22 +0000
committerJohn Paul Wallington2003-03-10 13:30:22 +0000
commit089bc712c0d71f238435f95b44b3ad391e9c92f9 (patch)
treed76abbfc7ce51c8ca29125279289bf1d0648fc8a
parent3a24cce05be3b93d612490953a216b7bbddf87ac (diff)
downloademacs-089bc712c0d71f238435f95b44b3ad391e9c92f9.tar.gz
emacs-089bc712c0d71f238435f95b44b3ad391e9c92f9.zip
(vendor-specific-keysyms, x-last-selected-text-primary): Doc fixes.
(x-win-suspend-error): Use proper noun in error message.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/term/x-win.el13
2 files changed, 12 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 51c07e559db..e986c6604b6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -10,9 +10,15 @@
10 10
112003-03-10 John Paul Wallington <jpw@gnu.org> 112003-03-10 John Paul Wallington <jpw@gnu.org>
12 12
13 * subr.el (posn-col-row): Take into account `line-spacing'.
14
13 * ebuff-menu.el (electric-buffer-update-highlight): Do nothing 15 * ebuff-menu.el (electric-buffer-update-highlight): Do nothing
14 if major mode isn't `Electric-buffer-menu-mode'. 16 if major mode isn't `Electric-buffer-menu-mode'.
15 17
18 * term/x-win.el (vendor-specific-keysyms)
19 (x-last-selected-text-primary): Doc fixes.
20 (x-win-suspend-error): Use proper noun in error message.
21
162003-03-09 Kai Gro,A_(Bjohann <kai.grossjohann@uni-duisburg.de> 222003-03-09 Kai Gro,A_(Bjohann <kai.grossjohann@uni-duisburg.de>
17 23
18 * man.el (Man-getpage-in-background): Always use `setenv' for 24 * 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")
1202;;;; Keysyms 1202;;;; Keysyms
1203 1203
1204(defun vendor-specific-keysyms (vendor) 1204(defun vendor-specific-keysyms (vendor)
1205 "Return the appropriate value of system-key-alist for VENDOR. 1205 "Return the appropriate value of `system-key-alist' for VENDOR.
1206VENDOR is a string containing the name of the X Server's vendor, 1206VENDOR is a string containing the name of the X Server's vendor,
1207as returned by (x-server-vendor)." 1207as returned by `x-server-vendor'."
1208 ;; Fixme: Drop Apollo now? 1208 ;; Fixme: Drop Apollo now?
1209 (cond ((string-equal vendor "Apollo Computer Inc.") 1209 (cond ((string-equal vendor "Apollo Computer Inc.")
1210 '((65280 . linedel) 1210 '((65280 . linedel)
@@ -2098,12 +2098,11 @@ as returned by (x-server-vendor)."
2098(defvar x-last-selected-text-clipboard nil 2098(defvar x-last-selected-text-clipboard nil
2099 "The value of the CLIPBOARD X selection last time we selected or 2099 "The value of the CLIPBOARD X selection last time we selected or
2100pasted text.") 2100pasted text.")
2101(defvar x-last-selected-text-primary nil 2101(defvar x-last-selected-text-primary nil
2102 "The value of the PRIMARY X selection last time we selected or 2102 "The value of the PRIMARY X selection last time we selected or
2103pasted text.") 2103pasted text.")
2104(defvar x-last-selected-text-cut nil 2104(defvar x-last-selected-text-cut nil
2105 "The vaue of the X cut buffer last time we selected or 2105 "The value of the X cut buffer last time we selected or pasted text.")
2106pasted text.")
2107 2106
2108;;; It is said that overlarge strings are slow to put into the cut buffer. 2107;;; It is said that overlarge strings are slow to put into the cut buffer.
2109;;; Note this value is overridden below. 2108;;; Note this value is overridden below.
@@ -2345,7 +2344,7 @@ This is in addition to, but in preference to, the primary selection."
2345 (setq x-selection-timeout (string-to-number res-selection-timeout)))) 2344 (setq x-selection-timeout (string-to-number res-selection-timeout))))
2346 2345
2347(defun x-win-suspend-error () 2346(defun x-win-suspend-error ()
2348 (error "Suspending an emacs running under X makes no sense")) 2347 (error "Suspending an Emacs running under X makes no sense"))
2349(add-hook 'suspend-hook 'x-win-suspend-error) 2348(add-hook 'suspend-hook 'x-win-suspend-error)
2350 2349
2351;;; Arrange for the kill and yank functions to set and check the clipboard. 2350;;; Arrange for the kill and yank functions to set and check the clipboard.