diff options
| author | Stefan Monnier | 2017-12-04 13:43:23 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2017-12-04 13:43:23 -0500 |
| commit | f55293159f0a7d9fb08dafe7e0dcd8b4354dbd0d (patch) | |
| tree | 70b0a532d825ec25364ba8247510e4ba63c170dc | |
| parent | 42ba2a2e1f212eca2b0bb2b04c65d100da34e171 (diff) | |
| download | emacs-f55293159f0a7d9fb08dafe7e0dcd8b4354dbd0d.tar.gz emacs-f55293159f0a7d9fb08dafe7e0dcd8b4354dbd0d.zip | |
* lisp/emacs-lisp/elint.el (elint-init-form): Remove outdated CL hack
| -rw-r--r-- | lisp/emacs-lisp/elint.el | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el index 8d10a162b09..643d7160dbb 100644 --- a/lisp/emacs-lisp/elint.el +++ b/lisp/emacs-lisp/elint.el | |||
| @@ -463,21 +463,9 @@ Return nil if there are no more forms, t otherwise." | |||
| 463 | ;; Import variable definitions | 463 | ;; Import variable definitions |
| 464 | ((memq (car form) '(require cc-require cc-require-when-compile)) | 464 | ((memq (car form) '(require cc-require cc-require-when-compile)) |
| 465 | (let ((name (eval (cadr form))) | 465 | (let ((name (eval (cadr form))) |
| 466 | (file (eval (nth 2 form))) | 466 | (file (eval (nth 2 form)))) |
| 467 | (elint-doing-cl (bound-and-true-p elint-doing-cl))) | ||
| 468 | (unless (memq name elint-features) | 467 | (unless (memq name elint-features) |
| 469 | (add-to-list 'elint-features name) | 468 | (add-to-list 'elint-features name) |
| 470 | ;; cl loads cl-macs in an opaque manner. | ||
| 471 | ;; Since cl-macs requires cl, we can just process cl-macs. | ||
| 472 | ;; FIXME: AFAIK, `cl' now behaves properly and does not need any | ||
| 473 | ;; special treatment any more. Can someone who understands this | ||
| 474 | ;; code confirm? --Stef | ||
| 475 | (and (eq name 'cl) (not elint-doing-cl) | ||
| 476 | ;; We need cl if elint-form is to be able to expand cl macros. | ||
| 477 | (require 'cl) | ||
| 478 | (setq name 'cl-macs | ||
| 479 | file nil | ||
| 480 | elint-doing-cl t)) ; blech | ||
| 481 | (setq elint-env (elint-add-required-env elint-env name file)))))) | 469 | (setq elint-env (elint-add-required-env elint-env name file)))))) |
| 482 | elint-env) | 470 | elint-env) |
| 483 | 471 | ||