*** empty log message ***

5 files changed, 10 insertions, 14 deletions

diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el
index 5b85791dea1..b06171b52ec 100644
--- a/lisp/emacs-lisp/disass.el
+++ b/lisp/emacs-lisp/disass.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -25,7 +25,7 @@
 ;;; The variable byte-code-vector is defined by the new bytecomp.el.
 ;;; The function byte-decompile-lapcode is defined in byte-opt.el.
 ;;; Since we don't use byte-decompile-lapcode, let's try not loading byte-opt.
-(require 'bytecomp)
+(require 'byte-compile)
 
 (defvar disassemble-column-1-indent 5 "*")
 (defvar disassemble-column-2-indent 10 "*")
diff --git a/lisp/frame.el b/lisp/frame.el
index 9722f32c435..734357ffd5f 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -9,7 +9,7 @@
 ;;;
 ;;; GNU Emacs is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 1, or (at your option)
+;;; the Free Software Foundation; either version 2, or (at your option)
 ;;; any later version.
 ;;;
 ;;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/gud.el b/lisp/gud.el
index 172781e0fea..a1e100a57ac 100644
--- a/lisp/gud.el
+++ b/lisp/gud.el
@@ -1,11 +1,12 @@
 ;; Grand Unified Debugger mode --- run gdb, sdb, dbx under Emacs control
+;; Copyright (c) 1992 Free Software Foundation, Inc.
 ;;	@(#)gud.el	1.10
 
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -23,11 +24,6 @@
 ;; The overloading code was then rewritten by Barry Warsaw <bwarsaw@cen.com>,
 ;; who also hacked the mode to use comint.el.
 
-;; Note: use of this package with sdb requires that your tags.el support
-;; the find-tag-noselect entry point.  Stock distributions up to 18.57 do 
-;; *not* include this feature; if it's not included with this file, email
-;; eric@snark.thyrsus.com for it or get 18.58.
-
 (require 'comint)
 (require 'tags)
 
diff --git a/lisp/x-menu.el b/lisp/x-menu.el
index a1d3fa78859..8d55d875508 100644
--- a/lisp/x-menu.el
+++ b/lisp/x-menu.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -107,7 +107,7 @@ This also creates the menu itself."
   (let ((buf (current-buffer)))
     (pop-to-buffer menu)
     (let (buffer-read-only)
-      (setq x-menu-max-width (1- (screen-width)))
+      (setq x-menu-max-width (1- (frame-width)))
       (setq x-menu-item-width 0)
       (let (items-head
 	    (items-tail x-menu-items-alist))
diff --git a/src/fileio.c b/src/fileio.c
index 945b986f7fb..4ff7dfeee87 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2470,11 +2470,11 @@ auto_save_error ()
 
   ring_bell ();
   message ("Autosaving...error for %s", name);
-  Fsleep_for (make_number (1));
+  Fsleep_for (make_number (1), Qnil);
   message ("Autosaving...error!for %s", name);
-  Fsleep_for (make_number (1));
+  Fsleep_for (make_number (1), Qnil);
   message ("Autosaving...error for %s", name);
-  Fsleep_for (make_number (1));
+  Fsleep_for (make_number (1), Qnil);
   return Qnil;
 }