procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
like insert-file-contents does.
This commit is contained in:
Luc Teirlinck 2004-03-22 04:43:17 +00:00
parent 091ec19209
commit 19e580b4e9
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/ChangeLog
View file

@ -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

4
lisp/format.el
View file

@ -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)