* lisp/subr.el (set-transient-map): Don't wait for some "nested"

[gnu-emacs] / lisp / emacs-lisp / bytecomp.el

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 6f5b6295d1e14c46616c4f73d7e1d7b6c2138dd3..e5f8a8cc22ab4ec2e8a058358191e240e08f0946 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -5,7 +5,7 @@
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;;     Hallvard Furuseth <hbf@ulrik.uio.no>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: lisp
 ;; Package: emacs
 
@@ -356,7 +356,7 @@ else the global value will be modified."
 (defvar byte-compile-interactive-only-functions nil
   "List of commands that are not meant to be called from Lisp.")
 (make-obsolete-variable 'byte-compile-interactive-only-functions
-                       "use the `interactive-only' symbol property instead"
+                       "use the `interactive-only' symbol property instead."
                        "24.4")
 
 (defvar byte-compile-not-obsolete-vars nil
@@ -1705,12 +1705,10 @@ The value is non-nil if there were no errors, nil if errors."
 ;;  (interactive "fByte compile file: \nP")
   (interactive
    (let ((file buffer-file-name)
-        (file-name nil)
         (file-dir nil))
      (and file
          (derived-mode-p 'emacs-lisp-mode)
-         (setq file-name (file-name-nondirectory file)
-               file-dir (file-name-directory file)))
+         (setq file-dir (file-name-directory file)))
      (list (read-file-name (if current-prefix-arg
                               "Byte compile and load file: "
                             "Byte compile file: ")
@@ -2708,7 +2706,6 @@ for symbols generated by the byte compiler itself."
               (cdr compiled)
               ;; optionally, the doc string.
               (cond (lexical-binding
-                     (require 'help-fns)
                      (list (help-add-fundoc-usage doc arglist)))
                     ((or doc int)
                      (list doc)))