diff options
Diffstat (limited to 'lispref')
| -rw-r--r-- | lispref/ChangeLog | 13 | ||||
| -rw-r--r-- | lispref/display.texi | 19 | ||||
| -rw-r--r-- | lispref/loading.texi | 12 |
3 files changed, 37 insertions, 7 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 36c3fd342de..c19b0e1521b 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,16 @@ +2005-10-21 Richard M. Stallman <rms@gnu.org> + + * loading.texi (Where Defined): load-history contains abs file names. + symbol-file returns abs file names. + +2005-10-19 Kim F. Storm <storm@cua.dk> + + * display.texi (Showing Images): Add max-image-size integer value. + +2005-10-18 Chong Yidong <cyd@stupidchicken.com> + + * display.texi (Showing Images): Document max-image-size. + 2005-10-17 Richard M. Stallman <rms@gnu.org> * commands.texi (Quitting): Minor clarification. diff --git a/lispref/display.texi b/lispref/display.texi index 4c534282011..ba27b900cdb 100644 --- a/lispref/display.texi +++ b/lispref/display.texi @@ -4058,6 +4058,25 @@ font). @var{frame} is the frame on which the image will be displayed. Focus}). @end defun +@defvar max-image-size +@tindex max-image-size +This variable is used to define the maximum size of image that Emacs +will load. Emacs will refuse to load (and display) any image that is +larger than this limit. + +If the value is an integer, it directly specifies the maximum +image height and width, measured in pixels. If it is a floating +point number, it specifies the maximum image height and width +as a ratio to the frame height and width. If the value is +non-numeric, there is no explicit limit on the size of images. + +The purpose of this variable is to prevent unreasonably large images +from accidentally being loaded into Emacs. It only takes effect the +first time an image is loaded. Once an image is placed in the image +cache, it can always be displayed, even if the value of +@var{max-image-size} is subsequently changed (@pxref{Image Cache}). +@end defvar + @node Image Cache @subsection Image Cache diff --git a/lispref/loading.texi b/lispref/loading.texi index afef0e787a5..a9f3913bb84 100644 --- a/lispref/loading.texi +++ b/lispref/loading.texi @@ -736,23 +736,21 @@ If @var{type} is @code{nil}, then any kind of definition is acceptable. If @var{type} is @code{defun} or @code{defvar}, that specifies function definition only or variable definition only. -The value is the file name as it was specified to @code{load}: -either an absolute file name, or a library name -(with no directory name and no @samp{.el} or @samp{.elc} at the end). -It can also be @code{nil}, if the definition is not associated with any file. +The value is normally an absolute file name. It can also be +@code{nil}, if the definition is not associated with any file. @end defun The basis for @code{symbol-file} is the data in the variable @code{load-history}. @defvar load-history -This variable's value is an alist connecting library names with the +This variable's value is an alist connecting library file names with the names of functions and variables they define, the features they provide, and the features they require. Each element is a list and describes one library. The @sc{car} of the -list is the name of the library, as a string. The rest of the list -elements have these forms: +list is the absolute file name of the library, as a string. The rest +of the list elements have these forms: @table @code @item @var{var} |