aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2017-06-10 11:44:27 -0700
committerPaul Eggert2017-06-10 11:44:49 -0700
commitb94472f18853c6075938cc5f9ac2856d7ad499b7 (patch)
tree9f7b0bece7cc3f349d0899c4b87e06fa2a649b43
parentbdf41152af3434307218ac2863b737c4486f740e (diff)
downloademacs-b94472f18853c6075938cc5f9ac2856d7ad499b7.tar.gz
emacs-b94472f18853c6075938cc5f9ac2856d7ad499b7.zip
; Spelling fixes
-rw-r--r--ChangeLog.22
-rw-r--r--ChangeLog.32
-rw-r--r--lisp/frame.el2
-rw-r--r--src/xdisp.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog.2 b/ChangeLog.2
index ab15b277cec..96a647d9b44 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -4640,7 +4640,7 @@
4640 Fill the doc string of font-lock-keywords 4640 Fill the doc string of font-lock-keywords
4641 4641
4642 * lisp/font-lock.el (font-lock-keywords): Fill the lines and 4642 * lisp/font-lock.el (font-lock-keywords): Fill the lines and
4643 reorganise some explanations (bug#21427). 4643 reorganize some explanations (bug#21427).
4644 4644
4645 (cherry picked from commit c05716d3a26ea7518b89eacfccaf70c9d0731df7) 4645 (cherry picked from commit c05716d3a26ea7518b89eacfccaf70c9d0731df7)
4646 4646
diff --git a/ChangeLog.3 b/ChangeLog.3
index 51245e77608..60bedb6db1a 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -12785,7 +12785,7 @@
12785 Fill the doc string of font-lock-keywords 12785 Fill the doc string of font-lock-keywords
12786 12786
12787 * lisp/font-lock.el (font-lock-keywords): Fill the lines and 12787 * lisp/font-lock.el (font-lock-keywords): Fill the lines and
12788 reorganise some explanations (bug#21427). 12788 reorganize some explanations (bug#21427).
12789 12789
127902016-04-30 Lars Ingebrigtsen <larsi@gnus.org> 127902016-04-30 Lars Ingebrigtsen <larsi@gnus.org>
12791 12791
diff --git a/lisp/frame.el b/lisp/frame.el
index dc7bb24bb3a..b7a55169281 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1535,7 +1535,7 @@ FRAME can be a frame name, a terminal name, or a frame.
1535If FRAME is omitted or nil, use the currently selected frame. 1535If FRAME is omitted or nil, use the currently selected frame.
1536 1536
1537By default, the current monitor is said to be the physical 1537By default, the current monitor is said to be the physical
1538monitor dominating teh selected frame. A frame is dominated by 1538monitor dominating the selected frame. A frame is dominated by
1539a physical monitor when either the largest area of the frame resides 1539a physical monitor when either the largest area of the frame resides
1540in the monitor, or the monitor is the closest to the frame if the 1540in the monitor, or the monitor is the closest to the frame if the
1541frame does not intersect any physical monitors. 1541frame does not intersect any physical monitors.
diff --git a/src/xdisp.c b/src/xdisp.c
index 17a1cae0048..34ee877e6be 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -32257,7 +32257,7 @@ display table takes effect; in this case, Emacs does not consult
32257 DEFVAR_BOOL ("display-raw-bytes-as-hex", display_raw_bytes_as_hex, 32257 DEFVAR_BOOL ("display-raw-bytes-as-hex", display_raw_bytes_as_hex,
32258 doc: /* Non-nil means display raw bytes in hexadecimal format. 32258 doc: /* Non-nil means display raw bytes in hexadecimal format.
32259The default is to use octal format (\200) whereas hexadecimal (\x80) 32259The default is to use octal format (\200) whereas hexadecimal (\x80)
32260may be more familar to users. */); 32260may be more familiar to users. */);
32261 display_raw_bytes_as_hex = false; 32261 display_raw_bytes_as_hex = false;
32262 32262
32263} 32263}