aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-04-16 03:50:30 +0000
committerChong Yidong2009-04-16 03:50:30 +0000
commit23e41d152943b5d94170226b3d0c6f900cb96be0 (patch)
treee6fe1564d0ca00e43e96b896d3e8873624d40d4d
parentbd0af90dca595476bf4ce1ae88939ac75bd34aca (diff)
downloademacs-23e41d152943b5d94170226b3d0c6f900cb96be0.tar.gz
emacs-23e41d152943b5d94170226b3d0c6f900cb96be0.zip
* ediff-wind.el (ediff-make-wide-display): Fix typo in frame parameter
alist.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/ediff-wind.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7e333b37db7..878361621b8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12009-04-16 Leo <sdl.web@gmail.com> (tiny change)
2
3 * ediff-wind.el (ediff-make-wide-display): Fix typo in frame
4 parameter alist.
5
12009-04-15 William Xu <william.xwl@gmail.com> 62009-04-15 William Xu <william.xwl@gmail.com>
2 7
3 * outline.el (hide-sublevels): Ensure that arguments are passed to 8 * outline.el (hide-sublevels): Ensure that arguments are passed to
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 708fb413d3e..d206184088c 100644
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -1123,7 +1123,7 @@ It assumes that it is called from within the control buffer."
1123 (cons 'width (cdr (assoc 'width frame-A-params)))) 1123 (cons 'width (cdr (assoc 'width frame-A-params))))
1124 ediff-wide-display-frame frame-A) 1124 ediff-wide-display-frame frame-A)
1125 (modify-frame-parameters 1125 (modify-frame-parameters
1126 frame-A `((left . ,cw) (width . ,wd) (user-position t))))) 1126 frame-A `((left . ,cw) (width . ,wd) (user-position . t)))))
1127 1127
1128 1128
1129;; Revise the mode line to display which difference we have selected 1129;; Revise the mode line to display which difference we have selected