[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/re-builder.el

[Richard M . Stallman]

Index: emacs/lisp/emacs-lisp/re-builder.el
diff -c emacs/lisp/emacs-lisp/re-builder.el:1.24 
emacs/lisp/emacs-lisp/re-builder.el:1.25
*** emacs/lisp/emacs-lisp/re-builder.el:1.24    Mon Jul  4 17:33:35 2005
--- emacs/lisp/emacs-lisp/re-builder.el Sat Jul 16 17:35:09 2005
***************
*** 319,325 ****
        ;; emacs/xemacs compatibility
        (if (fboundp 'frame-parameter)
          (frame-parameter (selected-frame) 'display-type)
!       (frame-property (selected-frame) 'display-type))))
  
  (defsubst reb-lisp-syntax-p ()
    "Return non-nil if RE Builder uses a Lisp syntax."
--- 319,326 ----
        ;; emacs/xemacs compatibility
        (if (fboundp 'frame-parameter)
          (frame-parameter (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,616 ****
  (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)))))
        ((eq reb-re-syntax 'sregex)
         (apply 'sregex (eval (car (read-from-string re)))))
        ((eq reb-re-syntax 'rx)
--- 611,618 ----
  (defun reb-cook-regexp (re)
    "Return RE after processing it according to `reb-re-syntax'."
    (cond ((eq reb-re-syntax 'lisp-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)