diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-04-14 07:50:45 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-04-14 07:50:45 -0700 |
| commit | db71b3182778b66fad3865825777b06cc20b89a8 (patch) | |
| tree | a4528831664836775cdbd5c17436dad8a58aa0e7 /lisp/image.el | |
| parent | 132b3a9ace018a120e1b30fc94c8c98904509884 (diff) | |
| parent | 5a6bb01777e40a87ac59162d9833a13c81b7f292 (diff) | |
| download | emacs-db71b3182778b66fad3865825777b06cc20b89a8.tar.gz | |
Merge from origin/emacs-26
5a6bb01 (origin/emacs-26) Fix building etc/DOC in the MSDOS port
274c979 * lisp/select.el (gui-get-selection): Doc fix.
ad731b0 ; * doc/lispref/display.texi (Temporary Displays): Fix typos.
f1450e9 Complete documentation of syntax flags by adding `c'
6bdcaec Fix typos and minor wording issues in ELisp manual
febac27 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
6c2e21e Avoid segfault in processes of type 'pipe'
60e10c5 Remove repetitions in documentation strings
208e752 * lisp/image.el (image-load-path): Doc fix.
92e0fd8 ; * etc/NEWS: Remove a FIXME. (Bug#31122)
Conflicts:
etc/NEWS
Diffstat (limited to 'lisp/image.el')
| -rw-r--r-- | lisp/image.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/image.el b/lisp/image.el index ab868f7db35..e084fe329af 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -116,6 +116,9 @@ told that the data would have the associated suffix if saved to a file.") (list (file-name-as-directory (expand-file-name "images" data-directory)) 'data-directory 'load-path) "List of locations in which to search for image files. +The images for icons shown in the tool bar are also looked up +in these locations. + If an element is a string, it defines a directory to search. If an element is a variable symbol whose value is a string, that value defines a directory to search. |