[nongnu] elpa/gnuplot 674a21d 040/184: Merge remote-tracking branch 'origin/devel' into devel

[ELPA Syncer]

branch: elpa/gnuplot
commit 674a21d3f9bfee80601491d038ea3389bf540a33
Merge: ca241a7 57fd4a2
Author: Jonathan Oddie <j.j.oddie@gmail.com>
Commit: Jonathan Oddie <j.j.oddie@gmail.com>

    Merge remote-tracking branch 'origin/devel' into devel
---
 gnuplot.el | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/gnuplot.el b/gnuplot.el
index ca5210b..a6f457a 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -2112,19 +2112,8 @@ buffer."
        (setq gnuplot-buffer (make-comint gnuplot-process-name gnuplot-program)
              gnuplot-process (get-process gnuplot-process-name))
        (process-kill-without-query gnuplot-process nil)
-       (save-excursion
-         (set-buffer gnuplot-buffer)
+       (with-current-buffer gnuplot-buffer
          (gnuplot-comint-mode)
-      ;; 'local does not automatically make hook buffer-local in XEmacs.
-      (if (featurep 'xemacs)
-          (make-local-hook 'kill-buffer-hook))
-      (add-hook 'kill-buffer-hook 'gnuplot-close-down nil t)
-         (gnuplot-comint-start-function)
-          (make-local-variable 'comint-output-filter-functions)
-          (setq comint-output-filter-functions
-                (append comint-output-filter-functions
-                        '(comint-postoutput-scroll-to-bottom
-                          gnuplot-protect-prompt-fn)))
          (message "Starting gnuplot plotting program...Done")))))
 
 (defun gnuplot-fetch-version-number ()