From: Luc Teirlinck Date: Mon, 22 Mar 2004 04:43:17 +0000 (+0000) Subject: (format-insert-file): Always return a list of two elements, X-Git-Tag: ttn-vms-21-2-B4~7181 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=19e580b4e9e40d3bce53fc39eddfe49a27a995f9;p=emacs.git (format-insert-file): Always return a list of two elements, like insert-file-contents does. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 68faae1073a..ad5a98af8cb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2004-03-21 Luc Teirlinck + + * format.el (format-insert-file): Always return a list of two + elements, like insert-file-contents does. + 2004-03-21 Andre Spiegel * 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 * progmodes/cfengine.el (cfengine-mode): Set diff --git a/lisp/format.el b/lisp/format.el index 90047e98a6c..09d3e5fa715 100644 --- 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)