diff options
author | Ulrich Müller <ulm@gentoo.org> | 2009-09-17 12:51:29 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2009-09-17 12:51:29 +0000 |
commit | c81c82039a002f87e51ce89d781c41a588b58d34 (patch) | |
tree | 470c65f6ecc4349308b776376a676c7a1f30b334 | |
parent | Update patch, remove dependency on aclocal.m4 in Makefile. (diff) | |
download | emacs-patches-c81c82039a002f87e51ce89d781c41a588b58d34.tar.gz emacs-patches-c81c82039a002f87e51ce89d781c41a588b58d34.tar.bz2 emacs-patches-c81c82039a002f87e51ce89d781c41a588b58d34.zip |
Patchsets for app-doc/elisp-manual.elisp-manual-21.2.8-patcheselisp-manual-20.2.5-patcheselisp-manual-19.2.4.2-patcheselisp-manual-18.1.03-patches
-rw-r--r-- | elisp-manual/18.1.03/01_all_fix-texinfo.patch | 153 | ||||
-rw-r--r-- | elisp-manual/18.1.03/02_all_direntry.patch | 17 | ||||
-rw-r--r-- | elisp-manual/19.2.4.2/01_all_fix-texinfo.patch | 61 | ||||
-rw-r--r-- | elisp-manual/19.2.4.2/02_all_direntry.patch | 17 | ||||
-rw-r--r-- | elisp-manual/20.2.5/01_all_fix-texinfo.patch | 99 | ||||
-rw-r--r-- | elisp-manual/20.2.5/02_all_direntry.patch | 17 | ||||
-rw-r--r-- | elisp-manual/21.2.8/01_all_fix-texinfo.patch | 83 | ||||
-rw-r--r-- | elisp-manual/21.2.8/02_all_direntry.patch | 17 |
8 files changed, 464 insertions, 0 deletions
diff --git a/elisp-manual/18.1.03/01_all_fix-texinfo.patch b/elisp-manual/18.1.03/01_all_fix-texinfo.patch new file mode 100644 index 0000000..c23c40a --- /dev/null +++ b/elisp-manual/18.1.03/01_all_fix-texinfo.patch @@ -0,0 +1,153 @@ +--- elisp-orig/display.texi ++++ elisp/display.texi +@@ -484,5 +484,5 @@ + + @quotation +-@strong{Note:} in version 18, this function is named ++@strong{Please note:} in version 18, this function is named + @code{blink-paren-hook}, but since it is not called with the standard + convention for hooks, it is being renamed to @code{blink-paren-function} +--- elisp-orig/elisp.texi ++++ elisp/elisp.texi +@@ -112,5 +112,5 @@ + @page + +-@node Top, Introduction, (dir), (dir) ++@node Top, License, (dir), (dir) + + @ifinfo +--- elisp-orig/files.texi ++++ elisp/files.texi +@@ -189,6 +189,6 @@ + appended to get an unused name. See also @ref{Creating Buffers}. + +-@strong{Note:} @code{create-file-buffer} does @emph{not} associate the +-new buffer with a file and does not make it the current buffer. ++@strong{Please note:} @code{create-file-buffer} does @emph{not} associate ++the new buffer with a file and does not make it the current buffer. + + @example +--- elisp-orig/help.texi ++++ elisp/help.texi +@@ -252,6 +252,6 @@ + @end table + +-@strong{Note:} each @samp{\} must be doubled when written in a string in +-Emacs Lisp. ++@strong{Please note:} each @samp{\} must be doubled when written in a ++string in Emacs Lisp. + + Here are examples of the special substrings: +--- elisp-orig/hooks.texi ++++ elisp/hooks.texi +@@ -12,5 +12,5 @@ + + @quotation +-@strong{Note:} in version 19, @code{blink-paren-hook} and ++@strong{Please note:} in version 19, @code{blink-paren-hook} and + @code{auto-fill-hook} are renamed to @code{blink-paren-function} and + @code{auto-fill-function} respectively, since they are not called by the +--- elisp-orig/markers.texi ++++ elisp/markers.texi +@@ -364,6 +364,6 @@ + The old value of the mark is @emph{not} pushed onto the mark ring. + +- @strong{Note:} use this function only if you want the user to see that +-the mark has moved, and you want the previous mark position to be lost. ++ @strong{Please note:} use this function only if you want the user to see ++that the mark has moved, and you want the previous mark position to be lost. + Normally, when a new mark is set, the old one should go on the + @code{mark-ring}, which is why most applications should use +--- elisp-orig/os.texi ++++ elisp/os.texi +@@ -90,5 +90,5 @@ + @end defopt + +-@node Init File, Terminal-Specific, Start-Up Summary, Starting Up ++@node Init File, Terminal-Specific, Start-up Summary, Starting Up + @subsection The Init File: @file{.emacs} + @cindex init file +@@ -688,5 +688,5 @@ + are swapped and the characters @kbd{C-q} and @kbd{C-^} are swapped. + After executing this function, typing @kbd{C-\} has all the usual +-effects of typing @kbd{C-s}, and vice versa. (@xref{Flow Control} for ++effects of typing @kbd{C-s}, and vice versa. (@xref{Flow Control}, for + more information on this subject.) + +@@ -743,6 +743,6 @@ + you will have to start Emacs afresh to make this take effect. + +-@strong{Note:} In version 19, @code{baud-rate} is a variable so that you +-can change it conveniently within Emacs. ++@strong{Please note:} In version 19, @code{baud-rate} is a variable so ++that you can change it conveniently within Emacs. + @end defun + +--- elisp-orig/positions.texi ++++ elisp/positions.texi +@@ -75,5 +75,5 @@ + current buffer. This is @code{(1+ (buffer-size))}, unless narrowing is + in effect, in which case it is the position of the end of the region +-that you narrowed to. (@xref{Narrowing}). ++that you narrowed to. (@xref{Narrowing}.) + @end defun + +@@ -745,5 +745,5 @@ + last of @var{forms}, or @code{nil} if no forms were given. + +-@strong{Note:} it is easy to make a mistake when using ++@strong{Caution:} it is easy to make a mistake when using + @code{save-restriction}. Read the entire description here before you + try it. +--- elisp-orig/processes.texi ++++ elisp/processes.texi +@@ -90,8 +90,8 @@ + supplied to @var{program} as separate command line arguments. Wildcard + characters and other shell constructs are not allowed in these strings, +-since they are passed directly to the specified program. @strong{Note:} +-the argument @var{program} contains only the name of the program; it may +-not contain any command-line arguments. Such arguments must be provided +-via @var{args}. ++since they are passed directly to the specified program. ++@strong{Please note:} the argument @var{program} contains only the name ++of the program; it may not contain any command-line arguments. Such ++arguments must be provided via @var{args}. + + The subprocess gets its current directory from the value of +--- elisp-orig/searching.texi ++++ elisp/searching.texi +@@ -292,10 +292,10 @@ + @end table + +-@strong{Note:} for historical compatibility, special characters are treated as +-ordinary ones if they are in contexts where their special meanings make no +-sense. For example, @samp{*foo} treats @samp{*} as ordinary since there is +-no preceding expression on which the @samp{*} can act. It is poor practice +-to depend on this behavior; better to quote the special character anyway, +-regardless of where it appears.@refill ++@strong{Please note:} for historical compatibility, special characters ++are treated as ordinary ones if they are in contexts where their special ++meanings make no sense. For example, @samp{*foo} treats @samp{*} as ++ordinary since there is no preceding expression on which the @samp{*} ++can act. It is poor practice to depend on this behavior; better to quote ++the special character anyway, regardless of where it appears.@refill + + For the most part, @samp{\} followed by any character matches only +--- elisp-orig/strings.texi ++++ elisp/strings.texi +@@ -621,5 +621,5 @@ + The definition of a word is any sequence of consecutive characters + that are assigned to the word constituent category in the current syntax +-table (@xref{Syntax Class Table}). ++table (@pxref{Syntax Class Table}). + + When the argument to @code{capitalize} is a character, @code{capitalize} +--- elisp-orig/variables.texi ++++ elisp/variables.texi +@@ -425,5 +425,5 @@ + of @var{symbol} to the result, provided @var{value} is given. + +-@strong{Note:} don't use @code{defconst} for user option variables in ++Don't use @code{defconst} for user option variables in + libraries that are not normally loaded. The user should be able to + specify a value for such a variable in the @file{.emacs} file, so that diff --git a/elisp-manual/18.1.03/02_all_direntry.patch b/elisp-manual/18.1.03/02_all_direntry.patch new file mode 100644 index 0000000..4918ada --- /dev/null +++ b/elisp-manual/18.1.03/02_all_direntry.patch @@ -0,0 +1,17 @@ +--- elisp-orig/elisp.texi ++++ elisp/elisp.texi +@@ -1,8 +1,13 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename elisp ++@setfilename elisp18.info + @settitle GNU Emacs Lisp Reference Manual + @c %**end of header + ++@dircategory Emacs ++@direntry ++* Elisp 18: (elisp18). The Emacs Lisp Reference Manual for Emacs 18. ++@end direntry ++ + @c ================================================================ + @c THIS file has the new style title page commands. diff --git a/elisp-manual/19.2.4.2/01_all_fix-texinfo.patch b/elisp-manual/19.2.4.2/01_all_fix-texinfo.patch new file mode 100644 index 0000000..52324ac --- /dev/null +++ b/elisp-manual/19.2.4.2/01_all_fix-texinfo.patch @@ -0,0 +1,61 @@ +--- elisp-manual-19-2.4.2-orig/debugging.texi ++++ elisp-manual-19-2.4.2/debugging.texi +@@ -185,5 +185,5 @@ + @code{debug-on-entry} does nothing. + +- @strong{Note:} if you redefine a function after using ++ @strong{Warning:} if you redefine a function after using + @code{debug-on-entry} on it, the code to enter the debugger is lost. + +--- elisp-manual-19-2.4.2-orig/eval.texi ++++ elisp-manual-19-2.4.2/eval.texi +@@ -110,5 +110,5 @@ + property list. On these occasions, use the @code{eval} function. + +- @strong{Note:} it is generally cleaner and more flexible to call ++ It is generally cleaner and more flexible to call + functions that are stored in data structures, rather than to evaluate + expressions stored in data structures. Using functions provides the +--- elisp-manual-19-2.4.2-orig/os.texi ++++ elisp-manual-19-2.4.2/os.texi +@@ -1307,5 +1307,5 @@ + @kbd{C-s} and @kbd{C-\} and the characters @kbd{C-q} and @kbd{C-^}. + Subsequently, typing @kbd{C-\} has all the usual effects of typing +-@kbd{C-s}, and vice versa. (@xref{Flow Control} for more information on ++@kbd{C-s}, and vice versa. (@xref{Flow Control}, for more information on + this subject.) + +--- elisp-manual-19-2.4.2-orig/positions.texi ++++ elisp-manual-19-2.4.2/positions.texi +@@ -82,5 +82,5 @@ + current buffer. This is @code{(1+ (buffer-size))}, unless narrowing is + in effect, in which case it is the position of the end of the region +-that you narrowed to. (@xref{Narrowing}). ++that you narrowed to. (@xref{Narrowing}.) + @end defun + +--- elisp-manual-19-2.4.2-orig/strings.texi ++++ elisp-manual-19-2.4.2/strings.texi +@@ -703,5 +703,5 @@ + The definition of a word is any sequence of consecutive characters that + are assigned to the word constituent syntax class in the current syntax +-table (@xref{Syntax Class Table}). ++table (@pxref{Syntax Class Table}). + + When the argument to @code{capitalize} is a character, @code{capitalize} +--- elisp-manual-19-2.4.2-orig/variables.texi ++++ elisp-manual-19-2.4.2/variables.texi +@@ -1204,5 +1204,5 @@ + Displays}. + +-@strong{Note:} do not use @code{make-local-variable} for a hook ++@strong{Warning:} do not use @code{make-local-variable} for a hook + variable. Instead, use @code{make-local-hook}. @xref{Hooks}. + @end deffn +@@ -1215,5 +1215,5 @@ + The value returned is @var{variable}. + +-@strong{Note:} It is a mistake to use @code{make-variable-buffer-local} ++@strong{Warning:} It is a mistake to use @code{make-variable-buffer-local} + for user-option variables, simply because users @emph{might} want to + customize them differently in different buffers. Users can make any diff --git a/elisp-manual/19.2.4.2/02_all_direntry.patch b/elisp-manual/19.2.4.2/02_all_direntry.patch new file mode 100644 index 0000000..2c7c332 --- /dev/null +++ b/elisp-manual/19.2.4.2/02_all_direntry.patch @@ -0,0 +1,17 @@ +--- elisp-manual-19-2.4.2-orig/elisp.texi ++++ elisp-manual-19-2.4.2/elisp.texi +@@ -1,8 +1,13 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename elisp ++@setfilename elisp19.info + @settitle GNU Emacs Lisp Reference Manual + @c %**end of header + ++@dircategory Emacs ++@direntry ++* Elisp 19: (elisp19). The Emacs Lisp Reference Manual for Emacs 19. ++@end direntry ++ + @ifinfo + This version is the edition 2.4.2 of the GNU Emacs Lisp diff --git a/elisp-manual/20.2.5/01_all_fix-texinfo.patch b/elisp-manual/20.2.5/01_all_fix-texinfo.patch new file mode 100644 index 0000000..ac509d5 --- /dev/null +++ b/elisp-manual/20.2.5/01_all_fix-texinfo.patch @@ -0,0 +1,99 @@ +--- elisp-manual-20-2.5-orig/commands.texi ++++ elisp-manual-20-2.5/commands.texi +@@ -1924,5 +1924,5 @@ + function. + +-@strong{Note:} Don't bind this variable with @code{let}. It is often ++@strong{Warning:} Don't bind this variable with @code{let}. It is often + buffer-local, and if you bind it around reading input (which is exactly + when you @emph{would} bind it), switching buffers asynchronously while +--- elisp-manual-20-2.5-orig/debugging.texi ++++ elisp-manual-20-2.5/debugging.texi +@@ -215,5 +215,5 @@ + @code{debug-on-entry} always returns @var{function-name}. + +-@strong{Note:} if you redefine a function after using ++@strong{Warning:} if you redefine a function after using + @code{debug-on-entry} on it, the code to enter the debugger is discarded + by the redefinition. In effect, redefining the function cancels +--- elisp-manual-20-2.5-orig/eval.texi ++++ elisp-manual-20-2.5/eval.texi +@@ -589,5 +589,5 @@ + values. Loading a file also does evaluation (@pxref{Loading}). + +- @strong{Note:} it is generally cleaner and more flexible to store a ++ It is generally cleaner and more flexible to store a + function in a data structure, and call it with @code{funcall} or + @code{apply}, than to store an expression in the data structure and +--- elisp-manual-20-2.5-orig/loading.texi ++++ elisp-manual-20-2.5/loading.texi +@@ -148,5 +148,5 @@ + functions should use @code{read}. + +-@strong{Note:} Instead of using this variable, it is cleaner to use ++Instead of using this variable, it is cleaner to use + another, newer feature: to pass the function as the @var{read-function} + argument to @code{eval-region}. @xref{Eval}. +--- elisp-manual-20-2.5-orig/minibuf.texi ++++ elisp-manual-20-2.5/minibuf.texi +@@ -1042,6 +1042,6 @@ + case, point goes at the beginning of @var{initial}. The default for + @var{initial} is @code{nil}---don't insert any file name. To see what +-@var{initial} does, try the command @kbd{C-x C-v}. @strong{Note:} we +-recommend using @var{default} rather than @var{initial} in most cases. ++@var{initial} does, try the command @kbd{C-x C-v}. @strong{Please note:} ++we recommend using @var{default} rather than @var{initial} in most cases. + + Here is an example: +--- elisp-manual-20-2.5-orig/os.texi ++++ elisp-manual-20-2.5/os.texi +@@ -1385,5 +1385,5 @@ + @kbd{C-\} and the characters @kbd{C-q} and @kbd{C-^}. Subsequently, + typing @kbd{C-\} has all the usual effects of typing @kbd{C-s}, and vice +-versa. (@xref{Flow Control} for more information on this subject.) ++versa. (@xref{Flow Control}, for more information on this subject.) + + @cindex flow control example +--- elisp-manual-20-2.5-orig/positions.texi ++++ elisp-manual-20-2.5/positions.texi +@@ -82,5 +82,5 @@ + current buffer. This is @code{(1+ (buffer-size))}, unless narrowing is + in effect, in which case it is the position of the end of the region +-that you narrowed to. (@xref{Narrowing}). ++that you narrowed to. (@xref{Narrowing}.) + @end defun + +--- elisp-manual-20-2.5-orig/strings.texi ++++ elisp-manual-20-2.5/strings.texi +@@ -836,5 +836,5 @@ + The definition of a word is any sequence of consecutive characters that + are assigned to the word constituent syntax class in the current syntax +-table (@xref{Syntax Class Table}). ++table (@pxref{Syntax Class Table}). + + When the argument to @code{capitalize} is a character, @code{capitalize} +@@ -863,5 +863,5 @@ + The definition of a word is any sequence of consecutive characters that + are assigned to the word constituent syntax class in the current syntax +-table (@xref{Syntax Class Table}). ++table (@pxref{Syntax Class Table}). + + @example +--- elisp-manual-20-2.5-orig/text.texi ++++ elisp-manual-20-2.5/text.texi +@@ -3276,5 +3276,5 @@ + the body of a @code{combine-after-change-calls} form. + +-@strong{Note:} If the changes you combine occur in widely scattered ++@strong{Warning:} If the changes you combine occur in widely scattered + parts of the buffer, this will still work, but it is not advisable, + because it may lead to inefficient behavior for some change hook +--- elisp-manual-20-2.5-orig/variables.texi ++++ elisp-manual-20-2.5/variables.texi +@@ -1240,5 +1240,5 @@ + Displays}. + +-@strong{Note:} do not use @code{make-local-variable} for a hook ++@strong{Warning:} do not use @code{make-local-variable} for a hook + variable. Instead, use @code{make-local-hook}. @xref{Hooks}. + @end deffn diff --git a/elisp-manual/20.2.5/02_all_direntry.patch b/elisp-manual/20.2.5/02_all_direntry.patch new file mode 100644 index 0000000..4ee40aa --- /dev/null +++ b/elisp-manual/20.2.5/02_all_direntry.patch @@ -0,0 +1,17 @@ +--- elisp-manual-20-2.5-orig/elisp.texi ++++ elisp-manual-20-2.5/elisp.texi +@@ -1,11 +1,11 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename elisp ++@setfilename elisp20.info + @settitle GNU Emacs Lisp Reference Manual + @c %**end of header + +-@dircategory Editors ++@dircategory Emacs + @direntry +-* Elisp: (elisp). The Emacs Lisp Reference Manual. ++* Elisp 20: (elisp20). The Emacs Lisp Reference Manual for Emacs 20. + @end direntry + diff --git a/elisp-manual/21.2.8/01_all_fix-texinfo.patch b/elisp-manual/21.2.8/01_all_fix-texinfo.patch new file mode 100644 index 0000000..e240886 --- /dev/null +++ b/elisp-manual/21.2.8/01_all_fix-texinfo.patch @@ -0,0 +1,83 @@ +Change all occurences of @strong{Note:} to avoid makeinfo warnings and +spurious cross references. This is a backport of the following change: + +2003-09-26 Richard M. Stallman <rms@gnu.org> + + * buffers.texi, commands.texi, debugging.texi, eval.texi: + * loading.texi, minibuf.texi, text.texi, variables.texi: + Avoid @strong{Note:}. + +--- elisp-orig/buffers.texi ++++ elisp/buffers.texi +@@ -107,5 +107,5 @@ + that, you must use the functions described in @ref{Displaying Buffers}. + +- @strong{Note:} Lisp functions that change to a different current buffer ++ @strong{Warning:} Lisp functions that change to a different current buffer + should not depend on the command loop to set it back afterwards. + Editing commands written in Emacs Lisp can be called from other programs +--- elisp-orig/commands.texi ++++ elisp/commands.texi +@@ -2018,5 +2018,5 @@ + function. + +-@strong{Note:} Don't bind this variable with @code{let}. It is often ++@strong{Warning:} Don't bind this variable with @code{let}. It is often + buffer-local, and if you bind it around reading input (which is exactly + when you @emph{would} bind it), switching buffers asynchronously while +--- elisp-orig/debugging.texi ++++ elisp/debugging.texi +@@ -216,5 +216,5 @@ + @code{debug-on-entry} always returns @var{function-name}. + +-@strong{Note:} if you redefine a function after using ++@strong{Warning:} if you redefine a function after using + @code{debug-on-entry} on it, the code to enter the debugger is discarded + by the redefinition. In effect, redefining the function cancels +--- elisp-orig/eval.texi ++++ elisp/eval.texi +@@ -589,5 +589,5 @@ + values. Loading a file also does evaluation (@pxref{Loading}). + +- @strong{Note:} it is generally cleaner and more flexible to store a ++ It is generally cleaner and more flexible to store a + function in a data structure, and call it with @code{funcall} or + @code{apply}, than to store an expression in the data structure and +--- elisp-orig/loading.texi ++++ elisp/loading.texi +@@ -149,5 +149,5 @@ + functions should use @code{read}. + +-@strong{Note:} Instead of using this variable, it is cleaner to use ++Instead of using this variable, it is cleaner to use + another, newer feature: to pass the function as the @var{read-function} + argument to @code{eval-region}. @xref{Eval}. +--- elisp-orig/minibuf.texi ++++ elisp/minibuf.texi +@@ -1064,6 +1064,6 @@ + case, point goes at the beginning of @var{initial}. The default for + @var{initial} is @code{nil}---don't insert any file name. To see what +-@var{initial} does, try the command @kbd{C-x C-v}. @strong{Note:} we +-recommend using @var{default} rather than @var{initial} in most cases. ++@var{initial} does, try the command @kbd{C-x C-v}. @strong{Please note:} ++we recommend using @var{default} rather than @var{initial} in most cases. + + Here is an example: +--- elisp-orig/text.texi ++++ elisp/text.texi +@@ -3694,5 +3694,5 @@ + the body of a @code{combine-after-change-calls} form. + +-@strong{Note:} If the changes you combine occur in widely scattered ++@strong{Warning:} If the changes you combine occur in widely scattered + parts of the buffer, this will still work, but it is not advisable, + because it may lead to inefficient behavior for some change hook +--- elisp-orig/variables.texi ++++ elisp/variables.texi +@@ -1290,5 +1290,5 @@ + Displays}. + +-@strong{Note:} Do not use @code{make-local-variable} for a hook ++@strong{Warning:} Do not use @code{make-local-variable} for a hook + variable. Instead, use @code{make-local-hook}. @xref{Hooks}. + @end deffn diff --git a/elisp-manual/21.2.8/02_all_direntry.patch b/elisp-manual/21.2.8/02_all_direntry.patch new file mode 100644 index 0000000..baaa6a9 --- /dev/null +++ b/elisp-manual/21.2.8/02_all_direntry.patch @@ -0,0 +1,17 @@ +--- elisp-manual-21-2.8-orig/elisp.texi ++++ elisp-manual-21-2.8/elisp.texi +@@ -1,11 +1,11 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename elisp ++@setfilename elisp21.info + @settitle GNU Emacs Lisp Reference Manual + @c %**end of header + +-@dircategory Editors ++@dircategory Emacs + @direntry +-* Elisp: (elisp). The Emacs Lisp Reference Manual. ++* Elisp 21: (elisp21). The Emacs Lisp Reference Manual for Emacs 21. + @end direntry + |