Load gnuplot-gui lazily if needed

Author: minad

gnuplot-gui.el

@@ -805,6 +805,7 @@ This alist is formed at load time by appending together
                                     gnuplot-gui-test-type))
 
 
+;;;###autoload
 (defun gnuplot-gui-swap-simple-complete ()
   (interactive)
   (setq gnuplot-gui-plot-splot-fit-style
@@ -826,6 +827,7 @@ This alist is formed at load time by appending together
 
 ;;; user interface to the widget-y stuff
 
+;;;###autoload
 (defun gnuplot-gui-mouse-set (event)
   "Use the mouse to begin setting options using a GUI interface.
 EVENT is a mouse event.  Bound to \\[gnuplot-gui-mouse-set]
@@ -842,6 +844,7 @@ currently supported."
 (defun gnuplot-gui-set-frame-param (param value)
   (setcdr (assoc param gnuplot-gui-frame-parameters) value))
 
+;;;###autoload
 (defun gnuplot-gui-set-options-and-insert ()
   "Insert arguments using a GUI interface.
 Determine contents of current line and set up the appropriate GUI
@@ -923,6 +926,7 @@ Note that \"cntrparam\" is not currently supported."
                (message
                 "%S is not a gnuplot command which takes options" w)))) )))
 
+;;;###autoload
 (defun gnuplot-gui-toggle-popup ()
   (interactive)
   (setq gnuplot-gui-popup-flag (not gnuplot-gui-popup-flag))

gnuplot.el

@@ -837,18 +837,16 @@ create a `gnuplot-mode' buffer."
                                (boolean  :tag "Enabled" t)))))
 
 
-(defvar gnuplot-gui-popup-flag)
-(defvar gnuplot-insertions-bottom ()
+(defvar gnuplot-insertions-bottom
+  '("---"
+    ["Display of info with insertion" gnuplot-toggle-info-display
+     :style toggle :selected gnuplot-insertions-show-help-flag]
+    ["Display GUI popup with insertion" gnuplot-gui-toggle-popup
+     :active t
+     :style toggle :selected gnuplot-gui-popup-flag])
   "Bottom part of the insertions menu.
 This part contains the toggle buttons for displaying info or
 opening an argument-setting popup.")
-(setq gnuplot-insertions-bottom
-      '("---"
-        ["Display of info with insertion" gnuplot-toggle-info-display
-         :style toggle :selected gnuplot-insertions-show-help-flag]
-        ["Display GUI popup with insertion" gnuplot-gui-toggle-popup
-         :active t
-         :style toggle :selected gnuplot-gui-popup-flag]))
 
 (defun gnuplot-setup-menubar ()
   "Initial setup of gnuplot and insertions menus."
@@ -2130,7 +2128,8 @@ shown."
           (setq topic (downcase (match-string 2 string))
                 term            (match-string 4 string))
           (if (string= topic "terminal") (setq topic (downcase term)))))
-    (cond (gnuplot-gui-popup-flag
+    (cond ((and (bound-and-true-p gnuplot-gui-popup-flag)
+                (fboundp 'gnuplot-gui-set-options-and-insert))
            (gnuplot-gui-set-options-and-insert))
           (gnuplot-insertions-show-help-flag
            (if gnuplot-keywords-pending          ; <HW>
@@ -2232,7 +2231,6 @@ a list:
   (setq-local font-lock-multiline t)
   (setq-local parse-sexp-lookup-properties t)
 
-  (require 'gnuplot-gui)
   (setq gnuplot-first-call nil          ; a few more details ...
         gnuplot-comint-recent-buffer (current-buffer))
   (setq-local comint-process-echoes gnuplot-echo-command-line-flag)