diff options
| author | Miles Bader <miles@gnu.org> | 2006-12-16 01:29:26 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-12-16 01:29:26 +0000 |
| commit | 4bc5d7668ef47295810f28a14d67b4a9e12a341f (patch) | |
| tree | 2e22bd79984f0772c43e294babc07c1508ce95ce /lisp/emacs-lisp/cl-macs.el | |
| parent | b44bfd5e9bf3a0e853bc0d4788e4c89a01a70d6a (diff) | |
| parent | c3342e8eb3eaf4560210fd030383a940640648f2 (diff) | |
| download | emacs-4bc5d7668ef47295810f28a14d67b4a9e12a341f.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 545-562)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- erc-iswitchb: Temporarily enable iswitchb mode
* gnus--rel--5.10 (patch 172-176)
- Merge from emacs--devo--0
- Update from CVS
- Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156
Diffstat (limited to 'lisp/emacs-lisp/cl-macs.el')
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index ab3bfeccfb3..915bde800ee 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -1,6 +1,7 @@ ;;; cl-macs.el --- Common Lisp macros -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1993, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Version: 2.02 @@ -2291,10 +2292,15 @@ copier, a `NAME-p' predicate, and setf-able `NAME-SLOT' accessors. (if (cadr (memq :read-only (cddr desc))) (list 'error (format "%s is a read-only slot" accessor)) - (list 'cl-struct-setf-expander 'cl-x - (list 'quote name) (list 'quote accessor) - (and pred-check (list 'quote pred-check)) - pos))) + ;; If cl is loaded only for compilation, + ;; the call to cl-struct-setf-expander would + ;; cause a warning because it may not be + ;; defined at run time. Suppress that warning. + (list 'with-no-warnings + (list 'cl-struct-setf-expander 'cl-x + (list 'quote name) (list 'quote accessor) + (and pred-check (list 'quote pred-check)) + pos)))) forms) (if print-auto (nconc print-func |