HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge changes from emacs-23 branch.
[bpt/emacs.git]
/
lisp
/
textmodes
/
makeinfo.el
diff --git
a/lisp/textmodes/makeinfo.el
b/lisp/textmodes/makeinfo.el
index
4bc2786
..
b5f1336
100644
(file)
--- a/
lisp/textmodes/makeinfo.el
+++ b/
lisp/textmodes/makeinfo.el
@@
-1,7
+1,7
@@
;;; makeinfo.el --- run makeinfo conveniently
;;; makeinfo.el --- run makeinfo conveniently
-;; Copyright (C) 1991, 1993, 2001, 2002, 2003, 2004,
-;; 200
5, 2006, 2007
Free Software Foundation, Inc.
+;; Copyright (C) 1991, 1993, 2001, 2002, 2003, 2004,
2005, 2006, 2007,
+;; 200
8, 2009, 2010
Free Software Foundation, Inc.
;; Author: Robert J. Chassell
;; Maintainer: FSF
;; Author: Robert J. Chassell
;; Maintainer: FSF
@@
-9,10
+9,10
@@
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-20,9
+20,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-60,13
+58,13
@@
(defcustom makeinfo-run-command "makeinfo"
(defcustom makeinfo-run-command "makeinfo"
- "
*
Command used to run `makeinfo' subjob.
+ "Command used to run `makeinfo' subjob.
The name of the file is appended to this string, separated by a space."
:type 'string
:group 'makeinfo)
(defcustom makeinfo-options "--fill-column=70"
The name of the file is appended to this string, separated by a space."
:type 'string
:group 'makeinfo)
(defcustom makeinfo-options "--fill-column=70"
- "
*
String containing options for running `makeinfo'.
+ "String containing options for running `makeinfo'.
Do not include `--footnote-style' or `--paragraph-indent';
the proper way to specify those is with the Texinfo commands
`@footnotestyle` and `@paragraphindent'."
Do not include `--footnote-style' or `--paragraph-indent';
the proper way to specify those is with the Texinfo commands
`@footnotestyle` and `@paragraphindent'."
@@
-291,5
+289,5
@@
line LINE of the window, or centered if LINE is nil."
;;; Place `provide' at end of file.
(provide 'makeinfo)
;;; Place `provide' at end of file.
(provide 'makeinfo)
-;;
;
arch-tag: 5f810713-3de2-4e20-8030-4bc3dd0d9604
+;; arch-tag: 5f810713-3de2-4e20-8030-4bc3dd0d9604
;;; makeinfo.el ends here
;;; makeinfo.el ends here