diff options
| author | Karoly Lorentey | 2005-11-01 06:23:08 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-11-01 06:23:08 +0000 |
| commit | cd0cf71c4f41023a8d9c20b3a26e44b980992b5a (patch) | |
| tree | b763cfec551254e2228335be4e218ed7a9a19109 /lispref | |
| parent | c40bb1ba81a5df164f0b9b61e3480c55808717b7 (diff) | |
| parent | 895725e10c0fb68ed21abb48183cc8843bcaadf3 (diff) | |
| download | emacs-cd0cf71c4f41023a8d9c20b3a26e44b980992b5a.tar.gz emacs-cd0cf71c4f41023a8d9c20b3a26e44b980992b5a.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 142-148, 615-628)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-616
Add lisp/mh-e/.arch-inventory
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-617
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-618
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-619
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-620
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-621
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-622
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-623
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-624
Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords.
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-625
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-626
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-627
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-628
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-142
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-143
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-144
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-145
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-146
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-147
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-148
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-435
Diffstat (limited to 'lispref')
| -rw-r--r-- | lispref/ChangeLog | 18 | ||||
| -rw-r--r-- | lispref/display.texi | 9 | ||||
| -rw-r--r-- | lispref/internals.texi | 12 | ||||
| -rw-r--r-- | lispref/minibuf.texi | 14 |
4 files changed, 47 insertions, 6 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog index c19b0e1521b..8c8a75734ae 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog | |||
| @@ -1,3 +1,21 @@ | |||
| 1 | 2005-10-27 Masatake YAMATO <jet@gyve.org> | ||
| 2 | |||
| 3 | * minibuf.texi (Completion Commands): | ||
| 4 | Write about new optional argument for `display-completion-list'. | ||
| 5 | |||
| 6 | 2005-10-23 Richard M. Stallman <rms@gnu.org> | ||
| 7 | |||
| 8 | * display.texi (Overlay Arrow): Clarify about local bindings of | ||
| 9 | overlay-arrow-position. | ||
| 10 | |||
| 11 | 2005-10-22 Eli Zaretskii <eliz@gnu.org> | ||
| 12 | |||
| 13 | * internals.texi (Building Emacs): Fix last change. | ||
| 14 | |||
| 15 | 2005-10-22 Richard M. Stallman <rms@gnu.org> | ||
| 16 | |||
| 17 | * internals.texi (Building Emacs): Document eval-at-startup. | ||
| 18 | |||
| 1 | 2005-10-21 Richard M. Stallman <rms@gnu.org> | 19 | 2005-10-21 Richard M. Stallman <rms@gnu.org> |
| 2 | 20 | ||
| 3 | * loading.texi (Where Defined): load-history contains abs file names. | 21 | * loading.texi (Where Defined): load-history contains abs file names. |
diff --git a/lispref/display.texi b/lispref/display.texi index ba27b900cdb..75a64924516 100644 --- a/lispref/display.texi +++ b/lispref/display.texi | |||
| @@ -2922,9 +2922,12 @@ otherwise appear. Since the arrow is usually short, and the line | |||
| 2922 | usually begins with indentation, normally nothing significant is | 2922 | usually begins with indentation, normally nothing significant is |
| 2923 | overwritten. | 2923 | overwritten. |
| 2924 | 2924 | ||
| 2925 | The overlay string is displayed only in the buffer that this marker | 2925 | The overlay-arrow string is displayed in any given buffer if the value |
| 2926 | points into. Thus, only one buffer can have an overlay arrow at any | 2926 | of @code{overlay-arrow-position} in that buffer points into that |
| 2927 | given time. | 2927 | buffer. Thus, it works to can display multiple overlay arrow strings |
| 2928 | by creating buffer-local bindings of @code{overlay-arrow-position}. | ||
| 2929 | However, it is usually cleaner to use | ||
| 2930 | @code{overlay-arrow-variable-list} to achieve this result. | ||
| 2928 | @c !!! overlay-arrow-position: but the overlay string may remain in the display | 2931 | @c !!! overlay-arrow-position: but the overlay string may remain in the display |
| 2929 | @c of some other buffer until an update is required. This should be fixed | 2932 | @c of some other buffer until an update is required. This should be fixed |
| 2930 | @c now. Is it? | 2933 | @c now. Is it? |
diff --git a/lispref/internals.texi b/lispref/internals.texi index e032f5a7ddf..6a2e22a1483 100644 --- a/lispref/internals.texi +++ b/lispref/internals.texi | |||
| @@ -117,6 +117,18 @@ expect in an ordinary unmodified Emacs. If you feel you must override | |||
| 117 | normal features for your site, do it with @file{default.el}, so that | 117 | normal features for your site, do it with @file{default.el}, so that |
| 118 | users can override your changes if they wish. @xref{Startup Summary}. | 118 | users can override your changes if they wish. @xref{Startup Summary}. |
| 119 | 119 | ||
| 120 | In a package that can be preloaded, it is sometimes useful to | ||
| 121 | specify a computation to be done when Emacs subsequently starts up. | ||
| 122 | For this, use @code{eval-at-startup}: | ||
| 123 | |||
| 124 | @defmac eval-at-startup body@dots{} | ||
| 125 | This evaluates the @var{body} forms, either immediately if running in | ||
| 126 | an Emacs that has already started up, or later when Emacs does start | ||
| 127 | up. Since the value of the @var{body} forms is not necessarily | ||
| 128 | available when the @code{eval-at-startup} form is run, that form | ||
| 129 | always returns @code{nil}. | ||
| 130 | @end defmac | ||
| 131 | |||
| 120 | @defun dump-emacs to-file from-file | 132 | @defun dump-emacs to-file from-file |
| 121 | @cindex unexec | 133 | @cindex unexec |
| 122 | This function dumps the current state of Emacs into an executable file | 134 | This function dumps the current state of Emacs into an executable file |
diff --git a/lispref/minibuf.texi b/lispref/minibuf.texi index bc2342fc18e..6810cd97ffa 100644 --- a/lispref/minibuf.texi +++ b/lispref/minibuf.texi | |||
| @@ -949,7 +949,7 @@ The list of completions is displayed as text in a buffer named | |||
| 949 | @samp{*Completions*}. | 949 | @samp{*Completions*}. |
| 950 | @end deffn | 950 | @end deffn |
| 951 | 951 | ||
| 952 | @defun display-completion-list completions | 952 | @defun display-completion-list completions &optional common-substring |
| 953 | This function displays @var{completions} to the stream in | 953 | This function displays @var{completions} to the stream in |
| 954 | @code{standard-output}, usually a buffer. (@xref{Read and Print}, for more | 954 | @code{standard-output}, usually a buffer. (@xref{Read and Print}, for more |
| 955 | information about streams.) The argument @var{completions} is normally | 955 | information about streams.) The argument @var{completions} is normally |
| @@ -960,14 +960,22 @@ which is printed as if the strings were concatenated. The first of | |||
| 960 | the two strings is the actual completion, the second string serves as | 960 | the two strings is the actual completion, the second string serves as |
| 961 | annotation. | 961 | annotation. |
| 962 | 962 | ||
| 963 | This function is called by @code{minibuffer-completion-help}. The | 963 | @var{common-substring} represents a string common prefix between all |
| 964 | completions. @var{common-substring} is used to put faces on | ||
| 965 | @samp{*Completions*} to enhance visual feedback of the buffer; | ||
| 966 | @code{display-completion-list} use faces to highlight what all completions | ||
| 967 | have in common and where they begin to differ. @var{common-substring} | ||
| 968 | specifies the common part. | ||
| 969 | |||
| 970 | This function is called by @code{minibuffer-completion-help}. The | ||
| 964 | most common way to use it is together with | 971 | most common way to use it is together with |
| 965 | @code{with-output-to-temp-buffer}, like this: | 972 | @code{with-output-to-temp-buffer}, like this: |
| 966 | 973 | ||
| 967 | @example | 974 | @example |
| 968 | (with-output-to-temp-buffer "*Completions*" | 975 | (with-output-to-temp-buffer "*Completions*" |
| 969 | (display-completion-list | 976 | (display-completion-list |
| 970 | (all-completions (buffer-string) my-alist))) | 977 | (all-completions (buffer-string) my-alist) |
| 978 | (buffer-string))) | ||
| 971 | @end example | 979 | @end example |
| 972 | @end defun | 980 | @end defun |
| 973 | 981 | ||