diff options
| author | Stefan Monnier | 2002-07-13 23:08:01 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2002-07-13 23:08:01 +0000 |
| commit | 87dd507f6a8582628311c8b3ea1e114e3c8bb78d (patch) | |
| tree | 63e94a5213e40cd339f6a0e5dbe38008a6aaecef | |
| parent | 6e85ef5fd113cd98b6b58a8eb7e614dc18c50ac4 (diff) | |
| download | emacs-87dd507f6a8582628311c8b3ea1e114e3c8bb78d.tar.gz emacs-87dd507f6a8582628311c8b3ea1e114e3c8bb78d.zip | |
(cl-set-substring): Fix thinko.
(cl-hack-byte-compiler): Avoid infinite require loop.
| -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 6242096df88..74cfc241df1 100644 --- a/lisp/emacs-lisp/cl.el +++ b/lisp/emacs-lisp/cl.el | |||
| @@ -178,7 +178,7 @@ Keywords supported: :test :test-not :key" | |||
| 178 | (defun cl-set-substring (str start end val) | 178 | (defun cl-set-substring (str start end val) |
| 179 | (if end (if (< end 0) (incf end (length str))) | 179 | (if end (if (< end 0) (incf end (length str))) |
| 180 | (setq end (length str))) | 180 | (setq end (length str))) |
| 181 | (if (< start 0) (incf start str)) | 181 | (if (< start 0) (incf start (length str))) |
| 182 | (concat (and (> start 0) (substring str 0 start)) | 182 | (concat (and (> start 0) (substring str 0 start)) |
| 183 | val | 183 | val |
| 184 | (and (< end (length str)) (substring str end)))) | 184 | (and (< end (length str)) (substring str end)))) |
| @@ -676,8 +676,8 @@ Keywords supported: :test :test-not :key" | |||
| 676 | (defun cl-hack-byte-compiler () | 676 | (defun cl-hack-byte-compiler () |
| 677 | (if (and (not cl-hacked-flag) (fboundp 'byte-compile-file-form)) | 677 | (if (and (not cl-hacked-flag) (fboundp 'byte-compile-file-form)) |
| 678 | (progn | 678 | (progn |
| 679 | (cl-compile-time-init) ; in cl-macs.el | 679 | (setq cl-hacked-flag t) ; Do it first, to prevent recursion. |
| 680 | (setq cl-hacked-flag t)))) | 680 | (cl-compile-time-init)))) ; In cl-macs.el. |
| 681 | 681 | ||
| 682 | ;;; Try it now in case the compiler has already been loaded. | 682 | ;;; Try it now in case the compiler has already been loaded. |
| 683 | (cl-hack-byte-compiler) | 683 | (cl-hack-byte-compiler) |