@@ -1783,6 +1783,38 @@ shown."
17831783 " Help will be displayed after insertions."
17841784 " Help no longer displayed after insertions." )))
17851785
1786+ (defun gnuplot--setup-menubar ()
1787+ " Initial setup of gnuplot and insertions menus."
1788+ (unless gnuplot-mode-menu
1789+ (when gnuplot-insertions-menu-flag
1790+ (let ((insertions-menu
1791+ `(" Insertions"
1792+ ,@gnuplot-insertions-top
1793+ , gnuplot-insertions-adornments
1794+ , gnuplot-insertions-plot-options
1795+ , gnuplot-insertions-terminal
1796+ , gnuplot-insertions-x-axis
1797+ , gnuplot-insertions-y-axis
1798+ , gnuplot-insertions-z-axis
1799+ , gnuplot-insertions-x2-axis
1800+ , gnuplot-insertions-y2-axis
1801+ , gnuplot-insertions-parametric-plots
1802+ , gnuplot-insertions-polar-plots
1803+ , gnuplot-insertions-surface-plots
1804+ ,@gnuplot-insertions-bottom )))
1805+ (easy-menu-define gnuplot--insertions-menu gnuplot-mode-map
1806+ " Insertions menu used in Gnuplot-mode"
1807+ insertions-menu)))
1808+ (easy-menu-define ; set up gnuplot menu
1809+ gnuplot-mode-menu gnuplot-mode-map " Menu used in gnuplot-mode"
1810+ gnuplot--menu)))
1811+
1812+ (defun gnuplot--mark-active ()
1813+ " Return non-nil if the mark is active and it is not equal to point."
1814+ (condition-case nil
1815+ (and (mark ) (/= (mark ) (point )))
1816+ (error nil )))
1817+
17861818
17871819; ;; --- autoloaded functions: gnuplot-mode and gnuplot-make-buffer
17881820
@@ -1842,38 +1874,6 @@ a list:
18421874 (setq gnuplot--comint-recent-buffer (current-buffer ))
18431875 (gnuplot--setup-menubar))
18441876
1845- (defun gnuplot--setup-menubar ()
1846- " Initial setup of gnuplot and insertions menus."
1847- (unless gnuplot-mode-menu
1848- (when gnuplot-insertions-menu-flag
1849- (let ((insertions-menu
1850- `(" Insertions"
1851- ,@gnuplot-insertions-top
1852- , gnuplot-insertions-adornments
1853- , gnuplot-insertions-plot-options
1854- , gnuplot-insertions-terminal
1855- , gnuplot-insertions-x-axis
1856- , gnuplot-insertions-y-axis
1857- , gnuplot-insertions-z-axis
1858- , gnuplot-insertions-x2-axis
1859- , gnuplot-insertions-y2-axis
1860- , gnuplot-insertions-parametric-plots
1861- , gnuplot-insertions-polar-plots
1862- , gnuplot-insertions-surface-plots
1863- ,@gnuplot-insertions-bottom )))
1864- (easy-menu-define gnuplot--insertions-menu gnuplot-mode-map
1865- " Insertions menu used in Gnuplot-mode"
1866- insertions-menu)))
1867- (easy-menu-define ; set up gnuplot menu
1868- gnuplot-mode-menu gnuplot-mode-map " Menu used in gnuplot-mode"
1869- gnuplot--menu)))
1870-
1871- (defun gnuplot--mark-active ()
1872- " Return non-nil if the mark is active and it is not equal to point."
1873- (condition-case nil
1874- (and (mark ) (/= (mark ) (point )))
1875- (error nil )))
1876-
18771877;;;### autoload
18781878(defun gnuplot-make-buffer ()
18791879 " Open a new buffer in `gnuplot-mode' .
0 commit comments