X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/eeff0f485929b225f9b302e5957a654f4a367305..d2301b5d805d603547b36d96e3a09e6d8124a6d7:/lisp/obsolete/lucid.el

diff --git a/lisp/obsolete/lucid.el b/lisp/obsolete/lucid.el
index 85edd310a9..15f8065280 100644
--- a/lisp/obsolete/lucid.el
+++ b/lisp/obsolete/lucid.el
@@ -1,9 +1,8 @@
 ;;; lucid.el --- emulate some Lucid Emacs functions
 
-;; Copyright (C) 1993, 1995, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 2001-2014 Free Software Foundation, Inc.
 
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: emulations
 ;; Obsolete-since: 23.2
 
@@ -89,8 +88,8 @@ This function exists for compatibility with XEmacs."
    ((display-grayscale-p device) 'grayscale)
    (t 'mono)))
 
-(defalias 'find-face 'internal-find-face)
-(defalias 'get-face 'internal-get-face)
+(defalias 'find-face 'facep)
+(defalias 'get-face 'facep)
 ;; internal-try-face-font was removed from faces.el in rev 1.139, 1999/07/21.
 ;;;(defalias 'try-face-font 'internal-try-face-font)
 
@@ -126,7 +125,7 @@ This is an XEmacs compatibility function."
 
 (defun extent-at (pos &optional object property before)
   (with-current-buffer (or object (current-buffer))
-    (let ((overlays (overlays-at pos)))
+    (let ((overlays (overlays-at pos 'sorted)))
       (when property
 	(let (filtered)
 	  (while overlays
@@ -134,14 +133,6 @@ This is an XEmacs compatibility function."
 		(setq filtered (cons (car overlays) filtered)))
 	    (setq overlays (cdr overlays)))
 	  (setq overlays filtered)))
-      (setq overlays
-	    (sort overlays
-		  (function (lambda (o1 o2)
-			      (let ((p1 (or (overlay-get o1 'priority) 0))
-				    (p2 (or (overlay-get o2 'priority) 0)))
-				(or (> p1 p2)
-				    (and (= p1 p2)
-					 (> (overlay-start o1) (overlay-start o2)))))))))
       (if before
 	  (nth 1 (memq before overlays))
 	(car overlays)))))
@@ -234,5 +225,8 @@ This is an XEmacs compatibility function."
 
 (provide 'lucid)
 
-;; arch-tag: 80f9ab46-0b36-4151-86ed-3edb6d449c9e
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions)
+;; End:
+
 ;;; lucid.el ends here