(lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.

[gnu-emacs] / lisp / emacs-lisp / cl-extra.el

diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index 1784d65a9b65560ef4af09b8917e484d913b7af0..194f6c6d9b48cc59a7d792b953ec73fd58c3c96d 100644 (file)
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -1,6 +1,6 @@
 ;;; cl-extra.el --- Common Lisp features, part 2 -*-byte-compile-dynamic: t;-*-
 
-;; Copyright (C) 1993 Free Software Foundation, Inc.
+;; Copyright (C) 1993,2000  Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Keywords: extensions
@@ -217,7 +217,7 @@ If so, return the true (non-nil) value returned by PREDICATE."
        (while (consp (setq cl-p (cdr cl-p)))
          (cond ((consp (car cl-p))
                 (funcall cl-func (car (car cl-p)) (cdr (car cl-p))))
-               ((vectorp (car cl-p))
+               ((or (vectorp (car cl-p)) (char-table-p (car cl-p)))
                 (cl-map-keymap cl-func (car cl-p)))
                ((eq (car cl-p) 'keymap)
                 (setq cl-p nil)))))
@@ -668,6 +668,13 @@ The Common Lisp keywords :rehash-size and :rehash-threshold are ignored."
                         (t (assoc* key sym :test test))))
          sym str)))
 
+;; These variables are just kept for compatibility with code
+;; byte-compiled by Emacs-20.
+(defvar cl-builtin-gethash (symbol-function 'gethash))
+(defvar cl-builtin-remhash (symbol-function 'remhash))
+(defvar cl-builtin-clrhash (symbol-function 'clrhash))
+(defvar cl-builtin-maphash (symbol-function 'maphash))
+
 (defun cl-gethash (key table &optional def)
   "Look up KEY in HASH-TABLE; return corresponding value, or DEFAULT."
   (if (consp table)