aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/window.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 545f6debb31..d542fa1a15b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -9,6 +9,8 @@
9 9
102005-06-09 Juanma Barranquero <lekktu@gmail.com> 102005-06-09 Juanma Barranquero <lekktu@gmail.com>
11 11
12 * window.el (window-size-fixed): Fix typo in docstring.
13
12 * thumbs.el: Don't set `auto-image-file-mode'. Do not create the 14 * thumbs.el: Don't set `auto-image-file-mode'. Do not create the
13 thumbnails directory on loading. 15 thumbnails directory on loading.
14 (thumbs-conversion-program): Use `eq' to check the system type, 16 (thumbs-conversion-program): Use `eq' to check the system type,
diff --git a/lisp/window.el b/lisp/window.el
index c797111f111..13fa2d0349c 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -31,7 +31,7 @@
31 31
32(defvar window-size-fixed nil 32(defvar window-size-fixed nil
33 "*Non-nil in a buffer means windows displaying the buffer are fixed-size. 33 "*Non-nil in a buffer means windows displaying the buffer are fixed-size.
34If the value is`height', then only the window's height is fixed. 34If the value is `height', then only the window's height is fixed.
35If the value is `width', then only the window's width is fixed. 35If the value is `width', then only the window's width is fixed.
36Any other non-nil value fixes both the width and the height. 36Any other non-nil value fixes both the width and the height.
37Emacs won't change the size of any window displaying that buffer, 37Emacs won't change the size of any window displaying that buffer,