aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1997-08-15 23:42:26 +0000
committerRichard M. Stallman1997-08-15 23:42:26 +0000
commit952936e8a93d2cc828438ec87197085aba8099e6 (patch)
tree0004ba63263301b57c436f5f6502bdf8188fccc9
parentcce1c318c06a91e3c099a1e9d34d9c997d8a538c (diff)
downloademacs-952936e8a93d2cc828438ec87197085aba8099e6.tar.gz
emacs-952936e8a93d2cc828438ec87197085aba8099e6.zip
(format-encode-run-method, format-decode-run-method): Put error
output from shell command in temp buffer, not data buffer. (format-alist): Typo fix.
-rw-r--r--lisp/format.el8
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/format.el b/lisp/format.el
index 8ed5d78ab47..1ab15a4bb7c 100644
--- a/lisp/format.el
+++ b/lisp/format.el
@@ -73,7 +73,7 @@
73 nil nil nil nil nil) 73 nil nil nil nil nil)
74 (ibm "IBM Code Page 850 (DOS)" 74 (ibm "IBM Code Page 850 (DOS)"
75 "1\\(^\\)" 75 "1\\(^\\)"
76 "recode ibm-ps:latin1" "recode latin1:ibm-pc" t nil) 76 "recode ibm-pc:latin1" "recode latin1:ibm-pc" t nil)
77 (mac "Apple Macintosh" 77 (mac "Apple Macintosh"
78 "1\\(^\\)" 78 "1\\(^\\)"
79 "recode mac:latin1" "recode latin1:mac" t nil) 79 "recode mac:latin1" "recode latin1:mac" t nil)
@@ -148,7 +148,8 @@ BUFFER should be the buffer that the output originally came from."
148 (if (stringp method) 148 (if (stringp method)
149 (save-current-buffer 149 (save-current-buffer
150 (set-buffer buffer) 150 (set-buffer buffer)
151 (shell-command-on-region from to method t) 151 (with-output-to-temp-buffer "*Format Errors*"
152 (shell-command-on-region from to method t nil standard-output))
152 (point)) 153 (point))
153 (funcall method from to buffer))) 154 (funcall method from to buffer)))
154 155
@@ -158,7 +159,8 @@ If METHOD is a string, it is a shell command;
158otherwise, it should be a Lisp function." 159otherwise, it should be a Lisp function."
159 (if (stringp method) 160 (if (stringp method)
160 (progn 161 (progn
161 (shell-command-on-region from to method t) 162 (with-output-to-temp-buffer "*Format Errors*"
163 (shell-command-on-region from to method t nil standard-output))
162 (point)) 164 (point))
163 (funcall method from to))) 165 (funcall method from to)))
164 166