]> git.eshelyaron.com Git - emacs.git/commitdiff
* lisp/net/eudc-bob.el (eudc-bob-pipe-object-to-external-program): Simplify
authorStefan Monnier <monnier@iro.umontreal.ca>
Sun, 16 Aug 2020 02:44:16 +0000 (22:44 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Sun, 16 Aug 2020 02:44:16 +0000 (22:44 -0400)
Use `with-temp-buffer`.

lisp/net/eudc-bob.el

index 1d7005bb84489fd99d6c6c2f70b490425d7510d6..bb6682520ae5aece540419697019b2693b96180e 100644 (file)
@@ -230,26 +230,20 @@ display a button."
        (coding-system-for-write 'binary)) ;Inhibit EOL conversion.
     (write-region data nil filename)))
 
-(defun eudc-bob-pipe-object-to-external-program ()
+(defun eudc-bob-pipe-object-to-external-program (program)
   "Pipe the object data of the button at point to an external program."
-  (interactive)
+  (interactive (list (completing-read "Viewer: " eudc-external-viewers)))
   (let ((data (eudc-bob-get-overlay-prop 'object-data))
-       (buffer (generate-new-buffer "*eudc-tmp*"))
-       program
-       viewer)
-    (condition-case nil
-       (save-excursion
-         (set-buffer-file-coding-system 'binary)
-         (set-buffer buffer)
-         (insert data)
-         (setq program (completing-read "Viewer: " eudc-external-viewers))
-         (if (setq viewer (assoc program eudc-external-viewers))
-             (call-process-region (point-min) (point-max)
-                                  (car (cdr viewer))
-                                  (cdr (cdr viewer)))
-           (call-process-region (point-min) (point-max) program)))
-      (error
-       (kill-buffer buffer)))))
+       (viewer (assoc program eudc-external-viewers)))
+    (with-temp-buffer
+      (set-buffer-multibyte nil)
+      (insert data)
+      (let ((coding-system-for-write 'binary)) ;Inhibit EOL conversion
+       (if viewer
+           (call-process-region (point-min) (point-max)
+                                (car (cdr viewer))
+                                (cdr (cdr viewer)))
+         (call-process-region (point-min) (point-max) program))))))
 
 (defun eudc-bob-menu ()
   "Retrieve the menu attached to a binary object."