diff options
| author | Xue Fuqiao <xfq.free@gmail.com> | 2013-08-04 10:59:08 +0800 |
|---|---|---|
| committer | Xue Fuqiao <xfq.free@gmail.com> | 2013-08-04 10:59:08 +0800 |
| commit | 99191b89ff64172740add88e67f163619a07830c (patch) | |
| tree | 828d1ac7c917076703b9d4a3746ff7480bd97f0d /lisp/emacs-lisp/re-builder.el | |
| parent | ab419665caa6e2ad7465cf59ef902cc4ad1d2117 (diff) | |
| parent | 2ad0a067728ccc7f8b32b0c3db1677ca351943fe (diff) | |
| download | emacs-99191b89ff64172740add88e67f163619a07830c.tar.gz emacs-99191b89ff64172740add88e67f163619a07830c.tar.bz2 emacs-99191b89ff64172740add88e67f163619a07830c.zip | |
Merge from mainline.
Diffstat (limited to 'lisp/emacs-lisp/re-builder.el')
| -rw-r--r-- | lisp/emacs-lisp/re-builder.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el index 9b73bea065f..d463bfac412 100644 --- a/lisp/emacs-lisp/re-builder.el +++ b/lisp/emacs-lisp/re-builder.el @@ -319,7 +319,7 @@ Except for Lisp syntax this is the same as `reb-regexp'.") (eq 'color ;; emacs/xemacs compatibility (if (fboundp 'frame-parameter) - (frame-parameter (selected-frame) 'display-type) + (frame-parameter nil 'display-type) (if (fboundp 'frame-property) (frame-property (selected-frame) 'display-type))))) |