branch: elpa/gnuplot
commit 5fd6e901fff43e5c810b4f32fcd0353d92b93ee5
Author: Daniel Mendler <m...@daniel-mendler.de>
Commit: Daniel Mendler <m...@daniel-mendler.de>
Move gnuplot--setup-menubar below variable definitions
---
gnuplot.el | 64 +++++++++++++++++++++++++++++++-------------------------------
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/gnuplot.el b/gnuplot.el
index b01b7de028..197749b24f 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -594,38 +594,6 @@ create a `gnuplot-mode' buffer."
This part contains the toggle buttons for displaying info or
opening an argument-setting popup.")
-(defun gnuplot--setup-menubar ()
- "Initial setup of gnuplot and insertions menus."
- (unless gnuplot-mode-menu
- (when gnuplot-insertions-menu-flag
- (let ((insertions-menu
- `("Insertions"
- ,@gnuplot-insertions-top
- ,gnuplot-insertions-adornments
- ,gnuplot-insertions-plot-options
- ,gnuplot-insertions-terminal
- ,gnuplot-insertions-x-axis
- ,gnuplot-insertions-y-axis
- ,gnuplot-insertions-z-axis
- ,gnuplot-insertions-x2-axis
- ,gnuplot-insertions-y2-axis
- ,gnuplot-insertions-parametric-plots
- ,gnuplot-insertions-polar-plots
- ,gnuplot-insertions-surface-plots
- ,@gnuplot-insertions-bottom)))
- (easy-menu-define gnuplot--insertions-menu gnuplot-mode-map
- "Insertions menu used in Gnuplot-mode"
- insertions-menu)))
- (easy-menu-define ; set up gnuplot menu
- gnuplot-mode-menu gnuplot-mode-map "Menu used in gnuplot-mode"
- gnuplot--menu)))
-
-(defun gnuplot--mark-active ()
- "Return non-nil if the mark is active and it is not equal to point."
- (condition-case nil
- (and (mark) (/= (mark) (point)))
- (error nil)))
-
(defvar gnuplot-recently-sent nil
"This is a record of the most recent kind of text sent to gnuplot.
It takes as its value nil, `line', `region', `buffer', or `file'. It is
@@ -1874,6 +1842,38 @@ a list:
(setq gnuplot--comint-recent-buffer (current-buffer))
(gnuplot--setup-menubar))
+(defun gnuplot--setup-menubar ()
+ "Initial setup of gnuplot and insertions menus."
+ (unless gnuplot-mode-menu
+ (when gnuplot-insertions-menu-flag
+ (let ((insertions-menu
+ `("Insertions"
+ ,@gnuplot-insertions-top
+ ,gnuplot-insertions-adornments
+ ,gnuplot-insertions-plot-options
+ ,gnuplot-insertions-terminal
+ ,gnuplot-insertions-x-axis
+ ,gnuplot-insertions-y-axis
+ ,gnuplot-insertions-z-axis
+ ,gnuplot-insertions-x2-axis
+ ,gnuplot-insertions-y2-axis
+ ,gnuplot-insertions-parametric-plots
+ ,gnuplot-insertions-polar-plots
+ ,gnuplot-insertions-surface-plots
+ ,@gnuplot-insertions-bottom)))
+ (easy-menu-define gnuplot--insertions-menu gnuplot-mode-map
+ "Insertions menu used in Gnuplot-mode"
+ insertions-menu)))
+ (easy-menu-define ; set up gnuplot menu
+ gnuplot-mode-menu gnuplot-mode-map "Menu used in gnuplot-mode"
+ gnuplot--menu)))
+
+(defun gnuplot--mark-active ()
+ "Return non-nil if the mark is active and it is not equal to point."
+ (condition-case nil
+ (and (mark) (/= (mark) (point)))
+ (error nil)))
+
;;;###autoload
(defun gnuplot-make-buffer ()
"Open a new buffer in `gnuplot-mode'.
