mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 11:00:45 -08:00
Code Issues Projects Releases Wiki Activity

(cl-set-substring): Fix thinko.

Browse source 
(cl-hack-byte-compiler): Avoid infinite require loop.
This commit is contained in:
Stefan Monnier 2002-07-13 23:08:01 +00:00
parent 6e85ef5fd1
commit 87dd507f6a
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/emacs-lisp/cl.el
View file

@ -178,7 +178,7 @@ Keywords supported: :test :test-not :key"
(defun cl-set-substring (str start end val) (defun cl-set-substring (str start end val)
(if end (if (< end 0) (incf end (length str))) (if end (if (< end 0) (incf end (length str)))
(setq end (length str))) (setq end (length str)))
(if (< start 0) (incf start str)) (if (< start 0) (incf start (length str)))
(concat (and (> start 0) (substring str 0 start)) (concat (and (> start 0) (substring str 0 start))
val val
(and (< end (length str)) (substring str end)))) (and (< end (length str)) (substring str end))))
@ -676,8 +676,8 @@ Keywords supported: :test :test-not :key"
(defun cl-hack-byte-compiler () (defun cl-hack-byte-compiler ()
(if (and (not cl-hacked-flag) (fboundp 'byte-compile-file-form)) (if (and (not cl-hacked-flag) (fboundp 'byte-compile-file-form))
(progn (progn
(cl-compile-time-init) ; in cl-macs.el (setq cl-hacked-flag t) ; Do it first, to prevent recursion.
(setq cl-hacked-flag t)))) (cl-compile-time-init)))) ; In cl-macs.el.
;;; Try it now in case the compiler has already been loaded. ;;; Try it now in case the compiler has already been loaded.
(cl-hack-byte-compiler) (cl-hack-byte-compiler)