From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 16 Jul 2005 17:35:09 +0000 (+0000)
Subject: (reb-cook-regexp): Avoid warning calling lre-compile-string.
X-Git-Tag: emacs-pretest-22.0.90~8095
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5834812aad6d086241b9bdbfc3032189596dc472;p=emacs.git

(reb-cook-regexp): Avoid warning calling lre-compile-string.
(reb-color-display-p): Avoid warning.
---

diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el
index 67a682358f4..9aab41f41dd 100644
--- a/lisp/emacs-lisp/re-builder.el
+++ b/lisp/emacs-lisp/re-builder.el
@@ -319,7 +319,8 @@ Except for Lisp syntax this is the same as `reb-regexp'.")
       ;; emacs/xemacs compatibility
       (if (fboundp 'frame-parameter)
 	  (frame-parameter (selected-frame) 'display-type)
-	(frame-property (selected-frame) 'display-type))))
+	(if (fboundp 'frame-property)
+	    (frame-property (selected-frame) 'display-type)))))
 
 (defsubst reb-lisp-syntax-p ()
   "Return non-nil if RE Builder uses a Lisp syntax."
@@ -610,7 +611,8 @@ optional fourth argument FORCE is non-nil."
 (defun reb-cook-regexp (re)
   "Return RE after processing it according to `reb-re-syntax'."
   (cond ((eq reb-re-syntax 'lisp-re)
-	 (lre-compile-string (eval (car (read-from-string re)))))
+	 (if (fboundp 'lre-compile-string)
+	     (lre-compile-string (eval (car (read-from-string re))))))
 	((eq reb-re-syntax 'sregex)
 	 (apply 'sregex (eval (car (read-from-string re)))))
 	((eq reb-re-syntax 'rx)