Skip to content

Commit 62117fe

Browse files
authored
Deprecate XEmacs support and XEmacs toolbar (#59)
Remove all functions and checks relative to XEmacs, include the gnuplot-mode toolbar and associated bitmaps. Mark deprecated modules and functions for future fixes.
1 parent 24dd2d0 commit 62117fe

File tree

6 files changed

+66
-617
lines changed

6 files changed

+66
-617
lines changed

INSTALL.org

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
instead: see [[Installing without configure or make]] below.
1818

1919
You can specify the Emacs executable to use for byte-compiling
20-
by using the ~EMACS~ environment variable: for example
21-
~./configure EMACS=xemacs~ to use XEmacs. On Mac OS X, if your
20+
by using the ~EMACS~ environment variable. On Mac OS X, if your
2221
Emacs application is located at ~/Applications/Emacs.app~, you
2322
should do ~./configure
2423
EMACS=/Applications/Emacs.app/Contents/MacOS/Emacs~

README.org

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,8 @@ A basic gnuplot configuration can be found below.
7373
version 4.4 and up. It will also mostly work fine with older
7474
versions. If it doesn't work with newer versions, report a bug.
7575

76-
This version has mostly been tested under GNU Emacs 23 and 24.
77-
It should also work on GNU Emacs 22 and XEmacs 21. It may work
78-
with earlier versions, but it has not been tested.
76+
This version has mostly been tested under GNU Emacs 25.
77+
It should also work on GNU Emacs 24.3 and above.
7978

8079
*** New syntax for gnuplot version 4
8180
This version of gnuplot-mode supports the new curly-brace-block

gnuplot-context.el

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2061,9 +2061,7 @@ there."
20612061
;; Completions
20622062
(defun gnuplot-completions ()
20632063
(gnuplot-parse-at-point t)
2064-
(if (featurep 'xemacs) ; Need an alist
2065-
(mapcar (lambda (s) (cons s nil)) gnuplot-completions)
2066-
gnuplot-completions))
2064+
gnuplot-completions)
20672065

20682066
(defun gnuplot-context-completion-at-point ()
20692067
"Return completions of keyword preceding point, using context."

gnuplot-gui.el

Lines changed: 12 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,8 @@
3333
;; backward compatible to 3.5, it will work well for that version
3434
;; also.
3535
;;
36-
;; gnuplot-gui.el was developed using Emacs 19.34 and is known to work
37-
;; on Emacs 20.x and XEmacs 20.x. I do not know what is the earliest
38-
;; version for which it will work, but I make no guarantees for
39-
;; versions before 19.34. Note that this makes heavy use of the
40-
;; widget package, so this will not work on Emacs 19.34 unless you
41-
;; install the widget package separately.
36+
;; gnuplot-gui.el was developed using GNU Emacs 25 and should be
37+
;; compatible with GNU Emacs 24.3 and above.
4238
;;
4339
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
4440
;;
@@ -74,7 +70,6 @@
7470
(error nil)))
7571
(require 'cl)
7672
(eval-when-compile ; suppress some compiler warnings
77-
(defvar gnuplot-xemacs-p nil)
7873
(defvar gnuplot-quote-character nil)
7974
(defvar gnuplot-info-display nil)
8075
(defvar gnuplot-mode-map nil))
@@ -115,17 +110,7 @@ This would be done after menu insertion of Gnuplot commands."
115110

116111
(defvar gnuplot-gui-frame nil
117112
"Frame used to hold the buffer for setting options.")
118-
(defcustom gnuplot-gui-frame-plist
119-
'(height 18 width 65 border-width 0
120-
user-position t top 150 left 150
121-
internal-border-width 0 unsplittable t
122-
default-toolbar-visible-p nil has-modeline-p nil
123-
menubar-visible-p nil)
124-
"Frame plist for the input run-time display frame in XEmacs."
125-
:type '(repeat (group :inline t
126-
(symbol :tag "Property")
127-
(sexp :tag "Value")))
128-
:group 'gnuplot-gui)
113+
129114
(defcustom gnuplot-gui-frame-parameters
130115
'((height . 18)
131116
(width . 65)
@@ -885,13 +870,10 @@ currently supported."
885870
(gnuplot-gui-set-options-and-insert))))
886871

