diff options
| author | Miles Bader <miles@gnu.org> | 2005-07-22 08:27:27 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-07-22 08:27:27 +0000 |
| commit | 3674ae2f87e47a654524af689ea610ee3edeaca7 (patch) | |
| tree | 58ea33c40c8521a79fb503080b8bb6231ffbf579 /lisp/emacs-lisp/re-builder.el | |
| parent | 3e03f554f116e04ba860dcde7c6d862939911e16 (diff) | |
| parent | 7929f858f8897f0448771a471f8afc5f244e4bca (diff) | |
| download | emacs-3674ae2f87e47a654524af689ea610ee3edeaca7.tar.gz emacs-3674ae2f87e47a654524af689ea610ee3edeaca7.tar.bz2 emacs-3674ae2f87e47a654524af689ea610ee3edeaca7.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-71
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 485-492)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 92-94)
- Merge from emacs--cvs-trunk--0
- Update from CVS
Diffstat (limited to 'lisp/emacs-lisp/re-builder.el')
| -rw-r--r-- | lisp/emacs-lisp/re-builder.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el index 67a682358f4..bdfe79b3b6a 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." @@ -331,10 +332,7 @@ Except for Lisp syntax this is the same as `reb-regexp'.") ;;; This is to help people find this in Apropos. ;;;###autoload -(defun regexp-builder () - "Alias for `re-builder': Construct a regexp interactively." - (interactive) - (re-builder)) +(defalias 'regexp-builder 're-builder) ;;;###autoload (defun re-builder () @@ -610,7 +608,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) |