[Emacs-diffs] Changes to emacs/lisp/pcvs-util.el [lexbind]

[Miles Bader]

Index: emacs/lisp/pcvs-util.el
diff -c emacs/lisp/pcvs-util.el:1.17.4.2 emacs/lisp/pcvs-util.el:1.17.4.3
*** emacs/lisp/pcvs-util.el:1.17.4.2    Tue Oct 14 23:51:20 2003
--- emacs/lisp/pcvs-util.el     Tue Jul  6 09:31:49 2004
***************
*** 1,6 ****
  ;;; pcvs-util.el --- utility functions for PCL-CVS  -*- byte-compile-dynamic: 
t -*-
  
! ;; Copyright (C) 1991,92,93,94,95,96,97,98,99,2000, 2001
  ;;  Free Software Foundation, Inc.
  
  ;; Author: Stefan Monnier <address@hidden>
--- 1,6 ----
  ;;; pcvs-util.el --- utility functions for PCL-CVS  -*- byte-compile-dynamic: 
t -*-
  
! ;; Copyright (C) 1991,92,93,94,95,96,97,98,99, 2000,01,04
  ;;  Free Software Foundation, Inc.
  
  ;; Author: Stefan Monnier <address@hidden>
***************
*** 50,56 ****
      (dolist (x xs zs)
        (unless (member x ys) (push x zs)))))
  
- 
  (defun cvs-map (-cvs-map-f &rest -cvs-map-ls)
    (unless (cvs-every 'null -cvs-map-ls)
      (cons (apply -cvs-map-f (mapcar 'car -cvs-map-ls))
--- 50,55 ----
***************
*** 77,98 ****
        (if (funcall p x) (push x car) (push x cdr)))
      (cons (nreverse car) (nreverse cdr))))
  
- ;; Copied from CL ;-(
- 
- (defun cvs-butlast (x &optional n)
-   "Returns a copy of LIST with the last N elements removed."
-   (if (and n (<= n 0)) x
-     (cvs-nbutlast (copy-sequence x) n)))
- 
- (defun cvs-nbutlast (x &optional n)
-   "Modifies LIST to remove the last N elements."
-   (let ((m (length x)))
-     (or n (setq n 1))
-     (and (< n m)
-        (progn
-          (if (> n 0) (setcdr (nthcdr (- (1- m) n) x) nil))
-          x))))
- 
  ;;;
  ;;; frame, window, buffer handling
  ;;;
--- 76,81 ----