diff options
| author | Miles Bader <[email protected]> | 2007-08-27 04:00:19 +0000 |
|---|---|---|
| committer | Miles Bader <[email protected]> | 2007-08-27 04:00:19 +0000 |
| commit | 7f22a76506a3f3db2eb4bce1cfc49105bd8d0824 (patch) | |
| tree | 02ffae400506ae46fcf03eacaa5210aac7fe57de /lispref | |
| parent | d53a60a6f76043ba9fb395eece2aaccc67a0d1b2 (diff) | |
| parent | 619fb9ee822da1d92d8b7974b827dac6a918967f (diff) | |
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 97-100)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 246-247)
- Update from CVS
Revision: [email protected]/emacs--devo--0--patch-860
Diffstat (limited to 'lispref')
| -rw-r--r-- | lispref/ChangeLog | 7 | ||||
| -rw-r--r-- | lispref/display.texi | 4 | ||||
| -rw-r--r-- | lispref/macros.texi | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog index ea3e18da52..8e6c8abd3e 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,7 @@ +2007-08-25 Richard Stallman <[email protected]> + + * display.texi (Images): Delete redundant @findex. + 2007-08-16 Richard Stallman <[email protected]> * processes.texi (Asynchronous Processes): Clarify @@ -138,8 +142,7 @@ 2007-06-01 Stefan Monnier <[email protected]> - * text.texi (Special Properties): Correct meaning of fontified - face. + * text.texi (Special Properties): Correct meaning of fontified face. 2007-05-30 Richard Stallman <[email protected]> diff --git a/lispref/display.texi b/lispref/display.texi index 84c9ba8493..9fb12b5060 100644 --- a/lispref/display.texi +++ b/lispref/display.texi @@ -3649,9 +3649,7 @@ This variable is ignored if the image libraries are statically linked into Emacs. @end defvar -@defun image-type-available-p type -@findex image-type-available-p - +@defun image-type-available-p type This function returns non-@code{nil} if image type @var{type} is available, i.e., if images of this type can be loaded and displayed in Emacs. @var{type} should be one of the types contained in diff --git a/lispref/macros.texi b/lispref/macros.texi index 6dea53ac98..b62c8b99d7 100644 --- a/lispref/macros.texi +++ b/lispref/macros.texi @@ -365,7 +365,7 @@ whitespace between the @samp{`}, @samp{,} or @samp{,@@} and the following expression. This syntax is still accepted, for compatibility with old Emacs -versions, but we recommend not using it in new programs. +versions, but support for it will soon disappear. @node Problems with Macros @section Common Problems Using Macros |