[Emacs-diffs] Changes to emacs/lisp/ediff-util.el,v

[Michael Kifer]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Michael Kifer <kifer>   07/11/02 06:03:12

Index: lisp/ediff-util.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-util.el,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- lisp/ediff-util.el  1 Nov 2007 03:18:41 -0000       1.77
+++ lisp/ediff-util.el  2 Nov 2007 06:03:11 -0000       1.78
@@ -3802,9 +3802,8 @@
       (let ((overlay (ediff-get-symbol-from-alist
                      type ediff-current-diff-overlay-alist))
            (buffer (ediff-get-buffer type))
-           (face (face-name
-                  (ediff-get-symbol-from-alist
-                   type ediff-current-diff-face-alist))))
+           (face (ediff-get-symbol-from-alist
+                   type ediff-current-diff-face-alist)))
        (set overlay
             (ediff-make-bullet-proof-overlay (point-max) (point-max) buffer))
        (ediff-set-overlay-face (symbol-value overlay) face)
@@ -4292,20 +4291,7 @@
       (add-to-history history-var newelt)
     (set history-var (cons newelt (symbol-value history-var)))))
 
-(if (fboundp 'copy-sequence)
-    (defalias 'ediff-copy-list 'copy-sequence)
-  (defun ediff-copy-list (list)
-    (if (consp list)
-      ;;;(let ((res nil))
-      ;;;  (while (consp list) (push (pop list) res))
-      ;;;  (prog1 (nreverse res) (setcdr res list)))
-       (let (res elt)
-         (while (consp list)
-           (setq elt (car list)
-                 res (cons elt res)
-                 list (cdr list)))
-         (nreverse res))
-      (car list))))
+(defalias 'ediff-copy-list 'copy-sequence)
 
 
 ;; don't report error if version control package wasn't found