# HG changeset patch # User Juri Linkov # Date 1269048552 -7200 # Node ID 0a2bb00a71bde0a2d52d280d0d2a668b9d91bb67 # Parent ba737243d8d249de11c43656028228be2a5d7d62 * s-region.el: Move to obsolete. diff -r ba737243d8d2 -r 0a2bb00a71bd etc/NEWS --- a/etc/NEWS Fri Mar 19 18:03:39 2010 -0700 +++ b/etc/NEWS Sat Mar 20 03:29:12 2010 +0200 @@ -78,6 +78,9 @@ .dir-locals.el file, will turn on `whitespace-mode' for *vc-diff* buffers. +** s-region.el is now declared obsolete, superceded by shift-select-mode +enabled by default in 23.1. + * New Modes and Packages in Emacs 24.1 diff -r ba737243d8d2 -r 0a2bb00a71bd lisp/ChangeLog --- a/lisp/ChangeLog Fri Mar 19 18:03:39 2010 -0700 +++ b/lisp/ChangeLog Sat Mar 20 03:29:12 2010 +0200 @@ -1,3 +1,8 @@ +2010-03-20 Juri Linkov + + * s-region.el: + * obsolete/s-region.el: Move to obsolete. + 2010-03-19 Juanma Barranquero * vc-dispatcher.el (vc-do-command): Remove reference to `vc-path'. diff -r ba737243d8d2 -r 0a2bb00a71bd lisp/Makefile.in --- a/lisp/Makefile.in Fri Mar 19 18:03:39 2010 -0700 +++ b/lisp/Makefile.in Sat Mar 20 03:29:12 2010 +0200 @@ -1091,6 +1091,7 @@ $(lisp)/obsolete/rnewspost.elc \ $(lisp)/obsolete/sc.elc \ $(lisp)/obsolete/scribe.elc \ + $(lisp)/obsolete/s-region.elc \ $(lisp)/obsolete/swedish.elc \ $(lisp)/obsolete/sym-comp.elc \ $(lisp)/obsolete/vc-mcvs.elc \ @@ -1294,7 +1295,6 @@ $(lisp)/rfn-eshadow.elc \ $(lisp)/rot13.elc \ $(lisp)/ruler-mode.elc \ - $(lisp)/s-region.elc \ $(lisp)/savehist.elc \ $(lisp)/saveplace.elc \ $(lisp)/sb-image.elc \ diff -r ba737243d8d2 -r 0a2bb00a71bd lisp/obsolete/s-region.el --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lisp/obsolete/s-region.el Sat Mar 20 03:29:12 2010 +0200 @@ -0,0 +1,125 @@ +;;; s-region.el --- set region using shift key + +;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, +;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + +;; Author: Morten Welinder +;; Keywords: terminals +;; Favourite-brand-of-beer: None, I hate beer. +;; Obsolete-since: 24.1 + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; 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 +;; 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") +;; functions. + +;; If the following keys are not already bound then... +;; C-insert is bound to copy-region-as-kill +;; S-delete is bound to kill-region +;; S-insert is bound to yank + +;;; Code: + +(defvar s-region-overlay (make-overlay 1 1)) +(overlay-put s-region-overlay 'face 'region) +(overlay-put s-region-overlay 'priority 1000000) ; for hilit19 + +(defun s-region-unshift (key) + "Remove shift modifier from last keypress KEY and return that as a key." + (if (vectorp key) + (let ((last (aref key (1- (length key))))) + (if (symbolp last) + (let* ((keyname (symbol-name last)) + (pos (string-match "S-" keyname))) + (if pos + ;; We skip all initial parts of the event assuming that + ;; those are setting up the prefix argument to the command. + (vector (intern (concat (substring keyname 0 pos) + (substring keyname (+ 2 pos))))) + (error "Non-shifted key: %S" key))) + (error "Key does not end in a symbol: %S" key))) + (error "Non-vector key: %S" key))) + +(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 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] + [M-left] [M-right] [M-up] [M-down] + [next] [previous] [home] [end] + [C-next] [C-previous] [C-home] [C-end] + [M-next] [M-previous] [M-home] [M-end])) + +(or (global-key-binding [C-insert]) + (global-set-key [C-insert] 'copy-region-as-kill)) +(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) + +;; arch-tag: a471e912-18d7-4247-a29b-2100bca180ff +;;; s-region.el ends here diff -r ba737243d8d2 -r 0a2bb00a71bd lisp/s-region.el --- a/lisp/s-region.el Fri Mar 19 18:03:39 2010 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,124 +0,0 @@ -;;; s-region.el --- set region using shift key - -;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. - -;; Author: Morten Welinder -;; Keywords: terminals -;; Favourite-brand-of-beer: None, I hate beer. - -;; This file is part of GNU Emacs. - -;; GNU Emacs is free software: you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see . - -;;; 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 -;; 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") -;; functions. - -;; If the following keys are not already bound then... -;; C-insert is bound to copy-region-as-kill -;; S-delete is bound to kill-region -;; S-insert is bound to yank - -;;; Code: - -(defvar s-region-overlay (make-overlay 1 1)) -(overlay-put s-region-overlay 'face 'region) -(overlay-put s-region-overlay 'priority 1000000) ; for hilit19 - -(defun s-region-unshift (key) - "Remove shift modifier from last keypress KEY and return that as a key." - (if (vectorp key) - (let ((last (aref key (1- (length key))))) - (if (symbolp last) - (let* ((keyname (symbol-name last)) - (pos (string-match "S-" keyname))) - (if pos - ;; We skip all initial parts of the event assuming that - ;; those are setting up the prefix argument to the command. - (vector (intern (concat (substring keyname 0 pos) - (substring keyname (+ 2 pos))))) - (error "Non-shifted key: %S" key))) - (error "Key does not end in a symbol: %S" key))) - (error "Non-vector key: %S" key))) - -(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 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] - [M-left] [M-right] [M-up] [M-down] - [next] [previous] [home] [end] - [C-next] [C-previous] [C-home] [C-end] - [M-next] [M-previous] [M-home] [M-end])) - -(or (global-key-binding [C-insert]) - (global-set-key [C-insert] 'copy-region-as-kill)) -(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) - -;; arch-tag: a471e912-18d7-4247-a29b-2100bca180ff -;;; s-region.el ends here