[Emacs-diffs] emacs/lisp ChangeLog w32-fns.el w32-vars.el ter... [EMACS_23_1_RC]

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_23_1_RC
Changes by:     Chong Yidong <cyd>      09/07/20 21:30:37

Modified files:
        lisp           : ChangeLog w32-fns.el w32-vars.el 
        lisp/term      : common-win.el ns-win.el pc-win.el x-win.el 

Log message:
        * term/pc-win.el (x-display-name, x-colors)
        (x-select-enable-clipboard): Doc fix.
        
        * term/common-win.el (x-display-name, x-colors): Doc fix.
        
        * w32-vars.el (x-select-enable-clipboard): Doc fix.
        
        * term/ns-win.el (x-select-text, x-setup-function-keys, x-colors)
        (xw-defined-colors): Doc fix.
        
        * w32-fns.el (x-select-text, x-setup-function-keys): Doc fix.
        
        * term/x-win.el (x-select-text, x-setup-function-keys)
        (x-select-enable-clipboard, xw-defined-colors): Doc fix.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.15702.2.39&r2=1.15702.2.40
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/w32-fns.el?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.91&r2=1.91.2.1
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/w32-vars.el?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.27&r2=1.27.2.1
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/term/common-win.el?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.3&r2=1.3.2.1
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/term/ns-win.el?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.44.2.1&r2=1.44.2.2
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/term/pc-win.el?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.57&r2=1.57.2.1
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/term/x-win.el?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.240&r2=1.240.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15702.2.39
retrieving revision 1.15702.2.40
diff -u -b -r1.15702.2.39 -r1.15702.2.40
--- ChangeLog   20 Jul 2009 19:02:33 -0000      1.15702.2.39
+++ ChangeLog   20 Jul 2009 21:30:22 -0000      1.15702.2.40
@@ -1,3 +1,20 @@
+2009-07-20  Chong Yidong  <address@hidden>
+
+       * term/pc-win.el (x-display-name, x-colors)
+       (x-select-enable-clipboard): Doc fix.
+
+       * term/common-win.el (x-display-name, x-colors): Doc fix.
+
+       * w32-vars.el (x-select-enable-clipboard): Doc fix.
+
+       * term/ns-win.el (x-select-text, x-setup-function-keys, x-colors)
+       (xw-defined-colors): Doc fix.
+
+       * w32-fns.el (x-select-text, x-setup-function-keys): Doc fix.
+
+       * term/x-win.el (x-select-text, x-setup-function-keys)
+       (x-select-enable-clipboard, xw-defined-colors): Doc fix.
+
 2009-07-20  Dan Nicolaescu  <address@hidden>
 
        * term/vt420.el (terminal-init-vt420): Fix typo.

