[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110685: In display-time-world restor
From: |
martin rudalics |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110685: In display-time-world restore fit-window-to-buffer behavior. |
Date: |
Sat, 27 Oct 2012 10:58:30 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110685
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Sat 2012-10-27 10:58:30 +0200
message:
In display-time-world restore fit-window-to-buffer behavior.
* window.el (display-buffer): In doc-string describe
window-height and window-width alist entries.
* time.el (display-time-world): Restore fit-window-to-buffer
behavior.
modified:
lisp/ChangeLog
lisp/time.el
lisp/window.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-10-27 05:03:52 +0000
+++ b/lisp/ChangeLog 2012-10-27 08:58:30 +0000
@@ -1,3 +1,11 @@
+2012-10-27 Martin Rudalics <address@hidden>
+
+ * window.el (display-buffer): In doc-string describe
+ window-height and window-width alist entries.
+
+ * time.el (display-time-world): Restore fit-window-to-buffer
+ behavior.
+
2012-10-27 Chong Yidong <address@hidden>
* subr.el (insert-buffer-substring-as-yank): Doc fix.
@@ -253,7 +261,7 @@
Recover input meta mode when the new coding system doesn not use 8-bit.
Supply TERMINAL arg to set-input-meta-mode.
-2012-10-17 Michael Heerdegen <address@hidden> (tiny change)
+2012-10-17 Michael Heerdegen <address@hidden>
* wdired.el (wdired-old-marks): New variable.
(wdired-change-to-wdired-mode): Locally set wdired-old-marks.
=== modified file 'lisp/time.el'
--- a/lisp/time.el 2012-10-24 18:26:22 +0000
+++ b/lisp/time.el 2012-10-27 08:58:30 +0000
@@ -557,7 +557,8 @@
(run-at-time t display-time-world-timer-second 'display-time-world-timer))
(with-current-buffer (get-buffer-create display-time-world-buffer-name)
(display-time-world-display display-time-world-list)
- (display-buffer display-time-world-buffer-name)
+ (display-buffer display-time-world-buffer-name
+ (cons nil '((window-height . fit-window-to-buffer))))
(display-time-world-mode)))
(defun display-time-world-timer ()
=== modified file 'lisp/window.el'
--- a/lisp/window.el 2012-10-21 07:23:34 +0000
+++ b/lisp/window.el 2012-10-27 08:58:30 +0000
@@ -5414,6 +5414,22 @@
parameters to give a new frame, if
one is created.
+ `window-height' -- Value specifies either an integer (the number
+ of lines of a new window), a floating point number (the
+ fraction of a new window with respect to the height of the
+ frame's root window) or a function to be called with one
+ argument - a new window. The function is supposed to adjust
+ the height of the window; its return value is ignored.
+ Suitable functions are `shrink-window-if-larger-than-buffer'
+ and `fit-window-to-buffer'.
+
+ `window-width' -- Value specifies either an integer (the number
+ of columns of a new window), a floating point number (the
+ fraction of a new window with respect to the width of the
+ frame's root window) or a function to be called with one
+ argument - a new window. The function is supposed to adjust
+ the width of the window; its return value is ignored.
+
The ACTION argument to `display-buffer' can also have a non-nil
and non-list value. This means to display the buffer in a window
other than the selected one, even if it is already displayed in
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110685: In display-time-world restore fit-window-to-buffer behavior.,
martin rudalics <=