diff lisp/emacs-lisp/lucid.el @ 88155:d7ddb3e565de

sync with trunk

--- a/lisp/emacs-lisp/lucid.el	Sun Jan 15 23:02:10 2006 +0000
+++ b/lisp/emacs-lisp/lucid.el	Mon Jan 16 00:03:54 2006 +0000
@@ -1,6 +1,7 @@
 ;;; lucid.el --- emulate some Lucid Emacs functions
 
-;; Copyright (C) 1993, 1995, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: emulations
@@ -19,8 +20,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:
 
@@ -31,33 +32,6 @@
 
 (defalias 'current-time-seconds 'current-time)
 
-(defun map-keymap (function keymap &optional sort-first)
-  "Call FUNCTION for every binding in KEYMAP.
-This does not include bindings inherited from a parent keymap.
-FUNCTION receives two arguments each time it is called:
-the character (more generally, the event type) that is bound,
-and the binding it has.
-
-Note that passing the event type directly to `define-key' does not work
-in Emacs 19.  We do not emulate that particular feature of Lucid Emacs.
-If your code does that, modify it to make a vector containing the event
-type that you get.  That will work in both versions of Emacs."
-  (if sort-first
-      (let (list)
-	(cl-map-keymap (lambda (a b) (push (cons a b) list))
-		       keymap)
-	(setq list (sort list
-			 (lambda (a b)
-			   (setq a (car a) b (car b))
-			   (if (integerp a)
-			       (if (integerp b) (< a b)
-				 t)
-			     (if (integerp b) t
-			       (string< a b))))))
-	(dolist (p list)
-	  (funcall function (car p) (cdr p))))
-    (cl-map-keymap function keymap)))
-
 (defun read-number (prompt &optional integers-only)
   "Read a number from the minibuffer.
 Keep reentering the minibuffer until we get suitable input.
@@ -127,7 +101,7 @@
 
 (defun buffer-syntactic-context (&optional buffer)
   "Syntactic context at point in BUFFER.
-Either of `string', `comment' or `nil'.
+Either of `string', `comment' or nil.
 This is an XEmacs compatibility function."
   (with-current-buffer (or buffer (current-buffer))
     (let ((state (syntax-ppss (point))))
@@ -260,4 +234,5 @@
 
 (provide 'lucid)
 
+;;; arch-tag: 80f9ab46-0b36-4151-86ed-3edb6d449c9e
 ;;; lucid.el ends here