aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2014-03-07 11:12:31 -0800
committerPaul Eggert2014-03-07 11:12:31 -0800
commit1920914a0911bcce40758c97482a62ca8fa1b862 (patch)
treebb1b2e32fc994c5e1e1c9dc7d4320d440f53994c
parent0d181095652bf8e1ca27935e54ecbb5443496334 (diff)
downloademacs-1920914a0911bcce40758c97482a62ca8fa1b862.tar.gz
emacs-1920914a0911bcce40758c97482a62ca8fa1b862.zip
Spelling and wording fixes.
-rw-r--r--doc/lispref/display.texi2
-rw-r--r--etc/NEWS4
-rw-r--r--lisp/window.el9
3 files changed, 7 insertions, 8 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index f22252143d7..56dd7185886 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -3931,7 +3931,7 @@ the appearance of dividers:
3931@item window-divider 3931@item window-divider
3932When a divider is less than three pixels wide, it is drawn solidly with 3932When a divider is less than three pixels wide, it is drawn solidly with
3933the foreground of this face. For larger dividers this face is used for 3933the foreground of this face. For larger dividers this face is used for
3934the inner part only, exluding the first and last pixel. 3934the inner part only, excluding the first and last pixel.
3935 3935
3936@item window-divider-first-pixel 3936@item window-divider-first-pixel
3937This is the face used for drawing the first pixel of a divider that is 3937This is the face used for drawing the first pixel of a divider that is
diff --git a/etc/NEWS b/etc/NEWS
index b54f512410d..bc81d034385 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -198,7 +198,7 @@ content-type that is found in the new variable `image-format-suffixes'.
198 198
199+++ 199+++
200*** The function `window-in-direction' introduced in Emacs 24.1 now 200*** The function `window-in-direction' introduced in Emacs 24.1 now
201takes additional arguments for specifiying a reference point, wrapping 201takes additional arguments for specifying a reference point, wrapping
202selection around frame borders, and specifying ways to select the 202selection around frame borders, and specifying ways to select the
203minibuffer window. 203minibuffer window.
204 204
@@ -792,7 +792,7 @@ Use `electric-indent-mode' instead.
792to filter the list of packages by a keyword. 792to filter the list of packages by a keyword.
793 793
794+++ 794+++
795*** In the `describe-package' buffer, there are now buttons listing the 795*** In the `describe-package' buffer, there are now buttons listing the
796keywords related to the package. Click on a button to see other packages 796keywords related to the package. Click on a button to see other packages
797related to that keyword. 797related to that keyword.
798 798
diff --git a/lisp/window.el b/lisp/window.el
index 10aa3a70464..afd814839d9 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -6825,11 +6825,10 @@ frames can be resized in both dimensions."
6825 6825
6826(defcustom fit-frame-to-buffer-margins '(nil nil nil nil) 6826(defcustom fit-frame-to-buffer-margins '(nil nil nil nil)
6827 "Margins around frame for `fit-frame-to-buffer'. 6827 "Margins around frame for `fit-frame-to-buffer'.
6828This option allows to specify the numbers of pixels to be left 6828This specifies the numbers of pixels to be left free on the left,
6829free on the left, above, the right, and below a frame that shall 6829above, on the right, and below a frame fitted to its buffer. Set
6830be fit to its buffer. Set these to avoid that such a frame 6830this to avoid obscuring other desktop objects like the taskbar.
6831obscurs other desktop objects like the taskbar. The default is 6831The default is nil for each side, which means to not add margins.
6832nil for each side which means to not add any margins.
6833 6832
6834The value specified here can be overridden for a specific frame 6833The value specified here can be overridden for a specific frame
6835by that frame's `fit-frame-to-buffer-margins' parameter, if 6834by that frame's `fit-frame-to-buffer-margins' parameter, if