From: shuhei <shuhei>
Date: Fri, 12 Nov 1999 12:13:42 +0000 (+0000)
Subject: [old custom]: Refer to README.
X-Git-Tag: apel-shubit-10_0~33
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acd2aff931d1b341cf26c52ca4434b664757a710;p=elisp%2Fapel.git

[old custom]: Refer to README.
---

diff --git a/pcustom.el b/pcustom.el
index 28a9321..2ecd6b7 100644
--- a/pcustom.el
+++ b/pcustom.el
@@ -33,26 +33,17 @@
 
 (static-if (condition-case nil
 	       ;; compile-time check.
-	       ;; "new custom" requires widget library.
-	       (and (require 'widget)
-		    (require 'custom)
-		    (fboundp 'custom-declare-variable))
-	     (error
-	      (if (null (featurep 'pcustom))
-		  (progn
-		    (message "
-  ** New CUSTOM library is not detected.  If you have that one, e.g. v1.9962,
-  ** please specify the installed path of the new CUSTOM library in the file
-  ** \"subdirs.el\" and rebuild this package.  For example, if you have
-  ** installed it in \"/usr/local/share/emacs/site-lisp/custom/\", put the
-  ** following line in the file \"/usr/local/share/emacs/site-lisp/subdirs.el\".
-  **
-  **   (normal-top-level-add-to-load-path '(\"custom\"))
-  **
-  ** Note that the argument can be a list of subdirectories.
-")
-		    (sleep-for 1)))
-	      nil))
+	       (if (and (require 'custom)
+			(fboundp 'custom-declare-variable))
+		   ;; you have "new custom".
+		   t
+		 ;; you have custom, but it is "old".
+		 (message "\
+  ** \"old custom\" is loaded.  See README if you want to use \"new custom\".")
+		 (sleep-for 1)
+		 nil)
+	     ;; you don't have custom.
+	     (error nil))
     ;; you have "new custom". no load-time check.
     (require 'custom)
   ;; your custom is "old custom",