aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/emulation/pc-select.el22
1 files changed, 11 insertions, 11 deletions
diff --git a/lisp/emulation/pc-select.el b/lisp/emulation/pc-select.el
index 5edd920176e..0c5e8ad3691 100644
--- a/lisp/emulation/pc-select.el
+++ b/lisp/emulation/pc-select.el
@@ -5,7 +5,7 @@
5;; Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc. 5;; Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
6 6
7;; Author: Michael Staats <michael@thp.Uni-Duisburg.DE> 7;; Author: Michael Staats <michael@thp.Uni-Duisburg.DE>
8;; Keywords: convenience 8;; Keywords: convenience
9;; Created: 26 Sep 1995 9;; Created: 26 Sep 1995
10 10
11;; This file is part of GNU Emacs. 11;; This file is part of GNU Emacs.
@@ -36,7 +36,7 @@
36;; This package uses transient-mark-mode and 36;; This package uses transient-mark-mode and
37;; delete-selection-mode. 37;; delete-selection-mode.
38;; 38;;
39;; In addition to that all key-bindings from the pc-mode are 39;; In addition to that all key-bindings from the pc-mode are
40;; done here too (as suggested by RMS). 40;; done here too (as suggested by RMS).
41;; 41;;
42;; As I found out after I finished the first version, s-region.el tries 42;; As I found out after I finished the first version, s-region.el tries
@@ -59,7 +59,7 @@
59;; Dan Nicolaescu <done@ece.arizona.ro> suggested suppressing the 59;; Dan Nicolaescu <done@ece.arizona.ro> suggested suppressing the
60;; scroll-up/scroll-down error. 60;; scroll-up/scroll-down error.
61;; Eli Barzilay (eli@cs.bgu.ac.il) suggested the sexps functions and 61;; Eli Barzilay (eli@cs.bgu.ac.il) suggested the sexps functions and
62;; keybindings. 62;; keybindings.
63;; 63;;
64;; Ok, some details about the idea of pc-selection-mode: 64;; Ok, some details about the idea of pc-selection-mode:
65;; 65;;
@@ -229,7 +229,7 @@ If scan reaches end of buffer, stop there without error."
229A near full screen is `next-screen-context-lines' less than a full screen. 229A near full screen is `next-screen-context-lines' less than a full screen.
230Negative ARG means scroll upward. 230Negative ARG means scroll upward.
231When calling from a program, supply a number as argument or nil." 231When calling from a program, supply a number as argument or nil."
232 (interactive "P") 232 (interactive "P")
233 (ensure-mark) 233 (ensure-mark)
234 (cond (pc-select-override-scroll-error 234 (cond (pc-select-override-scroll-error
235 (condition-case nil (scroll-down arg) 235 (condition-case nil (scroll-down arg)
@@ -494,7 +494,7 @@ of the accessible part of the buffer.
494Don't use this command in Lisp programs! 494Don't use this command in Lisp programs!
495\(goto-char (p\oint-min)) is faster and avoids clobbering the mark." 495\(goto-char (p\oint-min)) is faster and avoids clobbering the mark."
496 (interactive "P") 496 (interactive "P")
497 (ensure-mark) 497 (ensure-mark)
498 (let ((size (- (point-max) (point-min)))) 498 (let ((size (- (point-max) (point-min))))
499 (goto-char (if arg 499 (goto-char (if arg
500 (+ (point-min) 500 (+ (point-min)
@@ -664,8 +664,8 @@ but before calling pc-selection-mode):
664 ;; will be deleted on the next keypress. IMHO especially for 664 ;; will be deleted on the next keypress. IMHO especially for
665 ;; copy-region-as-kill this is confusing. 665 ;; copy-region-as-kill this is confusing.
666 ;; The same goes for exchange-point-and-mark 666 ;; The same goes for exchange-point-and-mark
667 (define-key global-map "\M-w" 'copy-region-as-kill-nomark) 667 (define-key global-map "\M-w" 'copy-region-as-kill-nomark)
668 (define-key global-map "\C-x\C-x" 'exchange-point-and-mark-nomark) 668 (define-key global-map "\C-x\C-x" 'exchange-point-and-mark-nomark)
669 ;; The following keybindings are for standard ISO keyboards 669 ;; The following keybindings are for standard ISO keyboards
670 ;; as they are used with IBM compatible PCs, IBM RS/6000, 670 ;; as they are used with IBM compatible PCs, IBM RS/6000,
671 ;; MACs, many X-Stations and probably more 671 ;; MACs, many X-Stations and probably more
@@ -723,10 +723,10 @@ but before calling pc-selection-mode):
723 (global-set-key [C-down] 'forward-paragraph-nomark) ; KNextPara cDn 723 (global-set-key [C-down] 'forward-paragraph-nomark) ; KNextPara cDn
724 (global-set-key [C-up] 'backward-paragraph-nomark) ; KPrevPara cUp 724 (global-set-key [C-up] 'backward-paragraph-nomark) ; KPrevPara cUp
725 (global-set-key [S-C-down] 'forward-paragraph-mark) 725 (global-set-key [S-C-down] 'forward-paragraph-mark)
726 (global-set-key [S-C-up] 'backward-paragraph-mark) 726 (global-set-key [S-C-up] 'backward-paragraph-mark)
727 727
728 (or pc-select-selection-keys-only 728 (or pc-select-selection-keys-only
729 (progn 729 (progn
730 (define-key global-map [S-insert] 'yank) 730 (define-key global-map [S-insert] 'yank)
731 (define-key global-map [C-insert] 'copy-region-as-kill) 731 (define-key global-map [C-insert] 'copy-region-as-kill)
732 (define-key global-map [S-delete] 'kill-region) 732 (define-key global-map [S-delete] 'kill-region)
@@ -734,7 +734,7 @@ but before calling pc-selection-mode):
734 ;; The following bindings are useful on Sun Type 3 keyboards 734 ;; The following bindings are useful on Sun Type 3 keyboards
735 ;; They implement the Get-Delete-Put (copy-cut-paste) 735 ;; They implement the Get-Delete-Put (copy-cut-paste)
736 ;; functions from sunview on the L6, L8 and L10 keys 736 ;; functions from sunview on the L6, L8 and L10 keys
737 ;; Sam Steingold <sds@ptc.com> says that f16 is copy and f18 is paste. 737 ;; Sam Steingold <sds@gnu.org> says that f16 is copy and f18 is paste.
738 (define-key global-map [f16] 'copy-region-as-kill) 738 (define-key global-map [f16] 'copy-region-as-kill)
739 (define-key global-map [f18] 'yank) 739 (define-key global-map [f18] 'yank)
740 (define-key global-map [f20] 'kill-region) 740 (define-key global-map [f20] 'kill-region)
@@ -753,7 +753,7 @@ but before calling pc-selection-mode):
753 (global-set-key [C-backspace] 'backward-kill-word) 753 (global-set-key [C-backspace] 'backward-kill-word)
754 ;; Next line proposed by Eli Barzilay 754 ;; Next line proposed by Eli Barzilay
755 (global-set-key [C-escape] 'electric-buffer-list))) 755 (global-set-key [C-escape] 'electric-buffer-list)))
756 ;; 756 ;;
757 ;; setup 757 ;; setup
758 ;; 758 ;;
759 ;; Next line proposed by Eli Barzilay 759 ;; Next line proposed by Eli Barzilay