diff options
| author | Karoly Lorentey | 2005-11-23 01:35:21 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-11-23 01:35:21 +0000 |
| commit | 950bed4bb96d2a580818bdaab64a164c7c9a1c1e (patch) | |
| tree | 131973e52125af75637cd0417215ba3c5b7d1de4 /lispref | |
| parent | 59e085e04d44b0331620b55a64eb94bf99cf81b1 (diff) | |
| parent | 5fdd4cf709ffb9c92cb565a60117afbd6fc43aa5 (diff) | |
| download | emacs-950bed4bb96d2a580818bdaab64a164c7c9a1c1e.tar.gz emacs-950bed4bb96d2a580818bdaab64a164c7c9a1c1e.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 656-658)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-656
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-657
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-658
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-444
Diffstat (limited to 'lispref')
| -rw-r--r-- | lispref/ChangeLog | 20 | ||||
| -rw-r--r-- | lispref/customize.texi | 33 | ||||
| -rw-r--r-- | lispref/display.texi | 13 | ||||
| -rw-r--r-- | lispref/loading.texi | 3 | ||||
| -rw-r--r-- | lispref/processes.texi | 2 |
5 files changed, 52 insertions, 19 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 3e07a51a007..12fb6e42460 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog | |||
| @@ -1,3 +1,23 @@ | |||
| 1 | 2005-11-21 Juri Linkov <juri@jurta.org> | ||
| 2 | |||
| 3 | * customize.texi (Common Keywords): Update links types | ||
| 4 | custom-manual and url-link. Add link types emacs-library-link, | ||
| 5 | file-link, function-link, variable-link, custom-group-link. | ||
| 6 | |||
| 7 | 2005-11-20 Chong Yidong <cyd@stupidchicken.com> | ||
| 8 | |||
| 9 | * display.texi: Revert 2005-11-20 change. | ||
| 10 | |||
| 11 | 2005-11-20 Thien-Thi Nguyen <ttn@gnu.org> | ||
| 12 | |||
| 13 | * processes.texi (Bindat Functions): | ||
| 14 | Say "third" to refer to zero-based index "2". | ||
| 15 | |||
| 16 | 2005-11-18 Luc Teirlinck <teirllm@auburn.edu> | ||
| 17 | |||
| 18 | * loading.texi (Library Search): Update the default value of | ||
| 19 | `load-suffixes'. | ||
| 20 | |||
| 1 | 2005-11-17 Chong Yidong <cyd@stupidchicken.com> | 21 | 2005-11-17 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 22 | ||
| 3 | * display.texi (Attribute Functions): Mention :ignore-defface. | 23 | * display.texi (Attribute Functions): Mention :ignore-defface. |
diff --git a/lispref/customize.texi b/lispref/customize.texi index 176165294f9..1bf54f4f210 100644 --- a/lispref/customize.texi +++ b/lispref/customize.texi | |||
| @@ -51,25 +51,50 @@ Include an external link after the documentation string for this item. | |||
| 51 | This is a sentence containing an active field which references some | 51 | This is a sentence containing an active field which references some |
| 52 | other documentation. | 52 | other documentation. |
| 53 | 53 | ||
| 54 | There are four alternatives you can use for @var{link-data}: | 54 | There are several alternatives you can use for @var{link-data}: |
| 55 | 55 | ||
| 56 | @table @code | 56 | @table @code |
| 57 | @item (custom-manual @var{info-node}) | 57 | @item (custom-manual @var{info-node}) |
| 58 | Link to an Info node; @var{info-node} is a string which specifies the | 58 | Link to an Info node; @var{info-node} is a string which specifies the |
| 59 | node name, as in @code{"(emacs)Top"}. The link appears as | 59 | node name, as in @code{"(emacs)Top"}. The link appears as |
| 60 | @samp{[manual]} in the customization buffer. | 60 | @samp{[Manual]} in the customization buffer and enters the built-in |
| 61 | Info reader on @var{info-node}. | ||
| 61 | 62 | ||
| 62 | @item (info-link @var{info-node}) | 63 | @item (info-link @var{info-node}) |
| 63 | Like @code{custom-manual} except that the link appears | 64 | Like @code{custom-manual} except that the link appears |
| 64 | in the customization buffer with the Info node name. | 65 | in the customization buffer with the Info node name. |
| 65 | 66 | ||
| 66 | @item (url-link @var{url}) | 67 | @item (url-link @var{url}) |
| 67 | Link to a web page; @var{url} is a string which specifies the @acronym{URL}. | 68 | Link to a web page; @var{url} is a string which specifies the |
| 68 | The link appears in the customization buffer as @var{url}. | 69 | @acronym{URL}. The link appears in the customization buffer as |
| 70 | @var{url} and invokes the WWW browser specified by | ||
| 71 | @var{browse-url-browser-function}. | ||
| 69 | 72 | ||
| 70 | @item (emacs-commentary-link @var{library}) | 73 | @item (emacs-commentary-link @var{library}) |
| 71 | Link to the commentary section of a library; @var{library} is a string | 74 | Link to the commentary section of a library; @var{library} is a string |
| 72 | which specifies the library name. | 75 | which specifies the library name. |
| 76 | |||
| 77 | @item (emacs-library-link @var{library}) | ||
| 78 | Link to an Emacs Lisp library file; @var{library} is a string which | ||
| 79 | specifies the library name. | ||
| 80 | |||
| 81 | @item (file-link @var{file}) | ||
| 82 | Link to a file; @var{file} is a string which specifies the name of the | ||
| 83 | file to visit with @code{find-file} when the user invokes this link. | ||
| 84 | |||
| 85 | @item (function-link @var{function}) | ||
| 86 | Link to the documentation of a function; @var{function} is a string | ||
| 87 | which specifies the name of the function to describe with | ||
| 88 | @code{describe-function} when the user invokes this link. | ||
| 89 | |||
| 90 | @item (variable-link @var{variable}) | ||
| 91 | Link to the documentation of a variable; @var{variable} is a string | ||
| 92 | which specifies the name of the variable to describe with | ||
| 93 | @code{describe-variable} when the user invokes this link. | ||
| 94 | |||
| 95 | @item (custom-group-link @var{group}) | ||
| 96 | Link to another customization group. Invoking it creates a new | ||
| 97 | customization buffer for @var{group}. | ||
| 73 | @end table | 98 | @end table |
| 74 | 99 | ||
| 75 | You can specify the text to use in the customization buffer by adding | 100 | You can specify the text to use in the customization buffer by adding |
diff --git a/lispref/display.texi b/lispref/display.texi index 00d9313aa24..75a64924516 100644 --- a/lispref/display.texi +++ b/lispref/display.texi | |||
| @@ -1859,11 +1859,6 @@ the first face fails to specify a particular attribute, that means the | |||
| 1859 | next face gets a chance. However, the @code{default} face must | 1859 | next face gets a chance. However, the @code{default} face must |
| 1860 | specify all attributes. | 1860 | specify all attributes. |
| 1861 | 1861 | ||
| 1862 | Any attribute can have the value @code{:ignore-defface}. The effect | ||
| 1863 | of this is identical to @code{unspecified}. It exists because of an | ||
| 1864 | technical ambiguity in giving attributes the value @code{unspecified}. | ||
| 1865 | @xref{Attribute Functions}. | ||
| 1866 | |||
| 1867 | Some of these font attributes are meaningful only on certain kinds of | 1862 | Some of these font attributes are meaningful only on certain kinds of |
| 1868 | displays---if your display cannot handle a certain attribute, the | 1863 | displays---if your display cannot handle a certain attribute, the |
| 1869 | attribute is ignored. (The attributes @code{:family}, @code{:width}, | 1864 | attribute is ignored. (The attributes @code{:family}, @code{:width}, |
| @@ -2056,14 +2051,6 @@ This function sets one or more attributes of face @var{face} | |||
| 2056 | for frame @var{frame}. If @var{frame} is @code{nil}, it sets | 2051 | for frame @var{frame}. If @var{frame} is @code{nil}, it sets |
| 2057 | the attribute for all frames, and the defaults for new frames. | 2052 | the attribute for all frames, and the defaults for new frames. |
| 2058 | 2053 | ||
| 2059 | Unless you know what you're doing, don't set an attribute to | ||
| 2060 | @code{unspecified}. This is ambiguous---it is unclear whether it | ||
| 2061 | means to unspecify the value stored in the frame-local copies of the | ||
| 2062 | face (which means reverting to the original face spec), or the value | ||
| 2063 | in the face spec itself. What you probably want is to set the | ||
| 2064 | attribute to @code{:ignore-defface}. This forces the attribute value | ||
| 2065 | to be acquired from some other face during face merging. | ||
| 2066 | |||
| 2067 | The extra arguments @var{arguments} specify the attributes to set, and | 2054 | The extra arguments @var{arguments} specify the attributes to set, and |
| 2068 | the values for them. They should consist of alternating attribute names | 2055 | the values for them. They should consist of alternating attribute names |
| 2069 | (such as @code{:family} or @code{:underline}) and corresponding values. | 2056 | (such as @code{:family} or @code{:underline}) and corresponding values. |
diff --git a/lispref/loading.texi b/lispref/loading.texi index a9f3913bb84..260b96f6ccf 100644 --- a/lispref/loading.texi +++ b/lispref/loading.texi | |||
| @@ -291,7 +291,8 @@ tells @code{locate-library} to display the file name in the echo area. | |||
| 291 | @defvar load-suffixes | 291 | @defvar load-suffixes |
| 292 | This variable is a list of suffixes (strings) that @code{load} should | 292 | This variable is a list of suffixes (strings) that @code{load} should |
| 293 | try adding to the specified file name. The default value is | 293 | try adding to the specified file name. The default value is |
| 294 | @code{(".elc" ".el")}. There is no need to include the null suffix. | 294 | @code{(".elc" ".elc.gz" ".el" ".el.gz" ".gz")}. There is no need to |
| 295 | include the null suffix. | ||
| 295 | @end defvar | 296 | @end defvar |
| 296 | 297 | ||
| 297 | @node Loading Non-ASCII | 298 | @node Loading Non-ASCII |
diff --git a/lispref/processes.texi b/lispref/processes.texi index d63ddc4aa3e..624fd5f912f 100644 --- a/lispref/processes.texi +++ b/lispref/processes.texi | |||
| @@ -2244,7 +2244,7 @@ arguments specify repeated lookup of sub-structures. An integer name | |||
| 2244 | acts as an array index. | 2244 | acts as an array index. |
| 2245 | 2245 | ||
| 2246 | For example, if @var{name} is @code{(a b 2 c)}, that means to find | 2246 | For example, if @var{name} is @code{(a b 2 c)}, that means to find |
| 2247 | field @code{c} in the second element of subfield @code{b} of field | 2247 | field @code{c} in the third element of subfield @code{b} of field |
| 2248 | @code{a}. (This corresponds to @code{struct.a.b[2].c} in C.) | 2248 | @code{a}. (This corresponds to @code{struct.a.b[2].c} in C.) |
| 2249 | @end defun | 2249 | @end defun |
| 2250 | 2250 | ||