aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2011-02-16 00:46:13 -0800
committerGlenn Morris2011-02-16 00:46:13 -0800
commitb322c9aff7e794fa82123c6df4775a3887e90176 (patch)
tree3a112df4d32edd677f5191315104c62f719661f9 /doc
parent8678d9e413593b0abab296551a20589745c459da (diff)
downloademacs-b322c9aff7e794fa82123c6df4775a3887e90176.tar.gz
emacs-b322c9aff7e794fa82123c6df4775a3887e90176.zip
Use emacsver.texi in dired-x.texi.
* doc/misc/dired-x.texi: Use emacsver.texi to get Emacs version. * doc/misc/Makefile.in ($(infodir)/dired-x, dired-x.dvi, dired-x.pdf): Depend on emacsver.texi.
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/Makefile.in6
-rw-r--r--doc/misc/dired-x.texi7
3 files changed, 12 insertions, 5 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 21a2a593c2a..4a03caee911 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,5 +1,9 @@
12011-02-16 Glenn Morris <rgm@gnu.org> 12011-02-16 Glenn Morris <rgm@gnu.org>
2 2
3 * dired-x.texi: Use emacsver.texi to get Emacs version.
4 * Makefile.in ($(infodir)/dired-x, dired-x.dvi, dired-x.pdf):
5 Depend on emacsver.texi.
6
3 * dired-x.texi: Drop meaningless version number. 7 * dired-x.texi: Drop meaningless version number.
4 (Introduction): Remove old info. 8 (Introduction): Remove old info.
5 (Optional Installation Dired Jump): Autoload from dired-x. 9 (Optional Installation Dired Jump): Autoload from dired-x.
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 169d6c89b85..0a28d417c70 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -287,12 +287,12 @@ dbus.pdf: ${srcdir}/dbus.texi
287 $(ENVADD) $(TEXI2PDF) $< 287 $(ENVADD) $(TEXI2PDF) $<
288 288
289dired-x : $(infodir)/dired-x 289dired-x : $(infodir)/dired-x
290$(infodir)/dired-x: dired-x.texi 290$(infodir)/dired-x: dired-x.texi $(emacsdir)/emacsver.texi
291 $(mkinfodir) 291 $(mkinfodir)
292 cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< 292 cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $<
293dired-x.dvi: ${srcdir}/dired-x.texi 293dired-x.dvi: ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi
294 $(ENVADD) $(TEXI2DVI) $< 294 $(ENVADD) $(TEXI2DVI) $<
295dired-x.pdf: ${srcdir}/dired-x.texi 295dired-x.pdf: ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi
296 $(ENVADD) $(TEXI2PDF) $< 296 $(ENVADD) $(TEXI2PDF) $<
297 297
298ebrowse : $(infodir)/ebrowse 298ebrowse : $(infodir)/ebrowse
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index 6d2ee8ac872..c16858beffd 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -10,6 +10,8 @@
10@setfilename ../../info/dired-x 10@setfilename ../../info/dired-x
11@settitle Dired Extra User's Manual 11@settitle Dired Extra User's Manual
12 12
13@include emacsver.texi
14
13@iftex 15@iftex
14@finalout 16@finalout
15@end iftex 17@end iftex
@@ -17,7 +19,8 @@
17@comment %**end of header (This is for running Texinfo on a region.) 19@comment %**end of header (This is for running Texinfo on a region.)
18 20
19@copying 21@copying
20Copyright @copyright{} 1994-1995, 1999, 2001-2011 Free Software Foundation, Inc. 22Copyright @copyright{} 1994-1995, 1999, 2001-2011
23Free Software Foundation, Inc.
21 24
22@quotation 25@quotation
23Permission is granted to copy, distribute and/or modify this document 26Permission is granted to copy, distribute and/or modify this document
@@ -79,7 +82,7 @@ provided by the file @file{dired-x.el}.
79Based on @file{dired.texi} by Sebastian Kremer <sk@@thp.uni-koeln.de> 82Based on @file{dired.texi} by Sebastian Kremer <sk@@thp.uni-koeln.de>
80 83
81@item 84@item
82For @file{dired-x.el} as distributed with GNU Emacs 23. 85For @file{dired-x.el} as distributed with GNU Emacs @value{EMACSVER}.
83 86
84@end itemize 87@end itemize
85 88