[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/cl.el

[Stefan Monnier]

Index: emacs/lisp/emacs-lisp/cl.el
diff -c emacs/lisp/emacs-lisp/cl.el:1.33 emacs/lisp/emacs-lisp/cl.el:1.34
*** emacs/lisp/emacs-lisp/cl.el:1.33    Fri Jul 12 13:41:00 2002
--- emacs/lisp/emacs-lisp/cl.el Sat Jul 13 19:08:01 2002
***************
*** 178,184 ****
  (defun cl-set-substring (str start end val)
    (if end (if (< end 0) (incf end (length str)))
      (setq end (length str)))
!   (if (< start 0) (incf start str))
    (concat (and (> start 0) (substring str 0 start))
          val
          (and (< end (length str)) (substring str end))))
--- 178,184 ----
  (defun cl-set-substring (str start end val)
    (if end (if (< end 0) (incf end (length str)))
      (setq end (length str)))
!   (if (< start 0) (incf start (length str)))
    (concat (and (> start 0) (substring str 0 start))
          val
          (and (< end (length str)) (substring str end))))
***************
*** 676,683 ****
  (defun cl-hack-byte-compiler ()
    (if (and (not cl-hacked-flag) (fboundp 'byte-compile-file-form))
        (progn
!       (cl-compile-time-init)   ; in cl-macs.el
!       (setq cl-hacked-flag t))))
  
  ;;; Try it now in case the compiler has already been loaded.
  (cl-hack-byte-compiler)
--- 676,683 ----
  (defun cl-hack-byte-compiler ()
    (if (and (not cl-hacked-flag) (fboundp 'byte-compile-file-form))
        (progn
!       (setq cl-hacked-flag t)         ; Do it first, to prevent recursion.
!       (cl-compile-time-init))))       ; In cl-macs.el.
  
  ;;; Try it now in case the compiler has already been loaded.
  (cl-hack-byte-compiler)