aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-10-22 21:18:47 -0400
committerStefan Monnier2012-10-22 21:18:47 -0400
commit4ff5b1b2939e0fbe30e7739367b63ee258d03d6a (patch)
treea49440f799a19d3850687478591891923126aa2a
parentea1d4aaca0a593c99673912cee3ea910a958d38c (diff)
downloademacs-4ff5b1b2939e0fbe30e7739367b63ee258d03d6a.tar.gz
emacs-4ff5b1b2939e0fbe30e7739367b63ee258d03d6a.zip
* lisp/subr.el (internal-temp-output-buffer-show): Rename from
temp-output-buffer-show, since previously compiled files expect this name.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/subr.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5d527dcd330..3a196095597 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-10-23 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * subr.el (internal-temp-output-buffer-show): Rename from
4 temp-output-buffer-show, since previously compiled files expect this name.
5
12012-10-23 Glenn Morris <rgm@gnu.org> 62012-10-23 Glenn Morris <rgm@gnu.org>
2 7
3 * image.el (image-type-from-file-name): If multiple types match, 8 * image.el (image-type-from-file-name): If multiple types match,
diff --git a/lisp/subr.el b/lisp/subr.el
index ec2d16e6529..0f30976b023 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3151,7 +3151,7 @@ in which case `save-window-excursion' cannot help."
3151 (unwind-protect (progn ,@body) 3151 (unwind-protect (progn ,@body)
3152 (set-window-configuration ,c))))) 3152 (set-window-configuration ,c)))))
3153 3153
3154(defun temp-output-buffer-show (buffer) 3154(defun internal-temp-output-buffer-show (buffer)
3155 "Internal function for `with-output-to-temp-buffer'." 3155 "Internal function for `with-output-to-temp-buffer'."
3156 (with-current-buffer buffer 3156 (with-current-buffer buffer
3157 (set-buffer-modified-p nil) 3157 (set-buffer-modified-p nil)
@@ -3235,7 +3235,7 @@ if it uses `temp-buffer-show-function'."
3235 (run-hooks 'temp-buffer-setup-hook))))) 3235 (run-hooks 'temp-buffer-setup-hook)))))
3236 (standard-output ,buf)) 3236 (standard-output ,buf))
3237 (prog1 (progn ,@body) 3237 (prog1 (progn ,@body)
3238 (temp-output-buffer-show ,buf))))) 3238 (internal-temp-output-buffer-show ,buf)))))
3239 3239
3240(defmacro with-temp-file (file &rest body) 3240(defmacro with-temp-file (file &rest body)
3241 "Create a new buffer, evaluate BODY there, and write the buffer to FILE. 3241 "Create a new buffer, evaluate BODY there, and write the buffer to FILE.