887872
(defun gnuplot-gui-get-frame-param (param)
888-
(if gnuplot-xemacs-p
889-
(plist-get gnuplot-gui-frame-plist param)
890-
(cdr (assoc param gnuplot-gui-frame-parameters))))
873+
(cdr (assoc param gnuplot-gui-frame-parameters)))
874+
891875
(defun gnuplot-gui-set-frame-param (param value)
892-
(if gnuplot-xemacs-p
893-
(plist-put gnuplot-gui-frame-plist param value)
894-
(setcdr (assoc param gnuplot-gui-frame-parameters) value)))
876+
(setcdr (assoc param gnuplot-gui-frame-parameters) value))
895877

896878
(defun gnuplot-gui-set-options-and-insert ()
897879
"Insert arguments using a GUI interface.
@@ -984,9 +966,7 @@ Note that \"cntrparam\" is not currently supported."
984966

985967

986968
(defun gnuplot-gui-y-n (foo))
987-
(if gnuplot-xemacs-p
988-
(defalias 'gnuplot-gui-y-n 'y-or-n-p-maybe-dialog-box)
989-
(defalias 'gnuplot-gui-y-n 'y-or-n-p))
969+
(defalias 'gnuplot-gui-y-n 'y-or-n-p)
990970

991971
(defun gnuplot-gui-correct-command (word set term begin)
992972
"Check syntax of set command and terminal specifications.
@@ -1281,25 +1261,15 @@ SAVE-FRAME is non-nil when the widgets are being reset."
12811261
gnuplot-current-buffer (current-buffer)
12821262
gnuplot-current-buffer-point (point-marker))
12831263
(unless (and gnuplot-gui-frame (frame-live-p gnuplot-gui-frame))
1284-
(setq gnuplot-gui-frame (if gnuplot-xemacs-p
1285-
(make-frame gnuplot-gui-frame-plist)
1286-
(make-frame gnuplot-gui-frame-parameters))))
1264+
(setq gnuplot-gui-frame (make-frame gnuplot-gui-frame-parameters)))
12871265
(select-frame gnuplot-gui-frame)
12881266
;;(set-frame-position gnuplot-gui-frame 150 150) ;; so herky-jerky
1289-
(if gnuplot-xemacs-p
1290-
(set-mouse-position (selected-window) 0 0)
1291-
(set-mouse-position gnuplot-gui-frame 0 0)))
1267+
(set-mouse-position gnuplot-gui-frame 0 0))
12921268
(kill-buffer (get-buffer-create "*Gnuplot GUI*"))
12931269
(switch-to-buffer (get-buffer-create "*Gnuplot GUI*"))
12941270
(kill-all-local-variables)
1295-
(if gnuplot-xemacs-p
1296-
(progn
1297-
(set (make-local-variable 'frame-title-format)
1298-
"Set Gnuplot Options")
1299-
(set (make-local-variable 'frame-icon-title-format)
1300-
"Set Gnuplot Options"))
1301-
(modify-frame-parameters (selected-frame)
1302-
'((title . "Set Gnuplot Options"))) )
1271+
(modify-frame-parameters (selected-frame)
1272+
'((title . "Set Gnuplot Options")))
13031273
(widget-insert "\nSet options for \"" item "\" ")
13041274
(let (tag help val)
13051275
(cond ((string-match "^[xyz]2?tics" item)
@@ -1466,8 +1436,7 @@ SAVE-FRAME is non-nil when the widgets are being reset."
14661436
(:bold t :foreground "tan"))
14671437
(t
14681438
(:italic t)))
1469-
"Face used for push-buttons.
1470-
Only used in Emacs. XEmacs displays push-buttons with a pixmap."
1439+
"Face used for push-buttons."
14711440
:group 'gnuplot-faces)
14721441
(defface gnuplot-gui-labels-face '((((class color) (background light))
14731442
(:bold t :foreground "darkslateblue"))

0 commit comments

Comments
 (0)