diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-03-03 23:52:26 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-03-03 23:52:26 -0800 |
| commit | fd4fc004ab4d4fd5a75f1663e7067e58cf389912 (patch) | |
| tree | 75ab1abe5eef83d0f91da2d247ed1468ebb7e61b /lisp/emacs-lisp | |
| parent | 15ecb7923af303497eec1e7918f7c70aafd33cde (diff) | |
| parent | 7bc4820ffdbd062a04de8be7328fa90e5996b3e6 (diff) | |
| download | emacs-fd4fc004ab4d4fd5a75f1663e7067e58cf389912.tar.gz emacs-fd4fc004ab4d4fd5a75f1663e7067e58cf389912.tar.bz2 emacs-fd4fc004ab4d4fd5a75f1663e7067e58cf389912.zip | |
Merge from origin/emacs-25
7bc4820 Make setf for frame-height/width work again
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/cl-lib.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el index 4609505b451..b4017140f3c 100644 --- a/lisp/emacs-lisp/cl-lib.el +++ b/lisp/emacs-lisp/cl-lib.el @@ -660,10 +660,12 @@ If ALIST is non-nil, the new pairs are prepended to it." (gv-define-setter face-underline-p (x f &optional s) `(set-face-underline ,f ,x ,s)) (gv-define-simple-setter file-modes set-file-modes t) -(gv-define-simple-setter frame-height set-screen-height t) +(gv-define-setter frame-height (x &optional frame) + `(set-frame-height (or ,frame (selected-frame)) ,x)) (gv-define-simple-setter frame-parameters modify-frame-parameters t) (gv-define-simple-setter frame-visible-p cl--set-frame-visible-p) -(gv-define-simple-setter frame-width set-screen-width t) +(gv-define-setter frame-width (x &optional frame) + `(set-frame-width (or ,frame (selected-frame)) ,x)) (gv-define-simple-setter getenv setenv t) (gv-define-simple-setter get-register set-register) (gv-define-simple-setter global-key-binding global-set-key) |