aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-02-25 16:55:45 -0500
committerGlenn Morris2014-02-25 16:55:45 -0500
commitc107155e622fc0ae9a9ed1a3fc0ef6b1b084d6a2 (patch)
treee1550292ce8bcf15bee9685858dea6ad37d8fc46
parentcc587404052a60d3d4c4bc542d5618e43e8b44ab (diff)
downloademacs-c107155e622fc0ae9a9ed1a3fc0ef6b1b084d6a2.tar.gz
emacs-c107155e622fc0ae9a9ed1a3fc0ef6b1b084d6a2.zip
* lisp/emacs-lisp/edebug.el (defmacro): Fix debug spec.
Fixes: debbugs:16868
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/emacs-lisp/edebug.el7
2 files changed, 5 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 67256c588e7..c4ae355bbe5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12014-02-25 Glenn Morris <rgm@gnu.org> 12014-02-25 Glenn Morris <rgm@gnu.org>
2 2
3 * emacs-lisp/edebug.el (defmacro): Fix debug spec. (Bug#16868)
4
3 * faces.el (tty-setup-hook, tty-run-terminal-initialization): Doc fixes. 5 * faces.el (tty-setup-hook, tty-run-terminal-initialization): Doc fixes.
4 * startup.el (term-setup-hook): Doc fix. Make obsolete. 6 * startup.el (term-setup-hook): Doc fix. Make obsolete.
5 * term/sun.el (sun-raw-prefix-hooks): 7 * 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 @@
1;;; edebug.el --- a source-level debugger for Emacs Lisp -*- lexical-binding: t -*- 1;;; edebug.el --- a source-level debugger for Emacs Lisp -*- lexical-binding: t -*-
2 2
3;; Copyright (C) 1988-1995, 1997, 1999-2014 Free Software Foundation, 3;; Copyright (C) 1988-1995, 1997, 1999-2014 Free Software Foundation, Inc.
4;; Inc.
5 4
6;; Author: Daniel LaLiberte <liberte@holonexus.org> 5;; Author: Daniel LaLiberte <liberte@holonexus.org>
7;; Maintainer: emacs-devel@gnu.org 6;; Maintainer: emacs-devel@gnu.org
@@ -1936,11 +1935,11 @@ expressions; a `progn' form will be returned enclosing these forms."
1936 [&optional stringp] 1935 [&optional stringp]
1937 [&optional ("interactive" interactive)] 1936 [&optional ("interactive" interactive)]
1938 def-body)) 1937 def-body))
1939;; FIXME? Isn't this missing the doc-string? Cf defun.
1940(def-edebug-spec defmacro 1938(def-edebug-spec defmacro
1941 ;; FIXME: Improve `declare' so we can Edebug gv-expander and 1939 ;; FIXME: Improve `declare' so we can Edebug gv-expander and
1942 ;; gv-setter declarations. 1940 ;; gv-setter declarations.
1943 (&define name lambda-list [&optional ("declare" &rest sexp)] def-body)) 1941 (&define name lambda-list [&optional stringp]
1942 [&optional ("declare" &rest sexp)] def-body))
1944 1943
1945(def-edebug-spec arglist lambda-list) ;; deprecated - use lambda-list. 1944(def-edebug-spec arglist lambda-list) ;; deprecated - use lambda-list.
1946 1945