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.

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index f87b6b621c18160293c521a6b07b88cb3192f125..6d47e607ae6a30692a28070256166ae66c2fe66c 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1827,20 +1827,9 @@ item in another window.\n\n"))
                              (" `-" "bottom")))
 
 (defun custom-browse-insert-prefix (prefix)
-  "Insert PREFIX.  On XEmacs convert it to line graphics."
-  ;; Fixme: do graphics.
-  (if nil ; (featurep 'xemacs)
-      (progn
-       (insert "*")
-       (while (not (string-equal prefix ""))
-         (let ((entry (substring prefix 0 3)))
-           (setq prefix (substring prefix 3))
-           (let ((overlay (make-overlay (1- (point)) (point) nil t nil))
-                 (name (nth 1 (assoc entry custom-browse-alist))))
-             (overlay-put overlay 'end-glyph (widget-glyph-find name entry))
-             (overlay-put overlay 'start-open t)
-             (overlay-put overlay 'end-open t)))))
-    (insert prefix)))
+  "Insert PREFIX."
+  (declare (obsolete insert "27.1"))
+  (insert prefix))
 
 ;;; Modification of Basic Widgets.
 ;;
@@ -4043,7 +4032,7 @@ If GROUPS-ONLY is non-nil, return only those members that are groups."
     (cond ((and (eq custom-buffer-style 'tree)
                (eq state 'hidden)
                (or members (custom-unloaded-widget-p widget)))
-          (custom-browse-insert-prefix prefix)
+          (insert prefix)
           (push (widget-create-child-and-convert
                  widget 'custom-browse-visibility
                  :tag "+")
@@ -4056,19 +4045,17 @@ If GROUPS-ONLY is non-nil, return only those members that are groups."
           (widget-put widget :buttons buttons))
          ((and (eq custom-buffer-style 'tree)
                (zerop (length members)))
-          (custom-browse-insert-prefix prefix)
-          (insert "[ ]-- ")
+          (insert prefix "[ ]-- ")
           (push (widget-create-child-and-convert
                  widget 'custom-browse-group-tag)
                 buttons)
           (insert " " tag "\n")
           (widget-put widget :buttons buttons))
          ((eq custom-buffer-style 'tree)
-          (custom-browse-insert-prefix prefix)
+          (insert prefix)
           (if (zerop (length members))
               (progn
-                (custom-browse-insert-prefix prefix)
-                (insert "[ ]-- ")
+                (insert prefix "[ ]-- ")
                 ;; (widget-glyph-insert nil "[ ]" "empty")
                 ;; (widget-glyph-insert nil "-- " "horizontal")
                 (push (widget-create-child-and-convert

diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el
index 3f49b51acdd081f56ddfe8d37d2f6bc45a472514..4a53972016865d4897a023f4142ba6b183923db9 100644 (file)
--- a/lisp/emacs-lisp/elint.el
+++ b/lisp/emacs-lisp/elint.el
@@ -937,7 +937,7 @@ Does basic handling of `featurep' tests."
          ((and (memq func '(unless or))
                (equal test '(featurep (quote emacs)))))
          ((and (eq func 'if)
-               (or (null test)       ; eg custom-browse-insert-prefix
+               (or (null test)
                    (member test '((featurep (quote xemacs))
                                   (not (featurep (quote emacs)))))
                    (and (eq (car-safe test) 'and)