diff options
| author | Eli Zaretskii | 2011-11-23 20:39:38 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2011-11-23 20:39:38 +0200 |
| commit | 283430a1dfecdb309bd6b5bfee0c996648e3bf6a (patch) | |
| tree | a9f800c404bd82a9600f885f90c6adea02a29b88 | |
| parent | 1c3d7a1396e694454be8f6fc1506e744b037230c (diff) | |
| download | emacs-283430a1dfecdb309bd6b5bfee0c996648e3bf6a.tar.gz emacs-283430a1dfecdb309bd6b5bfee0c996648e3bf6a.zip | |
Fix "make autoloads" on MS-Windows.
lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads): On
MS-DOS and MS-Windows, compare with loaddefs.el case-insensitively.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/emacs-lisp/autoload.el | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 896d08ea163..499eaea9cb6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-11-23 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * emacs-lisp/autoload.el (autoload-generate-file-autoloads): On | ||
| 4 | MS-DOS and MS-Windows, compare with loaddefs.el | ||
| 5 | case-insensitively. | ||
| 6 | |||
| 1 | 2011-11-23 Mark Lillibridge <mark.lillibridge@hp.com> (tiny change) | 7 | 2011-11-23 Mark Lillibridge <mark.lillibridge@hp.com> (tiny change) |
| 2 | 8 | ||
| 3 | * mail/unrmail.el (unrmail): Always add blank line. (Bug#7743) | 9 | * mail/unrmail.el (unrmail): Always add blank line. (Bug#7743) |
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index df98271832a..19a4d44273d 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el | |||
| @@ -446,7 +446,11 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE | |||
| 446 | generated-autoload-load-name | 446 | generated-autoload-load-name |
| 447 | (autoload-file-load-name absfile))) | 447 | (autoload-file-load-name absfile))) |
| 448 | (when (and outfile | 448 | (when (and outfile |
| 449 | (not (equal outfile (autoload-generated-file)))) | 449 | (not |
| 450 | (if (memq system-type '(ms-dos windows-nt)) | ||
| 451 | (equal (downcase outfile) | ||
| 452 | (downcase (autoload-generated-file))) | ||
| 453 | (equal outfile (autoload-generated-file))))) | ||
| 450 | (setq otherbuf t)) | 454 | (setq otherbuf t)) |
| 451 | (save-excursion | 455 | (save-excursion |
| 452 | (save-restriction | 456 | (save-restriction |