summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorKenichi Handa <handa@etlken>2010-05-25 09:35:50 +0900
committerKenichi Handa <handa@etlken>2010-05-25 09:35:50 +0900
commit8a2b8c4f7c2a18254fc0b34f236d7487fc7917d4 (patch)
tree48e379874bd0bf796a12a5f43b369e0d6691a125 /lisp/emacs-lisp
parent10f72a3793087770f131a0dc729f29ff50f08ad9 (diff)
parent7eca871a82d582b986c638343f74d16b819a0f14 (diff)
downloademacs-8a2b8c4f7c2a18254fc0b34f236d7487fc7917d4.tar.gz
emacs-8a2b8c4f7c2a18254fc0b34f236d7487fc7917d4.tar.bz2
emacs-8a2b8c4f7c2a18254fc0b34f236d7487fc7917d4.zip
merge trunk
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/cl-loaddefs.el2
-rw-r--r--lisp/emacs-lisp/cl-macs.el1
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index e828325bd0e..1bffcde03d2 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -282,7 +282,7 @@ Not documented
;;;;;; flet progv psetq do-all-symbols do-symbols dotimes dolist
;;;;;; do* do loop return-from return block etypecase typecase ecase
;;;;;; case load-time-value eval-when destructuring-bind function*
-;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "0faa39d8f21ae59f2cc1baa835e28a5f")
+;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "fbeedbf769c72fee9b4e0671957c1077")
;;; Generated autoloads from cl-macs.el
(autoload 'gensym "cl-macs" "\
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 57870b19066..444178edb0c 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -1813,6 +1813,7 @@ Example:
(defsetf window-height () (store)
(list 'progn (list 'enlarge-window (list '- store '(window-height))) store))
(defsetf window-hscroll set-window-hscroll)
+(defsetf window-parameter set-window-parameter)
(defsetf window-point set-window-point)
(defsetf window-start set-window-start)
(defsetf window-width () (store)