From e41682ae9c8a2df8dd45500581742b1cda59a334 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Sat, 31 May 2014 23:43:43 +0800 Subject: * emacs-lisp/gv.el (window-buffer, window-display-table) (window-dedicated-p, window-hscroll, window-point, window-start): Fix gv-expander. Fixes: debbugs:17630 --- lisp/emacs-lisp/gv.el | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'lisp/emacs-lisp') diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el index 66241897536..692b76e8a36 100644 --- a/lisp/emacs-lisp/gv.el +++ b/lisp/emacs-lisp/gv.el @@ -340,13 +340,18 @@ The return value is the last VAL in the list. (gv-define-simple-setter process-filter set-process-filter) (gv-define-simple-setter process-sentinel set-process-sentinel) (gv-define-simple-setter process-get process-put) -(gv-define-simple-setter window-buffer set-window-buffer) -(gv-define-simple-setter window-display-table set-window-display-table 'fix) -(gv-define-simple-setter window-dedicated-p set-window-dedicated-p) -(gv-define-simple-setter window-hscroll set-window-hscroll) (gv-define-simple-setter window-parameter set-window-parameter) -(gv-define-simple-setter window-point set-window-point) -(gv-define-simple-setter window-start set-window-start) +(gv-define-setter window-buffer (v &optional w) + (macroexp-let2 nil v v + `(progn (set-window-buffer ,w ,v) ,v))) +(gv-define-setter window-display-table (v &optional w) + (macroexp-let2 nil v v + `(progn (set-window-display-table ,w ,v) ,v))) +(gv-define-setter window-dedicated-p (v &optional w) + `(set-window-dedicated-p ,w ,v)) +(gv-define-setter window-hscroll (v &optional w) `(set-window-hscroll ,w ,v)) +(gv-define-setter window-point (v &optional w) `(set-window-point ,w ,v)) +(gv-define-setter window-start (v &optional w) `(set-window-start ,w ,v)) (gv-define-setter buffer-local-value (val var buf) (macroexp-let2 nil v val -- cgit v1.2.3