diff options
| author | Kenichi Handa | 2004-10-25 00:46:04 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2004-10-25 00:46:04 +0000 |
| commit | 832fe7204e7ec0c7b98d977f1e0fa92a79cbc60f (patch) | |
| tree | 1d1d47193434392856561755fd36912a2602165f /lisp | |
| parent | c0f7266a85de8df528e0f5ceba0702b8f979c176 (diff) | |
| download | emacs-832fe7204e7ec0c7b98d977f1e0fa92a79cbc60f.tar.gz emacs-832fe7204e7ec0c7b98d977f1e0fa92a79cbc60f.zip | |
(x-set-cut-buffer): Cancel previous change.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/select.el | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 25e0f80134e..e99856fe5f3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,7 +1,3 @@ | |||
| 1 | 2004-10-25 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * select.el (x-set-cut-buffer): Encode STRING if necessary. | ||
| 4 | |||
| 5 | 2004-10-24 Luc Teirlinck <teirllm@auburn.edu> | 1 | 2004-10-24 Luc Teirlinck <teirllm@auburn.edu> |
| 6 | 2 | ||
| 7 | * indent.el (set-left-margin, set-right-margin): Delete redundant | 3 | * indent.el (set-left-margin, set-right-margin): Delete redundant |
diff --git a/lisp/select.el b/lisp/select.el index bca19a5cd6e..565ddd7d22e 100644 --- a/lisp/select.el +++ b/lisp/select.el | |||
| @@ -144,11 +144,6 @@ Cut buffers are considered obsolete; you should use selections instead." | |||
| 144 | (or (stringp string) (signal 'wrong-type-argument (list 'string string))) | 144 | (or (stringp string) (signal 'wrong-type-argument (list 'string string))) |
| 145 | (if push | 145 | (if push |
| 146 | (x-rotate-cut-buffers-internal 1)) | 146 | (x-rotate-cut-buffers-internal 1)) |
| 147 | (if (> (string-bytes string) (length string)) | ||
| 148 | ;; STRING is a multibyte string contains non-ASCII characters. | ||
| 149 | (if locale-coding-system | ||
| 150 | (setq string (encode-coding-string string locale-coding-system)) | ||
| 151 | (setq string (string-make-unibyte string)))) | ||
| 152 | (x-store-cut-buffer-internal 'CUT_BUFFER0 string)) | 147 | (x-store-cut-buffer-internal 'CUT_BUFFER0 string)) |
| 153 | 148 | ||
| 154 | 149 | ||