Merged in changes from CVS trunk. Plus added lisp/term tweaks.

[gnu-emacs] / lisp / emulation / keypad.el

diff --git a/lisp/emulation/keypad.el b/lisp/emulation/keypad.el
index 7a9b4fc8362f8c9c64615b75eb10d63244cf12db..a42edaa78a11034d621c8042e0db98ea047bd1ee 100644 (file)
--- a/lisp/emulation/keypad.el
+++ b/lisp/emulation/keypad.el
@@ -1,6 +1,6 @@
 ;;; keypad.el --- simplified keypad bindings
 
-;; Copyright (C) 2002  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard convenience
@@ -19,8 +19,8 @@
 
 ;; 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, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -108,16 +108,17 @@ decimal key must be specified."
             (keypad-setup value nil nil value)))
   :initialize 'custom-initialize-default
   :link '(emacs-commentary-link "keypad.el")
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const :tag "Plain numeric keypad" numeric)
                 (character :tag "Numeric Keypad with Decimal Key"
                            :match (lambda (widget value) (integerp value))
                            :value ?.)
-                (const :tag "Numeric prefix arguments" prefix) 
+                (const :tag "Numeric prefix arguments" prefix)
                 (const :tag "Cursor keys" cursor)
                 (const :tag "Shifted cursor keys" S-cursor)
-                (const :tag "Remove bindings" none)
+                (const :tag "Unspecified/User-defined" none)
                 (other :tag "Keep existing bindings" nil))
+  :require 'keypad
   :group 'keyboard)
 
 ;;;###autoload
@@ -130,16 +131,17 @@ decimal key must be specified."
             (keypad-setup value t nil value)))
   :initialize 'custom-initialize-default
   :link '(emacs-commentary-link "keypad.el")
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const :tag "Plain numeric keypad" numeric)
                 (character :tag "Numeric Keypad with Decimal Key"
                            :match (lambda (widget value) (integerp value))
                            :value ?.)
-                (const :tag "Numeric prefix arguments" prefix) 
+                (const :tag "Numeric prefix arguments" prefix)
                 (const :tag "Cursor keys" cursor)
                 (const :tag "Shifted cursor keys" S-cursor)
-                (const :tag "Remove bindings" none)
+                (const :tag "Unspecified/User-defined" none)
                 (other :tag "Keep existing bindings" nil))
+  :require 'keypad
   :group 'keyboard)
 
 ;;;###autoload
@@ -152,16 +154,17 @@ decimal key must be specified."
             (keypad-setup value nil t value)))
   :initialize 'custom-initialize-default
   :link '(emacs-commentary-link "keypad.el")
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const :tag "Plain numeric keypad" numeric)
                 (character :tag "Numeric Keypad with Decimal Key"
                            :match (lambda (widget value) (integerp value))
                            :value ?.)
-                (const :tag "Numeric prefix arguments" prefix) 
+                (const :tag "Numeric prefix arguments" prefix)
                 (const :tag "Cursor keys" cursor)
                 (const :tag "Shifted cursor keys" S-cursor)
-                (const :tag "Remove bindings" none)
+                (const :tag "Unspecified/User-defined" none)
                 (other :tag "Keep existing bindings" nil))
+  :require 'keypad
   :group 'keyboard)
 
 ;;;###autoload
@@ -174,16 +177,17 @@ decimal key must be specified."
             (keypad-setup value t t value)))
   :initialize 'custom-initialize-default
   :link '(emacs-commentary-link "keypad.el")
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const :tag "Plain numeric keypad" numeric)
                 (character :tag "Numeric Keypad with Decimal Key"
                            :match (lambda (widget value) (integerp value))
                            :value ?.)
-                (const :tag "Numeric prefix arguments" prefix) 
+                (const :tag "Numeric prefix arguments" prefix)
                 (const :tag "Cursor keys" cursor)
                 (const :tag "Shifted cursor keys" S-cursor)
-                (const :tag "Remove bindings" none)
+                (const :tag "Unspecified/User-defined" none)
                 (other :tag "Keep existing bindings" nil))
+  :require 'keypad
   :group 'keyboard)
 
 
@@ -201,7 +205,9 @@ keys are bound.
  'S-cursor Bind shifted keypad keys to the shifted cursor movement keys.
  'cursor   Bind keypad keys to the cursor movement keys.
  'numeric  Plain numeric keypad, i.e. 0 .. 9 and .  (or DECIMAL arg)
- 'none     Removes all bindings for keypad keys in function-key-map.
+ 'none     Removes all bindings for keypad keys in function-key-map;
+           this enables any user-defined bindings for the keypad keys
+           in the global and local keymaps.
 
 If SETUP is 'numeric and the optional fourth argument DECIMAL is non-nil,
 the decimal key on the keypad is mapped to DECIMAL instead of `.'"
@@ -238,7 +244,7 @@ the decimal key on the keypad is mapped to DECIMAL instead of `.'"
            [delete insert end down next left
                    space right home up prior])
           ((eq setup 'S-cursor)
-           [S-delete S-insert S-end S-down S-next S-left 
+           [S-delete S-insert S-end S-down S-next S-left
                      S-space S-right S-home S-up S-prior])
           ((eq setup 'none)
            nil)
@@ -262,7 +268,8 @@ the decimal key on the keypad is mapped to DECIMAL instead of `.'"
                ((eq (aref kp i) 'S-kp-space)
                 (define-key function-key-map [S-kp-begin]
                   (if bind (vector (aref bind i)))))))
-                
+
       (setq i (1+ i)))))
 
+;;; arch-tag: 0899d2bd-9e12-4b4e-9aef-d0014d3b6414
 ;;; keypad.el ends here