[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master fd4fc00 03/21: Merge from origin/emacs-25
From: |
John Wiegley |
Subject: |
[Emacs-diffs] master fd4fc00 03/21: Merge from origin/emacs-25 |
Date: |
Fri, 04 Mar 2016 08:06:49 +0000 |
branch: master
commit fd4fc004ab4d4fd5a75f1663e7067e58cf389912
Merge: 15ecb79 7bc4820
Author: John Wiegley <address@hidden>
Commit: John Wiegley <address@hidden>
Merge from origin/emacs-25
7bc4820 Make setf for frame-height/width work again
---
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 4609505..b401714 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)
- [Emacs-diffs] master updated (887f612 -> 17982e0), John Wiegley, 2016/03/04
- [Emacs-diffs] master 15ecb79 02/21: ; Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master eced64b 04/21: ; Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 2f3f7fc 01/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master b6b565b 06/21: ; Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 018bdf7 08/21: ; Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 68fa05f 07/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 68ed6bf 05/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master fd4fc00 03/21: Merge from origin/emacs-25,
John Wiegley <=
- [Emacs-diffs] master 5ab243f 12/21: ; Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master b50a207 10/21: ; Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master f991a50 11/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 692caf1 09/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 68ce800 13/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master eab3f9e 14/21: ; Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 4df043c 16/21: ; Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 5be4e9d 19/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 9fb9d07 17/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master de3fa65 15/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04