# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 768768897 0
# Node ID a01cc9d6398df54dd72550cf0e90ab7295f4013d
# Parent  d1cbb5dd343462c0982d717a94354846ee633674
(autoload-trim-file-name): Make it relative
to the directory that loaddefs.el is in.

diff -r d1cbb5dd3434 -r a01cc9d6398d lisp/emacs-lisp/autoload.el
--- a/lisp/emacs-lisp/autoload.el	Thu May 12 18:27:17 1994 +0000
+++ b/lisp/emacs-lisp/autoload.el	Thu May 12 18:54:57 1994 +0000
@@ -96,12 +96,14 @@
 (put 'defmacro 'doc-string-elt 3)
 
 (defun autoload-trim-file-name (file)
-  ;; Returns a relative pathname of FILE including the last directory.
+  ;; Returns a relative pathname of FILE
+  ;; starting from the directory that loaddefs.el is in.
+  ;; That is normally a directory in load-path,
+  ;; which means Emacs will be able to find FILE when it looks.
+  ;; Any extra directory names here would prevent finding the file.
   (setq file (expand-file-name file))
   (file-relative-name file
- 		      (file-name-directory
- 		       (directory-file-name
- 			(file-name-directory file)))))
+		      (file-name-directory generated-autoload-file)))
 
 (defun generate-file-autoloads (file)
   "Insert at point a loaddefs autoload section for FILE.
@@ -333,14 +335,11 @@
 		   (or (get-file-buffer file)
 		       (file-exists-p file)))
 	      ()
-	    (message "Can't find library \"%s\" (load file \"%s\")"
-		     (nth 2 form) file)
-	    (sit-for 2)
-	    (setq file (if (y-or-n-p (format "Remove autoloads for \"%s\"? "
-					     (nth 2 form)))
+	    (setq file (if (y-or-n-p (format "Can't find library `%s'; remove its autoloads? "
+					     (nth 2 form) file))
 			   t
 			 (condition-case ()
-			     (read-file-name (format "Find \"%s\" load file: "
+			     (read-file-name (format "Find `%s' load file: "
 						     (nth 2 form))
 					     nil nil t)
 			   (quit nil)))))
@@ -369,7 +368,7 @@
 Runs \\[update-file-autoloads] on files and \\[update-directory-autoloads]
 on directories.  Must be used only with -batch, and kills Emacs on completion.
 Each file will be processed even if an error occurred previously.
-For example, invoke \"emacs -batch -f batch-update-autoloads *.el\""
+For example, invoke `emacs -batch -f batch-update-autoloads *.el'."
   (if (not noninteractive)
       (error "batch-update-autoloads is to be used only with -batch"))
   (let ((lost nil)