*** /data/steve/bzr/emacs/trunk/lisp/subr.el	2010-10-13 14:41:39.000000000 +0200
--- /data/steve/bzr/emacs/quickfixes/lisp/subr.el	2010-10-13 20:34:46.000000000 +0200
***************
*** 290,299 ****
  If N is bigger than the length of LIST, return LIST."
    (if n
        (and (> n 0)
!            (let ((m (length list)))
               (if (< n m) (nthcdr (- m n) list) list)))
      (and list
!          (nthcdr (1- (length list)) list))))
  
  (defun butlast (list &optional n)
    "Return a copy of LIST with the last N elements removed."
--- 290,299 ----
  If N is bigger than the length of LIST, return LIST."
    (if n
        (and (> n 0)
!            (let ((m (safe-length list)))
               (if (< n m) (nthcdr (- m n) list) list)))
      (and list
!          (nthcdr (1- (safe-length list)) list))))
  
  (defun butlast (list &optional n)
    "Return a copy of LIST with the last N elements removed."