comparison lisp/select.el @ 300:3cc9f0ebfbd1 r21-0b48

Import from CVS: tag r21-0b48
author cvs
date Mon, 13 Aug 2007 10:40:26 +0200
parents 57709be46d1b
children c9ae480b1fff
comparison
equal deleted inserted replaced
299:24cff6e8d715 300:3cc9f0ebfbd1
35 (defun copy-primary-selection () 35 (defun copy-primary-selection ()
36 "Copy the selection to the Clipboard and the kill ring." 36 "Copy the selection to the Clipboard and the kill ring."
37 (interactive) 37 (interactive)
38 (and (console-on-window-system-p) 38 (and (console-on-window-system-p)
39 (cut-copy-clear-internal 'copy))) 39 (cut-copy-clear-internal 'copy)))
40 (define-obsolete-function-alias
41 'x-copy-primary-selection
42 'copy-primary-selection)
40 43
41 (defun kill-primary-selection () 44 (defun kill-primary-selection ()
42 "Copy the selection to the Clipboard and the kill ring, then delete it." 45 "Copy the selection to the Clipboard and the kill ring, then delete it."
43 (interactive "*") 46 (interactive "*")
44 (and (console-on-window-system-p) 47 (and (console-on-window-system-p)
45 (cut-copy-clear-internal 'cut))) 48 (cut-copy-clear-internal 'cut)))
49 (define-obsolete-function-alias
50 'x-kill-primary-selection
51 'kill-primary-selection)
46 52
47 (defun delete-primary-selection () 53 (defun delete-primary-selection ()
48 "Delete the selection without copying it to the Clipboard or the kill ring." 54 "Delete the selection without copying it to the Clipboard or the kill ring."
49 (interactive "*") 55 (interactive "*")
50 (and (console-on-window-system-p) 56 (and (console-on-window-system-p)
51 (cut-copy-clear-internal 'clear))) 57 (cut-copy-clear-internal 'clear)))
58 (define-obsolete-function-alias
59 'x-delete-primary-selection
60 'delete-primary-selection)
52 61
53 (defun yank-clipboard-selection () 62 (defun yank-clipboard-selection ()
54 "Insert the current Clipboard selection at point." 63 "Insert the current Clipboard selection at point."
55 (interactive "*") 64 (interactive "*")
56 (case (device-type (selected-device)) 65 (case (device-type (selected-device))
207 (mouse-track-rectangle-p 216 (mouse-track-rectangle-p
208 (setq previous-extent (list previous-extent)) 217 (setq previous-extent (list previous-extent))
209 (default-mouse-track-next-move-rect start end previous-extent) 218 (default-mouse-track-next-move-rect start end previous-extent)
210 )) 219 ))
211 previous-extent)))) 220 previous-extent))))
221 (define-obsolete-function-alias
222 'x-select-make-extent-for-selection
223 'select-make-extent-for-selection)
212 224
213 ;; moved from x-select.el 225 ;; moved from x-select.el
214 (defun valid-simple-selection-p (data) 226 (defun valid-simple-selection-p (data)
215 (or (stringp data) 227 (or (stringp data)
216 ;FSFmacs huh?? (symbolp data) 228 ;FSFmacs huh?? (symbolp data)
228 (marker-buffer (cdr data)) 240 (marker-buffer (cdr data))
229 (eq (marker-buffer (car data)) 241 (eq (marker-buffer (car data))
230 (marker-buffer (cdr data))) 242 (marker-buffer (cdr data)))
231 (buffer-live-p (marker-buffer (car data))) 243 (buffer-live-p (marker-buffer (car data)))
232 (buffer-live-p (marker-buffer (cdr data)))))) 244 (buffer-live-p (marker-buffer (cdr data))))))
245 (define-obsolete-function-alias
246 'x-valid-simple-selection-p
247 'valid-simple-selection-p)
233 248
234 (defun cut-copy-clear-internal (mode) 249 (defun cut-copy-clear-internal (mode)
235 (or (memq mode '(cut copy clear)) (error "unkown mode %S" mode)) 250 (or (memq mode '(cut copy clear)) (error "unkown mode %S" mode))
236 (or (selection-owner-p) 251 (or (selection-owner-p)
237 (error "emacs does not own the primary selection")) 252 (error "emacs does not own the primary selection"))
270 (if rect-p 285 (if rect-p
271 (delete-rectangle s e) 286 (delete-rectangle s e)
272 (delete-region s e)))) 287 (delete-region s e))))
273 (disown-selection nil) 288 (disown-selection nil)
274 ))) 289 )))
290 (define-obsolete-function-alias
291 'x-cut-copy-clear-internal
292 'cut-copy-clear-internal)
275 293
276 ;;; select.el ends here 294 ;;; select.el ends here