aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2010-12-21 10:36:48 +0800
committerChong Yidong2010-12-21 10:36:48 +0800
commit6bfa51ba88183f82128a5d06e86e640c27b4707f (patch)
treec397abcb1b2567ac359d81b0dc8a5fca303c7c8d
parent9d9cfd53c830eec3052c30a8f1c13b12743d5c89 (diff)
downloademacs-6bfa51ba88183f82128a5d06e86e640c27b4707f.tar.gz
emacs-6bfa51ba88183f82128a5d06e86e640c27b4707f.zip
Revert bogus 2010-10-24 change to widget-image-find.
* lisp/wid-edit.el (widget-image-find): Remove bogus :ascent spec from image spec (Bug#7480).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/wid-edit.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e39cfc83d0c..b3b9295247f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-12-21 Chong Yidong <cyd@stupidchicken.com>
2
3 * wid-edit.el (widget-image-find): Remove bogus :ascent spec from
4 image spec (Bug#7480).
5
12010-12-21 Daiki Ueno <ueno@unixuser.org> 62010-12-21 Daiki Ueno <ueno@unixuser.org>
2 7
3 * obsolete/pgg-parse.el, obsolete/pgg-pgp5.el, obsolete/pgg-pgp.el, 8 * obsolete/pgg-parse.el, obsolete/pgg-pgp5.el, obsolete/pgg-pgp.el,
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 9c7de61d7cd..5b6bc97db2c 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -637,8 +637,8 @@ extension (xpm, xbm, gif, jpg, or png) located in
637 specs) 637 specs)
638 (dolist (elt widget-image-conversion) 638 (dolist (elt widget-image-conversion)
639 (dolist (ext (cdr elt)) 639 (dolist (ext (cdr elt))
640 (push (list :type (car elt) :file (concat image ext) 640 (push (list :type (car elt) :file (concat image ext))
641 :ascent 'center) specs))) 641 specs)))
642 (find-image (nreverse specs)))) 642 (find-image (nreverse specs))))
643 (t 643 (t
644 ;; Oh well. 644 ;; Oh well.