diff options
| author | Stefan Monnier | 2001-05-27 11:02:02 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2001-05-27 11:02:02 +0000 |
| commit | b291c86c45313cb42c6fd698409f9d17cc457408 (patch) | |
| tree | e0e10ed6f84abb0bc6ee1661ffa8529cc94ad079 | |
| parent | 71261a01d39bff61ec7de6b85c621452a9d094b4 (diff) | |
| download | emacs-b291c86c45313cb42c6fd698409f9d17cc457408.tar.gz emacs-b291c86c45313cb42c6fd698409f9d17cc457408.zip | |
(byte-compile-inline-expand): Undo last change.
| -rw-r--r-- | lisp/ChangeLog | 18 | ||||
| -rw-r--r-- | lisp/emacs-lisp/byte-opt.el | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 11cbd4f8ed7..cd1bab844a5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2001-05-27 Stefan Monnier <monnier@cs.yale.edu> | ||
| 2 | |||
| 3 | * emacs-lisp/byte-opt.el (byte-compile-inline-expand): Undo last change. | ||
| 4 | |||
| 1 | 2001-05-27 Eli Zaretskii <eliz@is.elta.co.il> | 5 | 2001-05-27 Eli Zaretskii <eliz@is.elta.co.il> |
| 2 | 6 | ||
| 3 | * cus-edit.el (custom-file): Don't assume we were invoked with -q | 7 | * cus-edit.el (custom-file): Don't assume we were invoked with -q |
| @@ -15338,8 +15342,8 @@ | |||
| 15338 | 15342 | ||
| 15339 | 2000-04-10 Gerd Moellmann <gerd@gnu.org> | 15343 | 2000-04-10 Gerd Moellmann <gerd@gnu.org> |
| 15340 | 15344 | ||
| 15341 | * progmodes/ebrowse.el (ebrowse-tree-mode): Use | 15345 | * progmodes/ebrowse.el (ebrowse-tree-mode): |
| 15342 | propertized-buffer-identification. | 15346 | Use propertized-buffer-identification. |
| 15343 | (ebrowse-update-member-buffer-mode-line): Likewise. | 15347 | (ebrowse-update-member-buffer-mode-line): Likewise. |
| 15344 | (ebrowse--mode-strings): Removed. | 15348 | (ebrowse--mode-strings): Removed. |
| 15345 | (ebrowse--mode-line-props): Removed. | 15349 | (ebrowse--mode-line-props): Removed. |
| @@ -15366,14 +15370,12 @@ | |||
| 15366 | 15370 | ||
| 15367 | 2000-04-09 Dave Love <fx@gnu.org> | 15371 | 2000-04-09 Dave Love <fx@gnu.org> |
| 15368 | 15372 | ||
| 15369 | * files.el (backup-enable-predicate): Use | 15373 | * files.el (backup-enable-predicate): |
| 15370 | temporary-file-directory, small-temporary-file-directory. | 15374 | Use temporary-file-directory, small-temporary-file-directory. |
| 15371 | (make-backup-file-name-function, backup-directory-alist): New | 15375 | (make-backup-file-name-function, backup-directory-alist): New vars. |
| 15372 | variables. | ||
| 15373 | (make-backup-file-name-1): New function. | 15376 | (make-backup-file-name-1): New function. |
| 15374 | (make-backup-file-name): Use it. | 15377 | (make-backup-file-name): Use it. |
| 15375 | (find-backup-file-name): Likewise. Use format for clarity, not | 15378 | (find-backup-file-name): Likewise. Use format for clarity, not concat. |
| 15376 | concat. | ||
| 15377 | (file-newest-backup): Use make-backup-file-name. | 15379 | (file-newest-backup): Use make-backup-file-name. |
| 15378 | 15380 | ||
| 15379 | 2000-04-09 Gerd Moellmann <gerd@gnu.org> | 15381 | 2000-04-09 Gerd Moellmann <gerd@gnu.org> |
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 95c9e714372..5c713b13449 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el | |||
| @@ -265,7 +265,7 @@ | |||
| 265 | form) | 265 | form) |
| 266 | ;; else | 266 | ;; else |
| 267 | (when (and (consp fn) (eq (car fn) 'autoload)) | 267 | (when (and (consp fn) (eq (car fn) 'autoload)) |
| 268 | (load (nth 1 fn)) | 268 | (load (nth 2 fn)) |
| 269 | (setq fn (or (and (fboundp name) (symbol-function name)) | 269 | (setq fn (or (and (fboundp name) (symbol-function name)) |
| 270 | (cdr (assq name byte-compile-function-environment))))) | 270 | (cdr (assq name byte-compile-function-environment))))) |
| 271 | (if (and (consp fn) (eq (car fn) 'autoload)) | 271 | (if (and (consp fn) (eq (car fn) 'autoload)) |