aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2009-02-24 10:28:57 +0000
committerJuanma Barranquero2009-02-24 10:28:57 +0000
commit68ba6c495685f6143a51982e9b075e856c2208a5 (patch)
tree2be5f5268be37d66dfb14a2a894534ff62030c9c
parent4a3f9f7faf666e62ea58333db83d4a60a4234b3a (diff)
downloademacs-68ba6c495685f6143a51982e9b075e856c2208a5.tar.gz
emacs-68ba6c495685f6143a51982e9b075e856c2208a5.zip
* image.el (image-load-path-for-library, insert-sliced-image):
Fix typos in docstrings.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/image.el6
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fad9ebecc17..acc29afb0e1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12009-02-24 Juanma Barranquero <lekktu@gmail.com>
2
3 * image.el (image-load-path-for-library, insert-sliced-image):
4 Fix typos in docstrings.
5
12009-02-24 Glenn Morris <rgm@gnu.org> 62009-02-24 Glenn Morris <rgm@gnu.org>
2 7
3 * textmodes/flyspell.el (flyspell-use-meta-tab): Add a custom 8 * textmodes/flyspell.el (flyspell-use-meta-tab): Add a custom
@@ -32,7 +37,7 @@
322009-02-23 Geoff Gole <geoffgole@gmail.com> (tiny change) 372009-02-23 Geoff Gole <geoffgole@gmail.com> (tiny change)
33 38
34 * ibuffer.el (ibuffer-redisplay-engine): Avoid "Mark set" message 39 * ibuffer.el (ibuffer-redisplay-engine): Avoid "Mark set" message
35 clobbering useful message from `ibuffer-toggle-sorting-mode'. (Bug#2439) 40 clobbering useful message from `ibuffer-toggle-sorting-mode' (Bug#2439).
36 41
372009-02-23 Miles Bader <miles@gnu.org> 422009-02-23 Miles Bader <miles@gnu.org>
38 43
diff --git a/lisp/image.el b/lisp/image.el
index 8452607ca2d..076a969a363 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -123,11 +123,11 @@ in \"`data-directory'/images\".
123 123
124Then this function returns a list of directories which contains 124Then this function returns a list of directories which contains
125first the directory in which IMAGE was found, followed by the 125first the directory in which IMAGE was found, followed by the
126value of `load-path'. If PATH is given, it is used instead of 126value of `load-path'. If PATH is given, it is used instead of
127`load-path'. 127`load-path'.
128 128
129If NO-ERROR is non-nil and a suitable path can't be found, don't 129If NO-ERROR is non-nil and a suitable path can't be found, don't
130signal an error. Instead, return a list of directories as before, 130signal an error. Instead, return a list of directories as before,
131except that nil appears in place of the image directory. 131except that nil appears in place of the image directory.
132 132
133Here is an example that uses a common idiom to provide 133Here is an example that uses a common idiom to provide
@@ -455,7 +455,7 @@ AREA is where to display the image. AREA nil or omitted means
455display it in the text area, a value of `left-margin' means 455display it in the text area, a value of `left-margin' means
456display it in the left marginal area, a value of `right-margin' 456display it in the left marginal area, a value of `right-margin'
457means display it in the right marginal area. 457means display it in the right marginal area.
458The image is automatically split into ROW x COLS slices." 458The image is automatically split into ROWS x COLS slices."
459 (unless string (setq string " ")) 459 (unless string (setq string " "))
460 (unless (eq (car-safe image) 'image) 460 (unless (eq (car-safe image) 'image)
461 (error "Not an image: %s" image)) 461 (error "Not an image: %s" image))