Mercurial > emacs
changeset 64382:c16c027014c6
(reb-cook-regexp): Avoid warning calling lre-compile-string.
(reb-color-display-p): Avoid warning.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 16 Jul 2005 17:35:09 +0000 |
| parents | c25db06be8ca |
| children | 66f4633e319a |
| files | lisp/emacs-lisp/re-builder.el |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/emacs-lisp/re-builder.el Sat Jul 16 17:31:53 2005 +0000 +++ b/lisp/emacs-lisp/re-builder.el Sat Jul 16 17:35:09 2005 +0000 @@ -319,7 +319,8 @@ ;; 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 @@ (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)