Index: w32-fns.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/w32-fns.el,v
retrieving revision 1.91
retrieving revision 1.91.2.1
diff -u -b -r1.91 -r1.91.2.1
--- w32-fns.el  5 Jan 2009 03:19:55 -0000       1.91
+++ w32-fns.el  20 Jul 2009 21:30:36 -0000      1.91.2.1
@@ -55,7 +55,7 @@
   "Keymap of possible alternative meanings for some keys.")
 
 (defun x-setup-function-keys (frame)
-  "Set up `function-key-map' on FRAME for w32."
+  "Set up `function-key-map' on the graphical frame FRAME."
   ;; Don't do this twice on the same display, or it would break
   ;; normal-erase-is-backspace-mode.
   (unless (terminal-parameter frame 'x-setup-function-keys)
@@ -415,9 +415,19 @@
   "Max number of characters to put in the cut buffer.")
 
 (defun x-select-text (text &optional push)
-  "Make TEXT the last selected text.
-If `x-select-enable-clipboard' is non-nil, copy the text to the system
-clipboard as well.  Optional PUSH is ignored on Windows."
+  "Select TEXT, a string, according to the window system.
+
+On X, put TEXT in the primary X selection.  For backward
+compatibility with older X applications, set the value of X cut
+buffer 0 as well, and if the optional argument PUSH is non-nil,
+rotate the cut buffers.  If `x-select-enable-clipboard' is
+non-nil, copy the text to the X clipboard as well.
+
+On Windows, make TEXT the current selection.  If
+`x-select-enable-clipboard' is non-nil, copy the text to the
+clipboard as well.  The argument PUSH is ignored.
+
+On Nextstep, put TEXT in the pasteboard; PUSH is ignored."
   (if x-select-enable-clipboard
       (w32-set-clipboard-data text))
   (setq x-last-selected-text text))

Index: w32-vars.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/w32-vars.el,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -u -b -r1.27 -r1.27.2.1
--- w32-vars.el 10 Mar 2009 23:48:34 -0000      1.27
+++ w32-vars.el 20 Jul 2009 21:30:36 -0000      1.27.2.1
@@ -149,7 +149,7 @@
 
 (defcustom x-select-enable-clipboard t
   "Non-nil means cutting and pasting uses the clipboard.
-This is in addition to the primary selection."
+This is in addition to, but in preference to, the primary selection."
   :type 'boolean
   :group 'killing)
 

Index: term/common-win.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/term/common-win.el,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- term/common-win.el  5 Jan 2009 03:23:55 -0000       1.3
+++ term/common-win.el  20 Jul 2009 21:30:37 -0000      1.3.2.1
@@ -131,10 +131,9 @@
                                  initial-frame-alist)))
 
 (defvar x-display-name nil
-  "The name of the X display on which Emacs was started.
-
-For the X display name of individual frames, see the `display'
-frame parameter.")
+  "The name of the window display on which Emacs was started.
+On X, the display name of individual X frames is recorded in the
+`display' frame parameter.")
 
 (defun x-handle-display (switch)
   "Handle -display DISPLAY option."
@@ -288,8 +287,10 @@
     "cyan" "medium spring green" "spring green" "green" "lawn green" 
"chartreuse"
     "yellow" "gold" "orange" "dark orange" "orange red" "red" "white" "white 
smoke"
     "gainsboro" "light grey" "gray" "dark grey" "dim gray" "black" )
-  "The list of X colors from the `rgb.txt' file.
-XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp")
+  "List of available colors for graphical frames.
+For X, the list comes from the `rgb.txt' file,v 10.41 94/02/20.
+For Nextstep, this is a list of non-PANTONE colors returned by
+the operating system.")
 
 ;; arch-tag: 2a128601-99cc-401e-9dff-0ee6a36102ef
 ;;; common-win.el ends here

Index: term/ns-win.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/term/ns-win.el,v
retrieving revision 1.44.2.1
retrieving revision 1.44.2.2
diff -u -b -r1.44.2.1 -r1.44.2.2
--- term/ns-win.el      16 Jul 2009 08:27:34 -0000      1.44.2.1
+++ term/ns-win.el      20 Jul 2009 21:30:37 -0000      1.44.2.2
@@ -99,9 +99,10 @@
   (setq initial-frame-alist (cons (cons 'name (pop ns-invocation-args))
                                   initial-frame-alist)))
 
-;; Set (but not used?) in frame.el.
 (defvar x-display-name nil
-  "The name of the Nextstep display on which Emacs was started.")
+  "The name of the window display on which Emacs was started.
+On X, the display name of individual X frames is recorded in the
+`display' frame parameter.")
 
 ;; nsterm.m.
 (defvar ns-input-file)
@@ -309,7 +310,7 @@
 (defalias 'do-applescript 'ns-do-applescript)
 
 (defun x-setup-function-keys (frame)
-  "Set up function Keys for Nextstep for frame FRAME."
+  "Set up function keys on the graphical frame FRAME."
   (unless (terminal-parameter frame 'x-setup-function-keys)
     (with-selected-frame frame
       (setq interprogram-cut-function 'x-select-text
@@ -1003,7 +1004,19 @@
 (defvar ns-last-selected-text nil)
 
 (defun x-select-text (text &optional push)
-  "Put TEXT, a string, on the pasteboard."
+  "Select TEXT, a string, according to the window system.
+
+On X, put TEXT in the primary X selection.  For backward
+compatibility with older X applications, set the value of X cut
+buffer 0 as well, and if the optional argument PUSH is non-nil,
+rotate the cut buffers.  If `x-select-enable-clipboard' is
+non-nil, copy the text to the X clipboard as well.
+
+On Windows, make TEXT the current selection.  If
+`x-select-enable-clipboard' is non-nil, copy the text to the
+clipboard as well.  The argument PUSH is ignored.
+
+On Nextstep, put TEXT in the pasteboard; PUSH is ignored."
   ;; Don't send the pasteboard too much text.
   ;; It becomes slow, and if really big it causes errors.
   (ns-set-pasteboard text)
@@ -1113,12 +1126,15 @@
 (declare-function ns-list-colors "nsfns.m" (&optional frame))
 
 (defvar x-colors (ns-list-colors)
-  "The list of colors defined in non-PANTONE color files.")
+  "List of available colors for graphical frames.
+For X, the list comes from the `rgb.txt' file,v 10.41 94/02/20.
+For Nextstep, this is a list of non-PANTONE colors returned by
+the operating system.")
 
+;; The argument FRAME specifies which frame to try.
+;; The value may be different for frames on different Nextstep displays.
 (defun xw-defined-colors (&optional frame)
-  "Return a list of colors supported for a particular frame.
-The argument FRAME specifies which frame to try.
-The value may be different for frames on different Nextstep displays."
+  "Internal function called by `defined-colors'."
   (or frame (setq frame (selected-frame)))
   (let ((all-colors x-colors)
        (this-color nil)

Index: term/pc-win.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/term/pc-win.el,v
retrieving revision 1.57
retrieving revision 1.57.2.1
diff -u -b -r1.57 -r1.57.2.1
--- term/pc-win.el      8 Apr 2009 13:49:53 -0000       1.57
+++ term/pc-win.el      20 Jul 2009 21:30:37 -0000      1.57.2.1
@@ -181,9 +181,14 @@
 
 ;; From lisp/term/x-win.el
 (defvar x-display-name "pc"
-  "The display name specifying the MS-DOS display and frame type.")
+  "The name of the window display on which Emacs was started.
+On X, the display name of individual X frames is recorded in the
+`display' frame parameter.")
 (defvar x-colors (mapcar 'car msdos-color-values)
-  "The list of colors available on a PC display under MS-DOS.")
+  "List of available colors for graphical frames.
+For X, the list comes from the `rgb.txt' file,v 10.41 94/02/20.
+For Nextstep, this is a list of non-PANTONE colors returned by
+the operating system.")
 
 ;; From lisp/term/w32-win.el
 ;
@@ -196,8 +201,7 @@
 
 (defcustom x-select-enable-clipboard t
   "Non-nil means cutting and pasting uses the clipboard.
-This is the default on this system, since MS-Windows does not
-support other types of selections."
+This is in addition to, but in preference to, the primary selection."
   :type 'boolean
   :group 'killing)
 

Index: term/x-win.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/term/x-win.el,v
retrieving revision 1.240
retrieving revision 1.240.2.1
diff -u -b -r1.240 -r1.240.2.1
--- term/x-win.el       19 Mar 2009 00:56:52 -0000      1.240
+++ term/x-win.el       20 Jul 2009 21:30:37 -0000      1.240.2.1
@@ -255,7 +255,7 @@
 (defvar x-colors)
 
 (defun xw-defined-colors (&optional frame)
-  "Internal function called by `defined-colors', which see."
+  "Internal function called by `defined-colors'."
   (or frame (setq frame (selected-frame)))
   (let ((all-colors x-colors)
        (this-color nil)
@@ -292,7 +292,7 @@
   "Keymap of possible alternative meanings for some keys.")
 
 (defun x-setup-function-keys (frame)
-  "Set up `function-key-map' on FRAME for the X window system."
+  "Set up `function-key-map' on the graphical frame FRAME."
   ;; Don't do this twice on the same display, or it would break
   ;; normal-erase-is-backspace-mode.
   (unless (terminal-parameter frame 'x-setup-function-keys)
@@ -1249,11 +1249,19 @@
   :group 'killing)
 
 (defun x-select-text (text &optional push)
-  "Make TEXT, a string, the primary X selection.
-Also, set the value of X cut buffer 0, for backward compatibility
-with older X applications.
address@hidden says it's not desirable to put kills
-in the clipboard."
+  "Select TEXT, a string, according to the window system.
+
+On X, put TEXT in the primary X selection.  For backward
+compatibility with older X applications, set the value of X cut
+buffer 0 as well, and if the optional argument PUSH is non-nil,
+rotate the cut buffers.  If `x-select-enable-clipboard' is
+non-nil, copy the text to the X clipboard as well.
+
+On Windows, make TEXT the current selection.  If
+`x-select-enable-clipboard' is non-nil, copy the text to the
+clipboard as well.  The argument PUSH is ignored.
+
+On Nextstep, put TEXT in the pasteboard; PUSH is ignored."
   ;; With multi-tty, this function may be called from a tty frame.
   (when (eq (framep (selected-frame)) 'x)
     ;; Don't send the cut buffer too much text.