[nongnu] elpa/gnuplot 23f2060 032/184: Merge branch 'master' into devel

[ELPA Syncer]

branch: elpa/gnuplot
commit 23f20603838e693579be6b89eed5209604359f85
Merge: 566e92f a375477
Author: Bruce Ravel <bravel@bnl.gov>
Commit: Bruce Ravel <bravel@bnl.gov>

    Merge branch 'master' into devel
    
    Conflicts:
        gnuplot.el
---
 gnuplot.el | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnuplot.el b/gnuplot.el
index b658719..2d3cf19 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -2115,6 +2115,16 @@ buffer."
        (save-excursion
          (set-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 ()