Merge changes from emacs-24 branch

[gnu-emacs] / doc / lispref / macros.texi

diff --git a/doc/lispref/macros.texi b/doc/lispref/macros.texi
index b87e9f228f3704289a76a3f096125a8cd05cf800..3984e5c03aaee8ce0ee1f54e2eb42b388ed8d6fa 100644 (file)
--- a/doc/lispref/macros.texi
+++ b/doc/lispref/macros.texi
@@ -1,8 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990-1995, 1998, 2001-2012  Free Software Foundation, Inc.
+@c Copyright (C) 1990-1995, 1998, 2001-2012 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
-@setfilename ../../info/macros
 @node Macros, Customization, Functions, Top
 @chapter Macros
 @cindex macros