From: Glenn Morris <rgm@gnu.org>
Date: Tue, 25 Feb 2014 21:55:45 +0000 (-0500)
Subject: * lisp/emacs-lisp/edebug.el (defmacro): Fix debug spec.
X-Git-Tag: emacs-24.3.90~357^2~7^2~15
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c107155e622fc0ae9a9ed1a3fc0ef6b1b084d6a2;p=emacs.git

* lisp/emacs-lisp/edebug.el (defmacro): Fix debug spec.

Fixes: debbugs:16868
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 67256c588e7..c4ae355bbe5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2014-02-25  Glenn Morris  <rgm@gnu.org>
 
+	* emacs-lisp/edebug.el (defmacro): Fix debug spec.  (Bug#16868)
+
 	* faces.el (tty-setup-hook, tty-run-terminal-initialization): Doc fixes.
 	* startup.el (term-setup-hook): Doc fix.  Make obsolete.
 	* term/sun.el (sun-raw-prefix-hooks):
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index e4bcb4bf294..e2d38ffe858 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -1,7 +1,6 @@
 ;;; edebug.el --- a source-level debugger for Emacs Lisp  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1988-1995, 1997, 1999-2014 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1988-1995, 1997, 1999-2014 Free Software Foundation, Inc.
 
 ;; Author: Daniel LaLiberte <liberte@holonexus.org>
 ;; Maintainer: emacs-devel@gnu.org
@@ -1936,11 +1935,11 @@ expressions; a `progn' form will be returned enclosing these forms."
 	   [&optional stringp]
 	   [&optional ("interactive" interactive)]
 	   def-body))
-;; FIXME? Isn't this missing the doc-string?  Cf defun.
 (def-edebug-spec defmacro
   ;; FIXME: Improve `declare' so we can Edebug gv-expander and
   ;; gv-setter declarations.
-  (&define name lambda-list [&optional ("declare" &rest sexp)] def-body))
+  (&define name lambda-list [&optional stringp]
+           [&optional ("declare" &rest sexp)] def-body))
 
 (def-edebug-spec arglist lambda-list)  ;; deprecated - use lambda-list.