(format-insert-file): Always return a list of two elements,

like insert-file-contents does.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 68faae1073ad7a568407c4c14161f67958beb128..ad5a98af8cbf0bf7c7788781f002dcd885beb7cf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-21  Luc Teirlinck  <teirllm@auburn.edu>
+
+       * format.el (format-insert-file): Always return a list of two
+       elements, like insert-file-contents does.
+
 2004-03-21  Andre Spiegel  <spiegel@gnu.org>
 
        * vc.el Add new optional BUFFER argument to vc-BACKEND-print-log
@@ -7,7 +12,7 @@
        (vc-version-diff, vc-diff-internal): Doc fixes.
 
        * vc-hooks.el (vc-default-workfile-unchanged-p): If the
-       implementation supports it, let diff output go to *vc*, 
+       implementation supports it, let diff output go to *vc*,
        not *vc-diff*, since this is an internal call.
 
        * vc-cvs.el (vc-cvs-print-log, vc-cvs-diff): Add optional BUFFER
@@ -16,7 +21,7 @@
        * vc-rcs.el (vc-rcs-print-log, vc-rcs-diff): Likewise.
 
        * vc-sccs.el (vc-sccs-print-log, vc-sccs-diff): Likewise.
-       
+
 2004-03-21  Dave Love  <fx@gnu.org>
 
        * progmodes/cfengine.el (cfengine-mode): Set

diff --git a/lisp/format.el b/lisp/format.el
index 90047e98a6cfcdd7c65968de32af55a37f4ac892..09d3e5fa715507559de891a039d4c4abec73418d 100644 (file)
--- a/lisp/format.el
+++ b/lisp/format.el
@@ -416,7 +416,7 @@ The optional third and fourth arguments BEG and END specify
 the part of the file to read.
 
 The return value is like the value of `insert-file-contents':
-a list (ABSOLUTE-FILE-NAME . SIZE)."
+a list (ABSOLUTE-FILE-NAME SIZE)."
   (interactive
    ;; Same interactive spec as write-file, plus format question.
    (let* ((file (read-file-name "Find file: "))
@@ -429,7 +429,7 @@ a list (ABSOLUTE-FILE-NAME . SIZE)."
       (setq size (nth 1 value)))
     (if format
        (setq size (format-decode format size)
-             value (cons (car value) size)))
+             value (list (car value) size)))
     value))
 
 (defun format-read (&optional prompt)