Skip to content

Commit 1b2b136

Browse files
committed
cus-edit.el: Remove XEmacs compat code
* lisp/cus-edit.el (custom-browse-insert-prefix): Remove XEmacs compat code and make obsolete. (custom-group-value-create): Use `insert' directly. * lisp/emacs-lisp/elint.el (elint-check-conditional-form): Don't refer to function that doesn't have an if any more.
1 parent a9c1e18 commit 1b2b136

File tree

2 files changed

+8
-21
lines changed

2 files changed

+8
-21
lines changed

lisp/cus-edit.el

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1827,20 +1827,9 @@ item in another window.\n\n"))
18271827
(" `-" "bottom")))
18281828

18291829
(defun custom-browse-insert-prefix (prefix)
1830-
"Insert PREFIX. On XEmacs convert it to line graphics."
1831-
;; Fixme: do graphics.
1832-
(if nil ; (featurep 'xemacs)
1833-
(progn
1834-
(insert "*")
1835-
(while (not (string-equal prefix ""))
1836-
(let ((entry (substring prefix 0 3)))
1837-
(setq prefix (substring prefix 3))
1838-
(let ((overlay (make-overlay (1- (point)) (point) nil t nil))
1839-
(name (nth 1 (assoc entry custom-browse-alist))))
1840-
(overlay-put overlay 'end-glyph (widget-glyph-find name entry))
1841-
(overlay-put overlay 'start-open t)
1842-
(overlay-put overlay 'end-open t)))))
1843-
(insert prefix)))
1830+
"Insert PREFIX."
1831+
(declare (obsolete insert "27.1"))
1832+
(insert prefix))
18441833

18451834
;;; Modification of Basic Widgets.
18461835
;;
@@ -4043,7 +4032,7 @@ If GROUPS-ONLY is non-nil, return only those members that are groups."
40434032
(cond ((and (eq custom-buffer-style 'tree)
40444033
(eq state 'hidden)
40454034
(or members (custom-unloaded-widget-p widget)))
4046-
(custom-browse-insert-prefix prefix)
4035+
(insert prefix)
40474036
(push (widget-create-child-and-convert
40484037
widget 'custom-browse-visibility
40494038
:tag "+")
@@ -4056,19 +4045,17 @@ If GROUPS-ONLY is non-nil, return only those members that are groups."
40564045
(widget-put widget :buttons buttons))
40574046
((and (eq custom-buffer-style 'tree)
40584047
(zerop (length members)))
4059-
(custom-browse-insert-prefix prefix)
4060-
(insert "[ ]-- ")
4048+
(insert prefix "[ ]-- ")
40614049
(push (widget-create-child-and-convert
40624050
widget 'custom-browse-group-tag)
40634051
buttons)
40644052
(insert " " tag "\n")
40654053
(widget-put widget :buttons buttons))
40664054
((eq custom-buffer-style 'tree)
4067-
(custom-browse-insert-prefix prefix)
4055+
(insert prefix)
40684056
(if (zerop (length members))
40694057
(progn
4070-
(custom-browse-insert-prefix prefix)
4071-
(insert "[ ]-- ")
4058+
(insert prefix "[ ]-- ")
40724059
;; (widget-glyph-insert nil "[ ]" "empty")
40734060
;; (widget-glyph-insert nil "-- " "horizontal")
40744061
(push (widget-create-child-and-convert

lisp/emacs-lisp/elint.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -937,7 +937,7 @@ Does basic handling of `featurep' tests."
937937
((and (memq func '(unless or))
938938
(equal test '(featurep (quote emacs)))))
939939
((and (eq func 'if)
940-
(or (null test) ; eg custom-browse-insert-prefix
940+
(or (null test)
941941
(member test '((featurep (quote xemacs))
942942
(not (featurep (quote emacs)))))
943943
(and (eq (car-safe test) 'and)

0 commit comments

Comments
 (0)