-;;; s-region.el --- set region using shift key.
-;;; Copyright (C) 1994 Free Software Foundation, Inc.
+;;; s-region.el --- set region using shift key
-;; Author: Morten Welinder (terra@diku.dk)
-;; Version: 1.00
+;; Copyright (C) 1994, 1995, 2002, 2003, 2004,
+;; 2005 Free Software Foundation, Inc.
+
+;; Author: Morten Welinder <terra@diku.dk>
;; Keywords: terminals
;; Favourite-brand-of-beer: None, I hate beer.
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;; Having loaded this code you can set the region by holding down the
;; shift key and move the cursor to the other end of the region. The
-;; functionallity provided by this code is similar to that provided by
+;; functionality provided by this code is similar to that provided by
;; the editors of Borland International's compilers for ms-dos.
;; Currently, s-region-move may be bound only to events that are vectors
;; of length one and whose last element is a symbol. Also, the functions
-;; that are given this kind of overlay should be (interactive "p")
+;; that are given this kind of overlay should be (interactive "p")
;; functions.
;; If the following keys are not already bound then...
(error "Key does not end in a symbol: %S" key)))
(error "Non-vector key: %S" key)))
-(defun s-region-move (&rest arg)
- "This is an overlay function to point-moving keys."
+(defun s-region-move-p1 (&rest arg)
+ "This is an overlay function to point-moving keys that are interactive \"p\"."
(interactive "p")
+ (apply (function s-region-move) arg))
+
+(defun s-region-move-p2 (&rest arg)
+ "This is an overlay function to point-moving keys that are interactive \"P\"."
+ (interactive "P")
+ (apply (function s-region-move) arg))
+
+(defun s-region-move (&rest arg)
(if (if mark-active (not (equal last-command 's-region-move)) t)
(set-mark-command nil)
(message "")) ; delete the "Mark set" message
+ (setq this-command 's-region-move)
(apply (key-binding (s-region-unshift (this-command-keys))) arg)
(move-overlay s-region-overlay (mark) (point) (current-buffer))
(sit-for 1)
(delete-overlay s-region-overlay))
(defun s-region-bind (keylist &optional map)
- "Bind keys in KEYLIST to `s-region-move'.
-Each key in KEYLIST is bound to `s-region-move'
-provided it is already bound to some command or other.
-Optional second argument MAP specifies keymap to
-add binding to, defaulting to global keymap."
- (or map (setq map global-map))
- (while keylist
- (if (commandp (key-binding (car keylist)))
- (define-key
- map
- (vector (intern (concat "S-" (symbol-name (aref (car keylist) 0)))))
- 's-region-move))
- (setq keylist (cdr keylist))))
-
+ "Bind shifted keys in KEYLIST to `s-region-move-p1' or `s-region-move-p2'.
+Each key in KEYLIST is shifted and bound to one of the `s-region-move'
+functions provided it is already bound to some command or other.
+Optional second argument MAP specifies keymap to add binding to, defaulting
+to global keymap."
+ (let ((p2 (list 'scroll-up 'scroll-down
+ 'beginning-of-buffer 'end-of-buffer)))
+ (or map (setq map global-map))
+ (while keylist
+ (let* ((key (car keylist))
+ (binding (key-binding key)))
+ (if (commandp binding)
+ (define-key
+ map
+ (vector (intern (concat "S-" (symbol-name (aref key 0)))))
+ (cond ((memq binding p2)
+ 's-region-move-p2)
+ (t 's-region-move-p1)))))
+ (setq keylist (cdr keylist)))))
+
+;; Single keys (plus modifiers) only!
(s-region-bind
(list [right] [left] [up] [down]
[C-left] [C-right] [C-up] [C-down]
(or (global-key-binding [C-insert])
(global-set-key [C-insert] 'copy-region-as-kill))
-(or (global-key-binding [C-delete])
+(or (global-key-binding [S-delete])
(global-set-key [S-delete] 'kill-region))
(or (global-key-binding [S-insert])
(global-set-key [S-insert] 'yank))
(provide 's-region)
-;; s-region.el ends here.
+;;; arch-tag: a471e912-18d7-4247-a29b-2100bca180ff
+;;; s-region.el ends here