diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/term/ns-win.el | 3 | ||||
| -rw-r--r-- | lisp/term/x-win.el | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e90abe8fe07..b05951f54f6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2010-10-23 Glenn Morris <rgm@gnu.org> | 1 | 2010-10-23 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * term/ns-win.el (xw-defined-colors): | ||
| 4 | * term/x-win.el (xw-defined-colors): Make docs identical to w32-win. | ||
| 5 | |||
| 3 | * term/pc-win.el (x-select-enable-clipboard): | 6 | * term/pc-win.el (x-select-enable-clipboard): |
| 4 | * term/x-win.el (x-select-enable-clipboard): | 7 | * term/x-win.el (x-select-enable-clipboard): |
| 5 | * w32-vars.el (x-select-enable-clipboard): Make doc-strings identical. | 8 | * w32-vars.el (x-select-enable-clipboard): Make doc-strings identical. |
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index 4cc26326659..0eb7322c618 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el | |||
| @@ -1138,7 +1138,7 @@ For Nextstep, this is a list of non-PANTONE colors returned by | |||
| 1138 | the operating system.") | 1138 | the operating system.") |
| 1139 | 1139 | ||
| 1140 | (defun xw-defined-colors (&optional frame) | 1140 | (defun xw-defined-colors (&optional frame) |
| 1141 | "Internal function called by `defined-colors'." | 1141 | "Internal function called by `defined-colors', which see." |
| 1142 | (or frame (setq frame (selected-frame))) | 1142 | (or frame (setq frame (selected-frame))) |
| 1143 | (let ((all-colors x-colors) | 1143 | (let ((all-colors x-colors) |
| 1144 | (this-color nil) | 1144 | (this-color nil) |
| @@ -1263,5 +1263,4 @@ the operating system.") | |||
| 1263 | 1263 | ||
| 1264 | (provide 'ns-win) | 1264 | (provide 'ns-win) |
| 1265 | 1265 | ||
| 1266 | ;; arch-tag: eb138a45-4e2e-4d68-b1c9-a39665731644 | ||
| 1267 | ;;; ns-win.el ends here | 1266 | ;;; ns-win.el ends here |
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index 5f5336ab2bf..f79942ed33d 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el | |||
| @@ -255,7 +255,7 @@ exists." | |||
| 255 | (defvar x-colors) | 255 | (defvar x-colors) |
| 256 | 256 | ||
| 257 | (defun xw-defined-colors (&optional frame) | 257 | (defun xw-defined-colors (&optional frame) |
| 258 | "Internal function called by `defined-colors'." | 258 | "Internal function called by `defined-colors', which see." |
| 259 | (or frame (setq frame (selected-frame))) | 259 | (or frame (setq frame (selected-frame))) |
| 260 | (let ((all-colors x-colors) | 260 | (let ((all-colors x-colors) |
| 261 | (this-color nil) | 261 | (this-color nil) |