Merge from emacs-24; up to 2012-12-06T07:33:20Z!rgm@gnu.org
This commit is contained in:
commit
0a8bf3afca
47 changed files with 64 additions and 41 deletions
|
@ -199,7 +199,13 @@ The return value is undefined.
|
|||
(memq (car x) ;C.f. cl-do-proclaim.
|
||||
'(special inline notinline optimize warn)))
|
||||
(push (list 'declare x)
|
||||
(if (stringp docstring) (cdr body) body))
|
||||
(if (stringp docstring)
|
||||
(if (eq (car-safe (cadr body)) 'interactive)
|
||||
(cddr body)
|
||||
(cdr body))
|
||||
(if (eq (car-safe (car body)) 'interactive)
|
||||
(cdr body)
|
||||
body)))
|
||||
nil)
|
||||
(t (message "Warning: Unknown defun property `%S' in %S"
|
||||
(car x) name)))))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue