diff options
| author | Stefan Monnier <[email protected]> | 2002-07-13 23:08:01 +0000 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2002-07-13 23:08:01 +0000 |
| commit | 87dd507f6a8582628311c8b3ea1e114e3c8bb78d (patch) | |
| tree | 63e94a5213e40cd339f6a0e5dbe38008a6aaecef /lisp | |
| parent | 6e85ef5fd113cd98b6b58a8eb7e614dc18c50ac4 (diff) | |
(cl-set-substring): Fix thinko.
(cl-hack-byte-compiler): Avoid infinite require loop.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/emacs-lisp/cl.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el index 6242096df8..74cfc241df 100644 --- a/lisp/emacs-lisp/cl.el +++ b/lisp/emacs-lisp/cl.el @@ -178,7 +178,7 @@ Keywords supported: :test :test-not :key" (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)) + (if (< start 0) (incf start (length str))) (concat (and (> start 0) (substring str 0 start)) val (and (< end (length str)) (substring str end)))) @@ -676,8 +676,8 @@ Keywords supported: :test :test-not :key" (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)))) + (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) |