Merged in changes from CVS trunk.

Patches applied:

 * [email protected]/emacs--hacks--0--patch-2
   Prevent special events from appending dashes to the echo string.

 * [email protected]/emacs--hacks--0--patch-4
   Added ChangeLog entry.

 * [email protected]/emacs--cvs-trunk--0--patch-454
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-455
   Bash the dashes

 * [email protected]/emacs--cvs-trunk--0--patch-456
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-457
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-458
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-459
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-460
   Update from CVS


git-archimport-id: [email protected]/emacs--multi-tty--0--patch-219

1 files changed, 6 insertions, 2 deletions

diff --git a/src/fileio.c b/src/fileio.c
index 2a4d5fb230..f81566a765 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5630,13 +5630,17 @@ Next attempt to save will certainly not complain of a discrepancy.  */)
 DEFUN ("visited-file-modtime", Fvisited_file_modtime,
        Svisited_file_modtime, 0, 0, 0,
        doc: /* Return the current buffer's recorded visited file modification time.
-The value is a list of the form (HIGH . LOW), like the time values
+The value is a list of the form (HIGH LOW), like the time values
 that `file-attributes' returns.  If the current buffer has no recorded
 file modification time, this function returns 0.
 See Info node `(elisp)Modification Time' for more details.  */)
      ()
 {
-  return long_to_cons ((unsigned long) current_buffer->modtime);
+  Lisp_Object tcons;
+  tcons = long_to_cons ((unsigned long) current_buffer->modtime);
+  if (CONSP (tcons))
+    return list2 (XCAR (tcons), XCDR (tcons));
+  return tcons;
 }
 
 DEFUN ("set-visited-file-modtime", Fset_visited_file_modtime,