diff options
author | Miles Bader <[email protected]> | 2007-05-11 04:44:30 +0000 |
---|---|---|
committer | Miles Bader <[email protected]> | 2007-05-11 04:44:30 +0000 |
commit | 68380acf41d91014634d625e5f529cd3f773fbd4 (patch) | |
tree | 8285c9f7ccc674484bb1d945192c5e2441ac81d6 /lispref | |
parent | e2e7506851231cb87c2e025dc8ba06ad95053de9 (diff) | |
parent | a484846f80a3adae6f85b6fb897a6ae9887b32fb (diff) |
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 13)
- Update from CVS
2007-05-10 Richard M. Stallman <[email protected]>
* lisp/international/iso-cvt.el (iso-cvt-read-only): Ignore arguments.
(iso-cvt-write-only): Likewise.
* lisp/emacs-lisp/easy-mmode.el (define-minor-mode):
Fix generated doc string.
* lisp/startup.el (fancy-splash-text): Add URL of guided tour.
Adjust horizontal and vertical whitespace.
* lisp/progmodes/compile.el (compilation-handle-exit):
Use run-hook-with-args to run compilation-finish-functions.
* lisp/files.el (file-start-mode-alist): New variable.
(magic-mode-regexp-match-limit): Doc fix.
(set-auto-mode): Handle file-start-mode-alist.
A little cleanup of structure.
2007-05-10 Richard M. Stallman <[email protected]>
* lispref/keymaps.texi (Scanning Keymaps): Update where-is-internal example.
* lispref/help.texi (Keys in Documentation): Add reference to
Documentation Tips.
* lispref/files.texi (Format Conversion): TO-FN gets three arguments.
* lispref/modes.texi (Auto Major Mode): Document file-start-mode-alist.
Revision: [email protected]/emacs--devo--0--patch-743
Diffstat (limited to 'lispref')
-rw-r--r-- | lispref/ChangeLog | 11 | ||||
-rw-r--r-- | lispref/files.texi | 7 | ||||
-rw-r--r-- | lispref/help.texi | 4 | ||||
-rw-r--r-- | lispref/keymaps.texi | 3 | ||||
-rw-r--r-- | lispref/modes.texi | 5 |
5 files changed, 26 insertions, 4 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 5d340be781..cb82432328 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,14 @@ +2007-05-10 Richard Stallman <[email protected]> + + * keymaps.texi (Scanning Keymaps): Update where-is-internal example. + + * help.texi (Keys in Documentation): Add reference to + Documentation Tips. + + * files.texi (Format Conversion): TO-FN gets three arguments. + + * modes.texi (Auto Major Mode): Document file-start-mode-alist. + 2007-05-10 Thien-Thi Nguyen <[email protected]> * elisp.texi (Top): Remove "Saving Properties" from detailed menu. diff --git a/lispref/files.texi b/lispref/files.texi index 1df6aead19..19bacb142e 100644 --- a/lispref/files.texi +++ b/lispref/files.texi @@ -2903,9 +2903,10 @@ convert the usual Emacs data representation into this format. If @var{to-fn} is a string, it is a shell command; Emacs runs the command as a filter to perform the conversion. -If @var{to-fn} is a function, it is called with two arguments, @var{begin} -and @var{end}, which specify the part of the buffer it should convert. -There are two ways it can do the conversion: +If @var{to-fn} is a function, it is called with three arguments: +@var{begin} and @var{end}, which specify the part of the buffer it +should convert, and @var{buffer}, which specifies which buffer. There +are two ways it can do the conversion: @itemize @bullet @item diff --git a/lispref/help.texi b/lispref/help.texi index 70c7a48c9c..dd56aa872b 100644 --- a/lispref/help.texi +++ b/lispref/help.texi @@ -384,6 +384,10 @@ C-g abort-recursive-edit @end group @end smallexample + There are other special conventions for the text in documentation +strings---for instance, you can refer to functions, variables, and +sections of this manual. @xref{Documentation Tips}, for details. + @node Describing Characters @section Describing Characters for Help Messages @cindex describe characters and events diff --git a/lispref/keymaps.texi b/lispref/keymaps.texi index 88b312d227..400a2c3824 100644 --- a/lispref/keymaps.texi +++ b/lispref/keymaps.texi @@ -1895,7 +1895,8 @@ other command. However, if @var{no-remap} is non-@code{nil}. @smallexample @group (where-is-internal 'describe-function) - @result{} ("\^hf" "\^hd") + @result{} ([8 102] [f1 102] [help 102] + [menu-bar help-menu describe describe-function]) @end group @end smallexample @end defun diff --git a/lispref/modes.texi b/lispref/modes.texi index 5d91b238fc..56fb43a0c3 100644 --- a/lispref/modes.texi +++ b/lispref/modes.texi @@ -616,6 +616,11 @@ the text at the beginning of the buffer matches @var{regexp} and @code{auto-mode-alist} gets to decide the mode. @end defvar +@defvar file-start-mode-alist +This works like @code{magic-mode-alist}, except that it is handled +only if @code{auto-mode-alist} does not specify a mode for this file. +@end defvar + @defvar auto-mode-alist This variable contains an association list of file name patterns (regular expressions) and corresponding major mode commands. Usually, |