aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispref/elisp.texi
diff options
context:
space:
mode:
authorStefan Monnier2011-03-21 12:42:16 -0400
committerStefan Monnier2011-03-21 12:42:16 -0400
commitcafdcef32d55cbb44389d7e322e7f973cbb72dfd (patch)
tree7ee0c41ea8a589650ce6f4311fb10e61a63807b9 /doc/lispref/elisp.texi
parenta08a25d7aaf251aa18f2ef747be53734bc55cae9 (diff)
parent4e05e67e4cd0bc1b0a4ef3176a4d0d91c6b3738e (diff)
downloademacs-cafdcef32d55cbb44389d7e322e7f973cbb72dfd.tar.gz
emacs-cafdcef32d55cbb44389d7e322e7f973cbb72dfd.zip
Merge from trunk
Diffstat (limited to 'doc/lispref/elisp.texi')
-rw-r--r--doc/lispref/elisp.texi2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index fc066526614..69c50ba42be 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -62,6 +62,8 @@ developing GNU and promoting software freedom.''
62@end quotation 62@end quotation
63@end copying 63@end copying
64 64
65@documentencoding ISO-8859-1
66
65@dircategory GNU Emacs Lisp 67@dircategory GNU Emacs Lisp
66@direntry 68@direntry
67* Elisp: (elisp). The Emacs Lisp Reference Manual. 69* Elisp: (elisp). The Emacs Lisp Reference Manual.