1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-21 10:24:55 +00:00
Commit Graph

74 Commits

Author SHA1 Message Date
Paul Eggert
ab422c4d68 Update copyright notices for 2013. 2013-01-01 09:11:05 +00:00
Kenichi Handa
4ef4a10d1c select.el (xselect--encode-string): If a coding is specified for selection, and that is compatible with COMPOUND_TEXT, use it. 2012-10-10 23:45:26 +09:00
Chong Yidong
eceeb5fca6 Merge from emacs-24; up to 2012-04-20T05:47:55Z!eliz@gnu.org 2012-05-05 12:32:58 +08:00
Chong Yidong
acb71f1dad Ensure that X selection convertors properly encode returned strings.
Though not itself a regression, this bug was exposed by the support
for MULTIPLE selections, which is new to Emacs 24 (see Bug#11315).

* lisp/select.el (xselect--encode-string): New function, split from
xselect-convert-to-string.
(xselect-convert-to-string): Use it.
(xselect-convert-to-filename, xselect-convert-to-os)
(xselect-convert-to-host, xselect-convert-to-user): Ensure that
returned strings are properly encoded.
2012-04-24 13:34:50 +08:00
Glenn Morris
cfecdf09a0 Update some function declarations
* lisp/select.el (x-get-selection-internal, x-own-selection-internal)
(x-disown-selection-internal):
* lisp/x-dnd.el (x-get-selection-internal): Update declarations.
2012-02-11 15:06:46 -08:00
Glenn Morris
acaf905b11 Add 2012 to FSF copyright years for Emacs files 2012-01-05 01:46:05 -08:00
Paul Eggert
22bcf20469 Spelling fixes. 2011-12-30 17:27:15 -08:00
Chong Yidong
1dd3c2d9b2 Move clipboard-manager functionality out of hooks.
* lisp/select.el: Don't perform clipboard-manager saving in hooks;
leave the hooks empty.

* src/emacs.c (Fkill_emacs): Call x_clipboard_manager_save_all.
* src/frame.c (delete_frame): Call x_clipboard_manager_save_frame.

* src/xselect.c (x_clipboard_manager_save_frame)
(x_clipboard_manager_save_all): New functions.
(Fx_clipboard_manager_save): Lisp function deleted.

* src/xterm.h: Update prototype.
2011-05-28 20:45:00 -04:00
Chong Yidong
a9f737eef6 Support X clipboard managers.
* lisp/select.el (xselect-convert-to-targets): Add MULTIPLE target to list.
(xselect-convert-to-save-targets): New function.

* src/xselect.c: Support for clipboard managers.
(Vselection_alist): Move to termhooks.h as terminal-local var.
(LOCAL_SELECTION): New macro.
(x_atom_to_symbol): Handle x_display_info_for_display fail case.
(symbol_to_x_atom): Remove gratuitous arg.
(x_handle_selection_request, lisp_data_to_selection_data)
(x_get_foreign_selection, Fx_register_dnd_atom): Callers changed.
(x_own_selection, x_get_local_selection, x_convert_selection): New
arg, specifying work frame.  Use terminal-local Vselection_alist.
(some_frame_on_display): Delete unused function.
(Fx_own_selection_internal, Fx_get_selection_internal)
(Fx_disown_selection_internal, Fx_selection_owner_p)
(Fx_selection_exists_p): New optional frame arg.
(frame_for_x_selection, Fx_clipboard_manager_save): New functions.
(x_handle_selection_clear): Don't treat other terminals with the
same keyboard specially.  Use the terminal-local Vselection_alist.
(x_clear_frame_selections): Use Frun_hook_with_args.

* src/termhooks.h (Vselection_alist): Make it terminal-local.

* src/terminal.c (create_terminal): Initialize it.

* src/xterm.c (x_term_init): Intern ATOM and CLIPBOARD_MANAGER atoms.

* src/xterm.h: Add support for those atoms.
2011-05-27 12:17:59 -04:00
Juanma Barranquero
06b605171f lisp/*.el: Lexical-binding cleanup. 2011-04-19 15:44:55 +02:00
Glenn Morris
73b0cd5003 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
Stefan Monnier
77ab81d054 Merge from emacs-23 2011-01-14 12:18:41 -05:00
Glenn Morris
5df4f04cd3 Add 2011 to FSF/AIST copyright years. 2011-01-02 15:50:46 -08:00
Chong Yidong
2699a55464 Merge changes from emacs-23 branch 2010-10-31 10:40:01 -04:00
Glenn Morris
82f7efc320 * lisp/select.el (x-selection): Mark it as an obsolete alias. 2010-10-27 20:52:14 -07:00
Glenn Morris
f5f2561564 Sync docs of selection-coding-system between C and Lisp.
* src/w16select.c (syms_of_win16select) <selection-coding-system>:
* src/w32select.c (syms_of_w32select) <selection-coding-system>:
Sync docs with select.el.
* lisp/select.el (selection-coding-system): Sync doc with C versions.
2010-10-23 19:22:43 -07:00
Glenn Morris
3646b86d0e Sync Lisp and C docs of next-selection-coding-system.
* src/w16select.c (syms_of_win16select) <next-selection-coding-system>:
* src/w32select.c (syms_of_w32select) <next-selection-coding-system>:
Sync docs with select.el.
* lisp/select.el (next-selection-coding-system): Sync doc with C versions.
2010-10-23 19:13:37 -07:00
Jan Djärv
6d7cc56382 Removed cut-buffer code.
* lisp/mouse-sel.el (mouse-sel-get-selection-function):
x-cut-buffer-or-selection-value renamed to x-selection-value.
(x-select-text): Optional push removed.

* lisp/select.el (x-get-cut-buffer, x-set-cut-buffer): Remove.

* lisp/simple.el (interprogram-cut-function): Remove mention of PUSH.

* lisp/w32-fns.el (x-last-selected-text):
x-cut-buffer-or-selection-value renamed to x-selection-value.
(x-cut-buffer-max): Remove.
(x-select-text): Remove argument PUSH, update documentation.

* lisp/emacs-lisp/cl-macs.el (x-get-cutbuffer, x-get-cut-buffer): Remove.

* lisp/term/ns-win.el (x-setup-function-keys, ns-last-selected-text):
x-cut-buffer-or-selection-value renamed to x-selection-value
(x-selection-value): Renamed from x-cut-buffer-or-selection-value.
(x-select-text): Remove argument PUSH, update documentation.

* lisp/term/pc-win.el (x-last-selected-text):
x-cut-buffer-or-selection-value renamed to x-selection-value
(x-select-text): Remove argument PUSH, update documentation.

* lisp/term/x-win.el: Update documentation for x-last-selected-text-*.
(x-last-selected-text-cut, x-last-selected-text-cut-encoded)
(x-last-cut-buffer-coding, x-cut-buffer-max): Remove.
(x-select-text): Remove argument PUSH, update documentation.  Remove
cut-buffer code.
(x-selection-value-internal): Was previously x-selection-value.
(x-selection-value): Renamed from x-cut-buffer-or-selection-value.
Update documentation, remove cut-buffer code.  Call
x-selection-value-internal.
(x-clipboard-yank): Call x-selection-value-internal.
(x-initialize-window-system): Remove setting of x-cut-buffer-max.

* src/xselect.c: Remove declaration of cut-buffer objects and functions.
(symbol_to_x_atom): Remove mapping to XA_CUT_BUFFERn.
(x_atom_to_symbol): Remove mapping to QCUT_BUFFERn.
(Fx_get_cut_buffer_internal, Fx_store_cut_buffer_internal)
(Fx_rotate_cut_buffers_internal): Remove.
(syms_of_xselect): Remove defsubr of above.
Remove intern of QCUT_BUFFERn.

* src/xterm.c (x_term_init): Don't set dpyinfo->cut_buffers_initialized.

* src/xterm.h (struct dpyinfo): Remove cut_buffers_initialized.
2010-09-02 11:47:08 +02:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Chong Yidong
d977a09243 * select.el (x-set-selection): Doc fix (Bug#4021).
* w32-fns.el (x-set-selection): Doc fix (Bug#4021).
2009-08-02 23:22:03 +00:00
Eli Zaretskii
3077d1f623 Fix Bug#3888:
w32-vars.el (x-select-enable-clipboard): Doc fix.
term/pc-win.el (x-display-name, x-colors)
(x-select-enable-clipboard, x-select-text): Doc fix.
term/common-win.el (x-display-name, x-colors): 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)
(x-get-selection, x-set-selection): Doc fix.
term/x-win.el (x-select-text, x-setup-function-keys)
(x-select-enable-clipboard, xw-defined-colors): Doc fix.
select.el (x-set-selection): Doc fix.
2009-07-25 09:31:05 +00:00
Chong Yidong
f9be2e3569 * simple.el (deactivate-mark): Optional argument FORCE.
(set-mark): Use deactivate-mark.

* info.el (Info-search): No need to check transient-mark-mode
before calling deactivate-mark.

* select.el (x-set-selection): Doc fix.
(x-valid-simple-selection-p): Allow buffer values.
(xselect--selection-bounds): Handle buffer values.  Suggested by
David De La Harpe Golden.

* mouse.el (mouse-set-region, mouse-drag-track): Call
copy-region-as-kill before setting the mark, to let
select-active-regions work.

* simple.el (deactivate-mark): If select-active-regions is
non-nil, copy the selection data into a string.
(activate-mark): If select-active-regions is non-nil, set the
selection to the current buffer.
(set-mark): Update selection if select-active-regions is non-nil.

* select.el (x-valid-simple-selection-p): Allow buffer values.
2009-07-15 01:25:32 +00:00
Chong Yidong
f470187ffb * select.el (x-set-selection): Doc fix.
(x-valid-simple-selection-p): Disallow selection data consisting
of a list or cons of integers, since that is not used.
(xselect--selection-bounds, xselect--int-to-cons): New functions.
(xselect-convert-to-string, xselect-convert-to-length)
(xselect-convert-to-filename, xselect-convert-to-charpos)
(xselect-convert-to-lineno, xselect-convert-to-colno): Use them.
2009-07-14 16:58:25 +00:00
Glenn Morris
ae940284fa Add 2009 to copyright years. 2009-01-05 03:18:22 +00:00
Glenn Morris
96ead4f94b (x-set-cut-buffer): Fix signal arguments. 2008-11-25 04:23:59 +00:00
Juanma Barranquero
6cda144ffe Fix typos in docstrings.
* cus-edit.el (customize-apropos-options, custom-comment)
  (custom-comment-tag, custom-face-edit-attribute-tag):
  Fix typos in docstrings.
  (custom-buffer-done-kill): Remove * from defcustom docstring.
  (custom-file): Fix typo in doc of defcustom choice.

* frame.el (display-visual-class): Fix typo in docstring.
  (initial-frame-alist, minibuffer-frame-alist, pop-up-frame-alist)
  (special-display-frame-alist, show-trailing-whitespace)
  (auto-hscroll-mode, blink-cursor-delay, blink-cursor-interval)
  (display-hourglass, hourglass-delay, cursor-in-non-selected-windows):
  Remove * from defcustom docstrings.

* md4.el (md4-buffer): Fix typo in docstring.
  (md4, md4-64): Doc fixes.
  (md4-pack-int32): Reflow docstring.

* paths.el (rmail-file-name): Remove * from defcustom docstring.
  (prune-directory-list, gnus-nntp-service): Fix typos in docstrings.

* rect.el (open-rectangle): Reflow docstring.
  (spaces-string): Fix docstring typo.  Use "?\s" instead of "? ".

* select.el (x-get-cut-buffer): Fix typo in docstring.

* timezone.el (timezone-zone-to-minute, timezone-time-from-absolute)
  (timezone-time-zone-from-absolute, timezone-leap-year-p):
  Fix typos in docstrings.

* emacs-lisp/assoc.el (asort, aelement, aput, aget, amake):
  Fix typos in docstrings.
2008-11-01 01:24:33 +00:00
Stefan Monnier
fdbe0096c5 Fix commenting convenition. 2008-09-14 21:18:56 +00:00
Glenn Morris
aa360da10d Add some compiler declarations, for builds without X. 2008-06-12 03:56:20 +00:00
Juanma Barranquero
29128339b1 (x-get-selection): Fix typo. 2008-06-01 11:54:47 +00:00
Glenn Morris
eb3fa2cfcf Switch to recommended form of GPLv3 permissions notice. 2008-05-06 08:06:51 +00:00
Chong Yidong
569ac23f8a (xselect-convert-to-string): Send a C_STRING only if the polymorphic
target TEXT is requested.
2008-04-21 02:02:01 +00:00
Stefan Monnier
cbee283dd7 Fix up comment convention on the arch-tag lines. 2008-04-10 14:10:46 +00:00
Glenn Morris
b50690ccaf (selection-coding-system): Make it a defcustom, and add the properties
from cus-start.el.  Bump :version.
2008-02-08 20:16:52 +00:00
Miles Bader
430d2ee291 Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-312
2008-01-09 01:21:15 +00:00
Miles Bader
59ce725a3b Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
2008-01-08 20:46:54 +00:00
Glenn Morris
409cc4a3ea Add 2008 to copyright years. 2008-01-07 02:45:14 +00:00
Miles Bader
0bd5084171 Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294
2007-12-06 09:51:45 +00:00
Juanma Barranquero
c2649d3f84 (x-get-cut-buffer-internal, x-rotate-cut-buffers-internal,
x-store-cut-buffer-internal): Declare as functions.
2007-11-22 13:51:38 +00:00
Kenichi Handa
502597985d (selection-coding-system)
(next-selection-coding-system): Declaration moded from xselect.c.
(x-get-selection): Decode by selection-coding-system if it is
non-nil.  If it is nil, decode by a proper coding system.  Handle
C_STRING.
(ccl-check-utf-8, string-utf-8-p): Delete them.
(xselect-convert-to-string): Fix determining data-type in the case
that TEXT is requested.  Don't use selection-coding-system if it's
not proper for the data-type.
2007-11-18 09:12:14 +00:00
Glenn Morris
4837b516ea Replace `iff' in doc-strings and comments. 2007-08-08 07:40:09 +00:00
Glenn Morris
b4aa60262c Switch license to GPLv3 or later. 2007-07-25 04:50:21 +00:00
Glenn Morris
d7a0267c8d Add 2007 to copyright years. 2007-01-21 03:53:13 +00:00
Glenn Morris
c90f275771 Update copyright years. 2006-12-05 07:06:08 +00:00
Jan Djärv
1df04e22ca * select.el (ccl-check-utf-8, string-utf-8-p): New functions
(by Kenichi Handa).
 (xselect-convert-to-string): Decline requests for UTF8_STRING if
 the selection is not UTF-8.
2006-10-19 07:16:27 +00:00
Jan Djärv
b984fed926 * select.el (xselect-convert-to-string): If UTF8_STRING is requested
and the data doesn't look like UTF8, send STRING instead.
2006-09-16 17:12:38 +00:00
Thien-Thi Nguyen
aaef169dc6 Update years in copyright notice; nfc. 2006-02-06 15:23:23 +00:00
Thien-Thi Nguyen
0d30b33766 Update years in copyright notice; nfc. 2005-08-06 22:13:43 +00:00
Lute Kamstra
086add1519 Update FSF's address. 2005-07-04 23:32:44 +00:00
Kenichi Handa
832fe7204e (x-set-cut-buffer): Cancel previous change. 2004-10-25 00:46:04 +00:00
Kenichi Handa
c0f7266a85 (x-set-cut-buffer): Encode STRING if necessary. 2004-10-25 00:22:02 +00:00