Mercurial > emacs
changeset 80908:0d313b9a7e36
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 14-15)
- Update from CVS
2007-05-12 Richard Stallman <rms@gnu.org>
* etc/refcard.tex (section{Incremental Search}): Minor corrections.
2007-05-12 Richard Stallman <rms@gnu.org>
* lispref/text.texi (Margins): indent-to-left-margin is not the default.
(Mode-Specific Indent): For indent-line-function, the default
is indent-relative.
* lispref/modes.texi (Example Major Modes): Explain last line of text-mode
is redundant.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-746
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sun, 13 May 2007 01:31:05 +0000 |
| parents | cb616238ccb2 (current diff) 53803ddaa8b6 (diff) |
| children | d9b6000ffa53 |
| files | admin/FOR-RELEASE etc/ChangeLog etc/NEWS lispref/ChangeLog lispref/text.texi src/ChangeLog |
| diffstat | 8 files changed, 31 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/admin/FOR-RELEASE Sat May 12 23:55:51 2007 +0000 +++ b/admin/FOR-RELEASE Sun May 13 01:31:05 2007 +0000 @@ -56,9 +56,9 @@ ** Takaaki.Ota@am.sony.com, May 2: table cell menu does not appear at the menubar Bug is intermittent. -** Install python.el `with' patch from trunk. +** Install vc-hooks.el patch from trunk. -** Install vc-hooks.el patch from trunk. +** Move some items from magic-mode-alist to file-start-mode-alist. * DOCUMENTATION
--- a/etc/ChangeLog Sat May 12 23:55:51 2007 +0000 +++ b/etc/ChangeLog Sun May 13 01:31:05 2007 +0000 @@ -1,3 +1,7 @@ +2007-05-12 Richard Stallman <rms@gnu.org> + + * refcard.tex (section{Incremental Search}): Minor corrections. + 2007-05-12 Micha,Ak(Bl Cadilhac <michael@cadilhac.name> * Makefile (viperCard.ps, calccard.ps refcard.ps)
--- a/etc/NEWS Sat May 12 23:55:51 2007 +0000 +++ b/etc/NEWS Sun May 13 01:31:05 2007 +0000 @@ -357,7 +357,7 @@ ** The default values of paragraph-start and indent-line-function have been changed to reflect those used in Text mode rather than those used -in Indented-Text mode. +in Paragraph-Indent Text mode. ** The default for the paper size (variable ps-paper-type) is taken from the locale. @@ -5015,7 +5015,7 @@ *** New variable `file-start-mode-alist' determines major mode for a file by looking at the file contents. It is handled after `auto-mode-alist', -only if `auto-mode-alist' says nothing about the file. +only if `auto-mode-alist' (and `magic-mode-alist') says nothing about the file. *** XML or SGML major mode is selected when file starts with an `<?xml' or `<!DOCTYPE' declaration.
--- a/etc/refcard.tex Sat May 12 23:55:51 2007 +0000 +++ b/etc/refcard.tex Sun May 13 01:31:05 2007 +0000 @@ -330,7 +330,7 @@ \key{abort current search}{C-g} Use \kbd{C-s} or \kbd{C-r} again to repeat the search in either direction. -If Emacs is still searching, \kbd{C-g} cancels only the part not done. +If Emacs is still searching, \kbd{C-g} cancels only the part not matched. \shortcopyrightnotice @@ -478,7 +478,7 @@ \key{abort command}{C-g} Type \kbd{C-x ESC ESC} to edit and repeat the last command that used the -minibuffer. Type \kbd{F10} to activate the menu bar using the minibuffer. +minibuffer. Type \kbd{F10} to activate menu bar items on text terminals. \newcolumn \title{GNU Emacs Reference Card} @@ -657,7 +657,7 @@ \beginexample% (defun this-line-to-top-of-window (line) - "Reposition line point is on to top of window. + "Reposition current line to top of window. With ARG, put point on line ARG." (interactive "P") (recenter (if (null line)
--- a/lispref/ChangeLog Sat May 12 23:55:51 2007 +0000 +++ b/lispref/ChangeLog Sun May 13 01:31:05 2007 +0000 @@ -1,3 +1,12 @@ +2007-05-12 Richard Stallman <rms@gnu.org> + + * text.texi (Margins): indent-to-left-margin is not the default. + (Mode-Specific Indent): For indent-line-function, the default + is indent-relative. + + * modes.texi (Example Major Modes): Explain last line of text-mode + is redundant. + 2007-05-10 Richard Stallman <rms@gnu.org> * keymaps.texi (Scanning Keymaps): Update where-is-internal example.
--- a/lispref/modes.texi Sat May 12 23:55:51 2007 +0000 +++ b/lispref/modes.texi Sun May 13 01:31:05 2007 +0000 @@ -956,7 +956,11 @@ @end group @end smallexample - But here is how it was defined formerly, before +@noindent +(The last line is redundant nowadays, since @code{indent-relative} is +the default value, and we'll delete it in a future version.) + + Here is how it was defined formerly, before @code{define-derived-mode} existed: @smallexample
--- a/lispref/text.texi Sat May 12 23:55:51 2007 +0000 +++ b/lispref/text.texi Sun May 13 01:31:05 2007 +0000 @@ -1655,11 +1655,10 @@ @end defun @defun indent-to-left-margin -This is the default @code{indent-line-function}, used in Fundamental -mode, Text mode, etc. Its effect is to adjust the indentation at the -beginning of the current line to the value specified by the variable -@code{left-margin}. This may involve either inserting or deleting -whitespace. +This function adjusts the indentation at the beginning of the current +line to the value specified by the variable @code{left-margin}. (That +may involve either inserting or deleting whitespace.) This function +is value of @code{indent-line-function} in Paragraph-Indent Text mode. @end defun @defvar left-margin @@ -2199,9 +2198,7 @@ In Lisp mode, the value is the symbol @code{lisp-indent-line}; in C mode, @code{c-indent-line}; in Fortran mode, @code{fortran-indent-line}. -In Fundamental mode, Text mode, and many other modes with no standard -for indentation, the value is @code{indent-to-left-margin} (which is the -default value). +The default value is @code{indent-relative}. @end defvar @deffn Command indent-according-to-mode
--- a/src/ChangeLog Sat May 12 23:55:51 2007 +0000 +++ b/src/ChangeLog Sun May 13 01:31:05 2007 +0000 @@ -2,8 +2,7 @@ * image.c (pbm_load): Correctly check image size for greyscale pbm. - * xterm.c (XTread_socket): Yet another uncaught X error - crash (YAUXEC). + * xterm.c (XTread_socket): Yet Another Uncaught X Error Crash (YAUXEC). 2007-05-07 Stefan Monnier <monnier@iro.umontreal.ca>