repair attempt

diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index 470ca17d3a0cc5da03a3ac676507986a1ca95284..d4da1f59a8539f9ba6860b9ee08517e7eda7f842 100644 (file)
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -260,7 +260,7 @@ Remove from SYMBOL's plist the property PROPNAME and its value.
 ;;;;;;  cl-do cl-loop cl-return-from cl-return cl-block cl-etypecase
 ;;;;;;  cl-typecase cl-ecase cl-case cl-load-time-value cl-eval-when
 ;;;;;;  cl-destructuring-bind cl-function cl-defmacro cl-defun cl-gentemp
-;;;;;;  cl-gensym) "cl-macs" "cl-macs.el" "9676d5517e8b9246c09fe78984c68bef")
+;;;;;;  cl-gensym) "cl-macs" "cl-macs.el" "a1ca04b3f2acc7c9b06f45ef5486d443")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'cl-gensym "cl-macs" "\

diff --git a/src/xdisp.c b/src/xdisp.c
index 3b35d2525087d031bdba36e5d57e7935f0185b6e..9bb3d92ac3953c6fdc714dee31a1840162bda9bc 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4975,7 +4975,7 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
           it->what = IT_XWIDGET;
           it->method = GET_FROM_XWIDGET;
           it->position = start_pos;
-         it->object = NILP (object) ? WVAR (it->w, buffer) : object;
+         it->object = NILP (object) ? it->w->buffer : object;
          *position = start_pos;
 
           it->xwidget = lookup_xwidget(value);