Skip to content

Commit 50c92c1

Browse files
minadminad
committed
Use equal instead of string=
1 parent 3e1fd16 commit 50c92c1

File tree

2 files changed

+27
-27
lines changed

2 files changed

+27
-27
lines changed

‎gnuplot-gui.el

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -835,9 +835,9 @@ Note that \"cntrparam\" is not currently supported."
835835
(set nil) (term nil))
836836
(save-excursion
837837
;; there can be more then one command per line
838-
(if (re-search-forward termin end "to_limit")
839-
(progn (backward-char (length (match-string 1)))
840-
(setq end (point-marker))))
838+
(when (re-search-forward termin end "to_limit")
839+
(backward-char (length (match-string 1)))
840+
(setq end (point-marker)))
841841
(goto-char begin)
842842
(skip-syntax-forward "-" end)
843843
;; various constructions are recognized here. at the end of this
@@ -882,15 +882,15 @@ Note that \"cntrparam\" is not currently supported."
882882
(when (or
883883
(and (equal gnuplot-gui-plot-splot-fit-style 'complete)
884884
(cl-member word '("plot" "splot" "fit")
885-
:test 'string=))
885+
:test 'equal))
886886
(equal word "test"))
887887
(gnuplot-gui-set-frame-param 'height 32)
888888
(gnuplot-gui-set-frame-param 'top 50))
889889
(gnuplot-gui-prompt-for-frame word)
890890
(when (or
891891
(and (equal gnuplot-gui-plot-splot-fit-style 'complete)
892892
(cl-member word '("plot" "splot" "fit")
893-
:test 'string=))
893+
:test 'equal))
894894
(equal word "test"))
895895
(gnuplot-gui-set-frame-param 'height old-height)
896896
(gnuplot-gui-set-frame-param 'top old-top)) ))
@@ -956,21 +956,21 @@ bounding single quotes with double quotes, since double quotes are
956956
used in `gnuplot-gui-all-types'."
957957
(let (fixed-list quote quoted) ; remove blanks
958958
(setq list (cl-remove "\\s-+" list :test 'string-match)
959-
list (cl-remove "" list :test 'string=))
959+
list (cl-remove "" list :test 'equal))
960960
(while list ; concatinate parts of quoted string
961961
(if (not (string-match "^\\([\]\[()'\"]\\)" (car list)))
962962
(setq fixed-list (append fixed-list (list (car list))))
963963
(setq quote (match-string 1 (car list))
964964
quoted (car list))
965-
(if (string= quote "[") (setq quote "]"))
966-
(if (string= quote "(") (setq quote ")"))
965+
(if (equal quote "[") (setq quote "]"))
966+
(if (equal quote "(") (setq quote ")"))
967967
(while (and list
968968
(or (equal (length quoted) 1)
969969
(not (string-match (concat (regexp-quote quote) "$")
970970
quoted))))
971971
(setq quoted (concat quoted " " (cadr list))
972972
list (cdr list)))
973-
(if (string= quote "'")
973+
(if (equal quote "'")
974974
(setq quoted (concat "\"" (substring quoted 1))
975975
quoted (concat (substring quoted 0 -1) "\"")))
976976
(setq fixed-list (append fixed-list (list quoted))))
@@ -1012,10 +1012,10 @@ arguments."
10121012
(match-cons (cl-member (concat "^" (car temp-list))
10131013
values :test 'string-match)))
10141014
(if (and (car match-cons) ; " " may be first elem. of list
1015-
(not (string= " " (car match-cons))))
1015+
(not (equal " " (car match-cons))))
10161016
(setq this-cons (cons tag (car match-cons))
10171017
arg-list (cl-remove (car temp-list) arg-list
1018-
:test 'string= :count 1)
1018+
:test 'equal :count 1)
10191019
temp-list nil)
10201020
(setq temp-list (cdr temp-list)))))
10211021
;; ---------------------------- tag (first number in list)
@@ -1032,26 +1032,26 @@ arguments."
10321032
(setq temp-list (cdr temp-list))) )
10331033
;; ---------------------------- number with prefix
10341034
((equal symbol 'number)
1035-
(cond ((and (string= prefix (car temp-list))
1035+
(cond ((and (equal prefix (car temp-list))
10361036
(string-match "^[-0-9.]+$" (cadr temp-list)))
10371037
(setq this-cons (cons tag (cadr temp-list))
10381038
arg-list (cl-remove (car temp-list) arg-list
1039-
:test 'string= :count 1)
1039+
:test 'equal :count 1)
10401040
arg-list (cl-remove (cadr temp-list) arg-list
1041-
:test 'string= :count 1)
1041+
:test 'equal :count 1)
10421042
temp-list nil))
10431043
;; --------------------- number without prefix
10441044
((and (not prefix)
10451045
(string-match "^[-0-9.]+$" (car temp-list)))
10461046
(setq this-cons (cons tag (car temp-list))
10471047
arg-list (cl-remove (car temp-list) arg-list
1048-
:test 'string= :count 1)
1048+
:test 'equal :count 1)
10491049
temp-list nil))
10501050
(t
10511051
(setq temp-list (cdr temp-list)))))
10521052
;; ---------------------------- pair with prefix
10531053
((equal symbol 'pair)
1054-
(if (and (string= prefix (car temp-list))
1054+
(if (and (equal prefix (car temp-list))
10551055
(string-match "^[-0-9.]+$" (cadr temp-list)))
10561056
(let ((this-car (cadr temp-list))
10571057
(this-cdr (if (string-match "^[-0-9.]+$" (cl-caddr temp-list))
@@ -1071,7 +1071,7 @@ arguments."
10711071
(cons tag (cons (match-string 1 (car temp-list))
10721072
(match-string 2 (car temp-list))))
10731073
arg-list (cl-remove (car temp-list) arg-list
1074-
:test 'string= :count 1)
1074+
:test 'equal :count 1)
10751075
temp-list nil)
10761076
(setq temp-list (cdr temp-list)) ))
10771077
;; ---------------------------- labels
@@ -1081,7 +1081,7 @@ arguments."
10811081
")") ; closing paren
10821082
(car temp-list))
10831083
(let* ((list (split-string (car temp-list) "[ \t(),]+"))
1084-
(list (cl-remove "" list :test 'string=))
1084+
(list (cl-remove "" list :test 'equal))
10851085
(return ()))
10861086
(while list
10871087
(if (string-match "['\"]\\([^'\"]*\\)['\"]" (car list))
@@ -1093,7 +1093,7 @@ arguments."
10931093
(setq list (cdr list)) )
10941094
(setq this-cons (cons tag return)
10951095
arg-list (cl-remove (car temp-list) arg-list
1096-
:test 'string= :count 1)
1096+
:test 'equal :count 1)
10971097
temp-list nil))
10981098
(setq temp-list (cdr temp-list))) )
10991099
;; ---------------------------- string, file, format
@@ -1104,17 +1104,17 @@ arguments."
11041104
(car temp-list))
11051105
(setq this-cons (cons tag (match-string 0 (car temp-list)))
11061106
arg-list (cl-remove (car temp-list) arg-list
1107-
:test 'string= :count 1)
1107+
:test 'equal :count 1)
11081108
temp-list nil)
11091109
(setq temp-list (cdr temp-list)) ))
11101110
;; ---------------------------- string*
11111111
((equal symbol 'string*)
1112-
(if (string= prefix (car temp-list))
1112+
(if (equal prefix (car temp-list))
11131113
(setq this-cons (cons tag (cadr temp-list))
11141114
arg-list (cl-remove (car temp-list) arg-list
1115-
:test 'string= :count 1)
1115+
:test 'equal :count 1)
11161116
arg-list (cl-remove (cadr temp-list) arg-list
1117-
:test 'string= :count 1)
1117+
:test 'equal :count 1)
11181118
temp-list nil)
11191119
(setq temp-list (cdr temp-list)) ) )
11201120
;; ---------------------------- other or unknown
@@ -1325,7 +1325,7 @@ SAVE-FRAME is non-nil when the widgets are being reset."
13251325
(just-one-space))
13261326
(forward-sexp)))
13271327
(delete-horizontal-space)
1328-
(if (string= "terminal" (widget-get widget :doc))
1328+
(if (equal "terminal" (widget-get widget :doc))
13291329
(gnuplot-gui-set-options-and-insert)) ))
13301330
(widget-insert " ")
13311331
(widget-create 'push-button :value "Reset"
@@ -1411,7 +1411,7 @@ menu. STARRED is true if this a \\='list* widget."
14111411
(concat (downcase (widget-get widget :tag)) " ")
14121412
"" )))
14131413
(setcdr (assoc (widget-get widget :tag) gnuplot-gui-alist)
1414-
(if (string= (widget-value widget) " ") ""
1414+
(if (equal (widget-value widget) " ") ""
14151415
(format "%s%s" lab (widget-value widget))) )))
14161416
(mapcar (lambda (x) (list 'item :value x))
14171417
list))))

‎gnuplot-tests.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
'message
1313
:around
1414
(lambda (orig-message format-string &rest args)
15-
(unless (string= format-string
15+
(unless (equal format-string
1616
"gnuplot-mode %s (gnuplot %s) -- report bugs with %S")
1717
(apply orig-message format-string args)))))
1818

@@ -53,7 +53,7 @@ string by `scan-sexps'."
5353
(setq end (point))
5454
(insert epilogue))
5555
(syntax-propertize (point-max))
56-
(string= (buffer-substring start (scan-sexps start 1))
56+
(equal (buffer-substring start (scan-sexps start 1))
5757
string)))))
5858

5959
(defmacro gnuplot-test-string (name string)

0 commit comments

Comments
 (0)