diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-11-17 17:52:36 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-11-17 17:52:36 -0800 |
| commit | 2ac9538d674ab0aa937d22b68fef9136ddd904b9 (patch) | |
| tree | 81cf8c6762c0443ca2debe490ecfa7c1e55d2da0 /lisp/emacs-lisp/cl-lib.el | |
| parent | c9ed8e3d2ba6c7d6eda82a39cbfa87729f1ca53e (diff) | |
| parent | 291a654dad6d4604ed4db80885b3af04e64c944f (diff) | |
| download | emacs-2ac9538d674ab0aa937d22b68fef9136ddd904b9.tar.gz | |
Merge from emacs-24; up to 2012-11-15T23:31:37Z!dancol@dancol.org
Diffstat (limited to 'lisp/emacs-lisp/cl-lib.el')
| -rw-r--r-- | lisp/emacs-lisp/cl-lib.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el index bfc63134985..d5e5f4bbfbc 100644 --- a/lisp/emacs-lisp/cl-lib.el +++ b/lisp/emacs-lisp/cl-lib.el @@ -661,7 +661,7 @@ If ALIST is non-nil, the new pairs are prepended to it." (gv-define-setter face-foreground (x f &optional s) `(set-face-foreground ,f ,x ,s)) (gv-define-setter face-underline-p (x f &optional s) - `(set-face-underline-p ,f ,x ,s)) + `(set-face-underline ,f ,x ,s)) (gv-define-simple-setter file-modes set-file-modes t) (gv-define-simple-setter frame-height set-screen-height t) (gv-define-simple-setter frame-parameters modify-frame-parameters t) |