*** empty log message ***

5 files changed, 11 insertions, 14 deletions

diff --git a/lisp/files.el b/lisp/files.el
index 8a7bea3b195..65697ba2a6d 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -107,8 +107,8 @@ never means do not make them.")
   "*When cleaning directory, number of versions to keep.")
 
 (defvar trim-versions-without-asking nil
-  "*If true, deletes excess backup versions silently.
-Otherwise asks confirmation.")
+  "*If t, deletes excess backup versions silently.
+If nil, asks confirmation.  Any other value prevents any trimming.")
 
 (defvar kept-old-versions 2
   "*Number of oldest versions to keep when a new numbered backup is made.")
@@ -767,6 +767,7 @@ the modes of the new file to agree with the old modes."
                    ;; ask the user to confirm now, before doing anything.
                    ;; But don't actually delete til later.
                    (and targets
+                        (or (eq trim-versions-without-asking t) (eq trim-versions-without-asking nil))
                         (or trim-versions-without-asking
                             (y-or-n-p (format "Delete excess backup versions of %s? "
                                               real-file-name))))))
diff --git a/lisp/flow-ctrl.el b/lisp/flow-ctrl.el
index 0cc2d0fa08e..2f98e999d9b 100644
--- a/lisp/flow-ctrl.el
+++ b/lisp/flow-ctrl.el
@@ -1,13 +1,12 @@
 ;;; flow-ctrl.el --- help for lusers on cu(1) or ttys with wired-in ^S/^Q flow control
 
+;;; Copyright (C) 1990 Free Software Foundation, Inc.
+;;; Copyright (C) 1991 Kevin Gallagher
 ;; Author Kevin Gallagher
 ;; Maintainer: FSF
-;; Last-Modified: 03 Jun 1992
 ;; Adapted-By: ESR
 ;; Keywords: hardware
 
-;;; Copyright (C) 1990 Free Software Foundation, Inc.
-;;; Copyright (C) 1991 Kevin Gallagher
 ;;;
 ;;; GNU Emacs is distributed in the hope that it will be useful, but
 ;;; WITHOUT ANY WARRANTY.  No author or distributor accepts
diff --git a/lisp/server.el b/lisp/server.el
index 59219967b8e..2ad6a84ba34 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1,13 +1,12 @@
 ;;; server.el --- Lisp code for GNU Emacs running as server process.
 
+;; Copyright (C) 1986, 1987 Free Software Foundation, Inc.
+
 ;; Author: William Sommerfeld <wesommer@athena.mit.edu>
-;; Last-Modified: 05 Dec 1991
 ;; Keywords: processes
 
 ;; Changes by peck@sun.com and by rms.
 
-;; Copyright (C) 1986, 1987 Free Software Foundation, Inc.
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
diff --git a/lisp/shell.el b/lisp/shell.el
index 0ae9e1b2a61..a8277da845d 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -1,11 +1,10 @@
 ;;; shell.el --- general command interpreter in a window stuff
 
+;;; Copyright Olin Shivers (1988).
+
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
-;; Last-Modified: 16 Mar 1992
 ;; Keywords: processes
 
-;;; Copyright Olin Shivers (1988).
-
 ;;; This file is part of GNU Emacs.
 
 ;;; GNU Emacs is free software; you can redistribute it and/or modify
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index ed4ebad10e8..76c689de848 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -1,13 +1,12 @@
 ;;; sgml-mode.el --- SGML-editing mode
 
+;; Copyright (C) 1992 Free Software Foundation, Inc.
+
 ;; Author: James Clark
 ;; Maintainer: FSF
-;; Last-Modified: 14 Jul 1992
 ;; Adapted-By: ESR
 ;; Keywords: wp
 
-;; Copyright (C) 1992 Free Software Foundation, Inc.
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify