aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/image.el4
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 50340b0d721..8e1bc0f6508 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-02-04 Glenn Morris <rgm@gnu.org> 12012-02-04 Glenn Morris <rgm@gnu.org>
2 2
3 * image.el (image-extension-data): Add obsolete alias.
4
3 * facemenu.el (list-colors-display): Doc fix (minor rephrasing). 5 * facemenu.el (list-colors-display): Doc fix (minor rephrasing).
4 6
5 * ido.el (ido-find-file): Doc fix (ido-toggle-vc not on any key). 7 * ido.el (ido-find-file): Doc fix (ido-toggle-vc not on any key).
diff --git a/lisp/image.el b/lisp/image.el
index 24089b0c7c9..c4b51716dad 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -329,6 +329,10 @@ Optional DATA-P non-nil means SOURCE is a string containing image data."
329 type) 329 type)
330 330
331 331
332(if (fboundp 'image-metadata) ; eg not --without-x
333 (define-obsolete-function-alias 'image-extension-data
334 'image-metadata' "24.1"))
335
332(define-obsolete-variable-alias 336(define-obsolete-variable-alias
333 'image-library-alist 337 'image-library-alist
334 'dynamic-library-alist "24.1") 338 'dynamic-library-alist "24.1")