diff options
| author | Glenn Morris | 2011-05-11 13:32:38 -0400 |
|---|---|---|
| committer | Glenn Morris | 2011-05-11 13:32:38 -0400 |
| commit | 410c42c57059efda8f347751bcc6876893176595 (patch) | |
| tree | 17df032b36d571c9c4b10a6c17ed3a1436bca781 | |
| parent | f64049c6026b73896a97ae6d1c8e312b2e56a7e9 (diff) | |
| download | emacs-410c42c57059efda8f347751bcc6876893176595.tar.gz emacs-410c42c57059efda8f347751bcc6876893176595.zip | |
Revert accidental portion of previous bytecomp.el commit.
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index e8d8993044c..02b886cdda0 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el | |||
| @@ -1321,8 +1321,7 @@ extra args." | |||
| 1321 | ;; Assumes an element of b-c-i-macro-env that is a symbol points | 1321 | ;; Assumes an element of b-c-i-macro-env that is a symbol points |
| 1322 | ;; to a defined function. (Bug#8646) | 1322 | ;; to a defined function. (Bug#8646) |
| 1323 | (and initial (symbolp initial) | 1323 | (and initial (symbolp initial) |
| 1324 | (setq old (byte-compile-fdefinition initial nil) | 1324 | (setq old (byte-compile-fdefinition initial nil))) |
| 1325 | initial 'yes)) | ||
| 1326 | (if (and old (not (eq old t))) | 1325 | (if (and old (not (eq old t))) |
| 1327 | (progn | 1326 | (progn |
| 1328 | (and (eq 'macro (car-safe old)) | 1327 | (and (eq 'macro (car-safe old)) |