/[emacs]/emacs/lisp/emacs-lisp/re-builder.el
ViewVC logotype

Diff of /emacs/lisp/emacs-lisp/re-builder.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.24 by lute, Mon Jul 4 17:33:35 2005 UTC revision 1.25 by rms, Sat Jul 16 17:35:09 2005 UTC
# Line 319  Except for Lisp syntax this is the same Line 319  Except for Lisp syntax this is the same
319        ;; emacs/xemacs compatibility        ;; emacs/xemacs compatibility
320        (if (fboundp 'frame-parameter)        (if (fboundp 'frame-parameter)
321            (frame-parameter (selected-frame) 'display-type)            (frame-parameter (selected-frame) 'display-type)
322          (frame-property (selected-frame) 'display-type))))          (if (fboundp 'frame-property)
323                (frame-property (selected-frame) 'display-type)))))
324    
325  (defsubst reb-lisp-syntax-p ()  (defsubst reb-lisp-syntax-p ()
326    "Return non-nil if RE Builder uses a Lisp syntax."    "Return non-nil if RE Builder uses a Lisp syntax."
# Line 610  optional fourth argument FORCE is non-ni Line 611  optional fourth argument FORCE is non-ni
611  (defun reb-cook-regexp (re)  (defun reb-cook-regexp (re)
612    "Return RE after processing it according to `reb-re-syntax'."    "Return RE after processing it according to `reb-re-syntax'."
613    (cond ((eq reb-re-syntax 'lisp-re)    (cond ((eq reb-re-syntax 'lisp-re)
614           (lre-compile-string (eval (car (read-from-string re)))))           (if (fboundp 'lre-compile-string)
615                 (lre-compile-string (eval (car (read-from-string re))))))
616          ((eq reb-re-syntax 'sregex)          ((eq reb-re-syntax 'sregex)
617           (apply 'sregex (eval (car (read-from-string re)))))           (apply 'sregex (eval (car (read-from-string re)))))
618          ((eq reb-re-syntax 'rx)          ((eq reb-re-syntax 'rx)

Legend:
Removed from v.1.24  
changed lines
  Added in v.1.25

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26