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 /src/data.c | |
| 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 'src/data.c')
| -rw-r--r-- | src/data.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/data.c b/src/data.c index cb6c7d2c85c..9bb90ad2d6e 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -1726,7 +1726,9 @@ it is in effect whenever the current buffer has no buffer-local binding. | |||
| 1726 | A frame-local binding is actually a frame parameter value; | 1726 | A frame-local binding is actually a frame parameter value; |
| 1727 | thus, any given frame has a local binding for VARIABLE if it has | 1727 | thus, any given frame has a local binding for VARIABLE if it has |
| 1728 | a value for the frame parameter named VARIABLE. Return VARIABLE. | 1728 | a value for the frame parameter named VARIABLE. Return VARIABLE. |
| 1729 | See `modify-frame-parameters' for how to set frame parameters. */) | 1729 | |
| 1730 | This function does not in itself create any frame-local bindings for | ||
| 1731 | VARIABLE. See `modify-frame-parameters' for how to set frame parameters. */) | ||
| 1730 | (variable) | 1732 | (variable) |
| 1731 | register Lisp_Object variable; | 1733 | register Lisp_Object variable; |
| 1732 | { | 1734 | { |