diff options
| author | Richard M. Stallman <rms@gnu.org> | 2005-07-16 17:35:09 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 2005-07-16 17:35:09 +0000 |
| commit | 5834812aad6d086241b9bdbfc3032189596dc472 (patch) | |
| tree | a9d1ddf5ca782f85d1a54228fe794a9b56ac3e59 /lisp/emacs-lisp | |
| parent | d88757d61b84855d9860155c424ab6bfdcf5a77d (diff) | |
| download | emacs-5834812aad6d086241b9bdbfc3032189596dc472.tar.gz emacs-5834812aad6d086241b9bdbfc3032189596dc472.tar.bz2 emacs-5834812aad6d086241b9bdbfc3032189596dc472.zip | |
(reb-cook-regexp): Avoid warning calling lre-compile-string.
(reb-color-display-p): Avoid warning.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/re-builder.el | 6 |
1 files changed, 4 insertions, 2 deletions
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) |