aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-12-25 20:04:07 +0000
committerChong Yidong2009-12-25 20:04:07 +0000
commit16d1ff5f0b813254c882b924fc4f907f3bbd435e (patch)
tree3c7868335a3442e8e7fc51dc3b971a4eb5fdfa42
parent91ed7ea8643c021003fc6073b5226ea49e196688 (diff)
downloademacs-16d1ff5f0b813254c882b924fc4f907f3bbd435e.tar.gz
emacs-16d1ff5f0b813254c882b924fc4f907f3bbd435e.zip
* frames.texi (Resources): Describe inhibit-x-resources.
(Size Parameters): Copyedit. * hash.texi (Creating Hash): * objects.texi (Hash Table Type): Document the new hash table printed representation. * minibuf.texi (Basic Completion): 4th arg to all-completions is obsolete. * processes.texi (Process Buffers): Document process-kill-buffer-query-function.
-rw-r--r--doc/lispref/ChangeLog15
-rw-r--r--doc/lispref/frames.texi27
-rw-r--r--doc/lispref/hash.texi48
-rw-r--r--doc/lispref/minibuf.texi9
-rw-r--r--doc/lispref/objects.texi10
-rw-r--r--doc/lispref/processes.texi8
6 files changed, 89 insertions, 28 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index e80368eb009..bd240c5b2a8 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,18 @@
12009-12-25 Chong Yidong <cyd@stupidchicken.com>
2
3 * frames.texi (Resources): Describe inhibit-x-resources.
4 (Size Parameters): Copyedit.
5
6 * hash.texi (Creating Hash):
7 * objects.texi (Hash Table Type): Document the new hash table
8 printed representation.
9
10 * minibuf.texi (Basic Completion): 4th arg to all-completions is
11 obsolete.
12
13 * processes.texi (Process Buffers): Document
14 process-kill-buffer-query-function.
15
12009-12-05 Glenn Morris <rgm@gnu.org> 162009-12-05 Glenn Morris <rgm@gnu.org>
2 17
3 * hooks.texi (Standard Hooks): Remove diary-display-hook, replaced by 18 * hooks.texi (Standard Hooks): Remove diary-display-hook, replaced by
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 0ac25352bba..eb5a13826b6 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -610,15 +610,15 @@ the @code{user-position} parameter (see above) does for the position
610parameters @code{top} and @code{left}. 610parameters @code{top} and @code{left}.
611 611
612@item fullscreen 612@item fullscreen
613Specify that width, height or both shall be maximized. 613Specify that width, height or both shall be maximized. The value
614The value @code{fullwidth} specifies that width shall be as wide as possible. 614@code{fullwidth} specifies that width shall be as wide as possible.
615The value @code{fullheight} specifies that height shall be as tall as 615The value @code{fullheight} specifies that height shall be as tall as
616possible. The value @code{fullboth} specifies that both the 616possible. The value @code{fullboth} specifies that both the width and
617width and the height shall be set to the size of the screen. 617the height shall be set to the size of the screen. The value
618The value @code{maximized} specifies that the frame shall be maximized. 618@code{maximized} specifies that the frame shall be maximized. The
619The difference between @code{maximized} and @code{fullboth} is that 619difference between @code{maximized} and @code{fullboth} is that the
620the first does have window manager decorations but the second does not 620former still has window manager decorations while the latter really
621and thus really covers the whole screen. 621covers the whole screen.
622@end table 622@end table
623 623
624@node Layout Parameters 624@node Layout Parameters
@@ -2166,6 +2166,11 @@ If the name @var{color} is not defined, the value is @code{nil}.
2166@node Resources 2166@node Resources
2167@section X Resources 2167@section X Resources
2168 2168
2169This section describes some of the functions and variables for
2170querying and using X resources, or their equivalent on your operating
2171system. @xref{X Resources,, X Resources, emacs, The GNU Emacs
2172Manual}, for more information about X resources.
2173
2169@defun x-get-resource attribute class &optional component subclass 2174@defun x-get-resource attribute class &optional component subclass
2170The function @code{x-get-resource} retrieves a resource value from the X 2175The function @code{x-get-resource} retrieves a resource value from the X
2171Window defaults database. 2176Window defaults database.
@@ -2219,7 +2224,11 @@ or @file{~/.Xresources}). Then:
2219@end group 2224@end group
2220@end example 2225@end example
2221 2226
2222 @xref{X Resources,, X Resources, emacs, The GNU Emacs Manual}. 2227@defvar inhibit-x-resources
2228If this variable is non-@code{nil}, Emacs does not look up X
2229resources, and X resources do not have any effect when creating new
2230frames.
2231@end defvar
2223 2232
2224@node Display Feature Testing 2233@node Display Feature Testing
2225@section Display Feature Testing 2234@section Display Feature Testing
diff --git a/doc/lispref/hash.texi b/doc/lispref/hash.texi
index dd785f8fd7c..8453e780a51 100644
--- a/doc/lispref/hash.texi
+++ b/doc/lispref/hash.texi
@@ -30,18 +30,13 @@ the way two alists can share a common tail.
30@end itemize 30@end itemize
31 31
32 Emacs Lisp provides a general-purpose hash table data type, along 32 Emacs Lisp provides a general-purpose hash table data type, along
33with a series of functions for operating on them. Hash tables have no 33with a series of functions for operating on them. Hash tables have a
34read syntax, and print in hash notation, like this: 34special printed representation, which consists of @samp{#s} followed
35 35by a list specifying the hash table properties and contents.
36@example 36@xref{Creating Hash}. (Note that the term ``hash notation'', which
37(make-hash-table) 37refers to the initial @samp{#} character used in the printed
38 @result{} #<hash-table 'eql nil 0/65 0x83af980> 38representations of objects with no read representation, has nothing to
39@end example 39do with the term ``hash table''. @xref{Printed Representation}.)
40
41@noindent
42(The term ``hash notation'' refers to the initial @samp{#}
43character---@pxref{Printed Representation}---and has nothing to do with
44the term ``hash table.'')
45 40
46 Obarrays are also a kind of hash table, but they are a different type 41 Obarrays are also a kind of hash table, but they are a different type
47of object and are used only for recording interned symbols 42of object and are used only for recording interned symbols
@@ -164,6 +159,35 @@ of key lookup.
164This function is obsolete. Use @code{make-hash-table} instead. 159This function is obsolete. Use @code{make-hash-table} instead.
165@end defun 160@end defun
166 161
162You can also create a new hash table using the printed representation
163for hash tables. The Lisp reader can read this printed
164representation, provided each element in the specified hash table has
165a valid read syntax (@pxref{Printed Representation}). For instance,
166the following specifies a new hash table containing the keys
167@code{key1} and @code{key2} (both symbols) associated with @code{val1}
168(a symbol) and @code{300} (a number) respectively.
169
170@example
171#s(hash-table size 30 data (key1 val1 key2 300))
172@end example
173
174@noindent
175The printed representation for a hash table consists of @samp{#s}
176followed by a list beginning with @samp{hash-table}. The rest of the
177list should consist of zero or more property-value pairs specifying
178the hash table's properties and initial contents. The properties and
179values are read literally. Valid property names are @code{size},
180@code{test}, @code{weakness}, @code{rehash-size},
181@code{rehash-threshold}, and @code{data}. The @code{data} property
182should be a list of key-value pairs for the initial contents; the
183other properties have the same meanings as the matching
184@code{make-hash-table} keywords (@code{:size}, @code{:test}, etc.),
185described above.
186
187Note that you cannot specify a hash table whose initial contents
188include objects that have no read syntax, such as buffers and frames.
189Such objects may be added to the hash table after it is created.
190
167@node Hash Access 191@node Hash Access
168@section Hash Table Access 192@section Hash Table Access
169 193
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 2702cf7916e..28dc9e8ba3d 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -769,10 +769,11 @@ This function returns a list of all possible completions of
769@var{string}. The arguments to this function (aside from 769@var{string}. The arguments to this function (aside from
770@var{nospace}) are the same as those of @code{try-completion}. Also, 770@var{nospace}) are the same as those of @code{try-completion}. Also,
771this function uses @code{completion-regexp-list} in the same way that 771this function uses @code{completion-regexp-list} in the same way that
772@code{try-completion} does. The optional argument @var{nospace} only 772@code{try-completion} does.
773matters if @var{string} is the empty string. In that case, if 773
774@var{nospace} is non-@code{nil}, completions that start with a space 774The optional argument @var{nospace} is obsolete. If it is
775are ignored. 775non-@code{nil}, completions that start with a space are ignored unless
776@var{string} starts with a space.
776 777
777If @var{collection} is a function, it is called with three arguments: 778If @var{collection} is a function, it is called with three arguments:
778@var{string}, @var{predicate} and @code{t}; then @code{all-completions} 779@var{string}, @var{predicate} and @code{t}; then @code{all-completions}
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index 87e37702b88..e8df5ea1f6f 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -1219,14 +1219,18 @@ only the first 3 bits are used:
1219 1219
1220 A hash table is a very fast kind of lookup table, somewhat like an 1220 A hash table is a very fast kind of lookup table, somewhat like an
1221alist in that it maps keys to corresponding values, but much faster. 1221alist in that it maps keys to corresponding values, but much faster.
1222Hash tables have no read syntax, and print using hash notation. 1222The printed representation of a hash table specifies its properties
1223@xref{Hash Tables}, for functions that operate on hash tables. 1223and contents, like this:
1224 1224
1225@example 1225@example
1226(make-hash-table) 1226(make-hash-table)
1227 @result{} #<hash-table 'eql nil 0/65 0x83af980> 1227 @result{} #s(hash-table size 65 test eql rehash-size 1.5
1228 rehash-threshold 0.8 data ())
1228@end example 1229@end example
1229 1230
1231@noindent
1232@xref{Hash Tables}, for more information about hash tables.
1233
1230@node Function Type 1234@node Function Type
1231@subsection Function Type 1235@subsection Function Type
1232 1236
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index effada450c1..2d22eb3e899 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -1161,6 +1161,14 @@ the output is determined by the @code{process-mark}, which is then
1161updated to point to the end of the text just inserted. Usually, but not 1161updated to point to the end of the text just inserted. Usually, but not
1162always, the @code{process-mark} is at the end of the buffer. 1162always, the @code{process-mark} is at the end of the buffer.
1163 1163
1164@findex process-kill-buffer-query-function
1165 Killing the associated buffer of a process also kills the process.
1166Emacs asks for confirmation first, if the process's
1167@code{process-query-on-exit-flag} is non-@code{nil} (@pxref{Query
1168Before Exit}). This confirmation is done by the function
1169@code{process-kill-buffer-query-function}, which is run from
1170@code{kill-buffer-query-functions} (@pxref{Killing Buffers}).
1171
1164@defun process-buffer process 1172@defun process-buffer process
1165This function returns the associated buffer of the process 1173This function returns the associated buffer of the process
1166@var{process}. 1174@var{process}.