comparison lisp/emacs-lisp/autoload.el @ 4068:5126824061ef

* 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.

4067:379b03502e48

    ;; `update-autoloads-here' won't be able to find the files to be
    ;; autoloaded.  So, if FILE is in the same directory or a
    ;; 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)))))

    (message "Generating autoloads for %s..." file)
    (save-excursion
      (unwind-protect
	  (progn

4068:5126824061ef

    ;; `update-autoloads-here' won't be able to find the files to be
    ;; autoloaded.  So, if FILE is in the same directory or a
    ;; subdirectory of the current buffer's directory, we'll make it
    ;; relative to the current buffer's directory.
    (setq file (expand-file-name file))
    (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
      (unwind-protect
	  (progn