* autoload.el (generate-file-autoloads): Correctly detect when the

	buffer receiving the autoload forms is in a parent of or the same
	directory as FILE, even in the presence of symlinks.

diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 940bc118e468b6534f117355e5185b601a3d18b2..10f614f48c1d76d520721f29176493098193d81e 100644 (file)
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -122,11 +122,13 @@ are used."
     ;; subdirectory of the current buffer's directory, we'll make it
     ;; relative to the current buffer's directory.
     (setq file (expand-file-name file))
-    (if (and (< (length default-directory) (length file))
-            (string= default-directory
-                     (substring file 0 (length default-directory))))
-       (progn
-         (setq file (substring file (length default-directory)))))
+    (let ((source-truename (file-truename file))
+         (dir-truename (file-name-as-directory
+                        (file-truename default-directory))))
+      (if (and (< (length dir-truename) (length source-truename))
+              (string= dir-truename
+                       (substring source-truename 0 (length dir-truename))))
+         (setq file (substring file (length dir-truename)))))
 
     (message "Generating autoloads for %s..." file)
     (save-excursion