summaryrefslogtreecommitdiff
path: root/src/frame.h
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2020-02-13 07:50:24 -0800
committerGlenn Morris <rgm@gnu.org>2020-02-13 07:50:24 -0800
commit56ce263f506fede328888a321a12b1f85f46d0d5 (patch)
tree1d881d6ca6c46b62cffaa93e25ff4b88f3bcc2c7 /src/frame.h
parent5b160b39c43b7e3d4e377832c306e2e48b53e7e1 (diff)
parentad5e350ab764f3a420d29f24ab3222f671b2e8c0 (diff)
downloademacs-56ce263f506fede328888a321a12b1f85f46d0d5.tar.gz
Merge from origin/emacs-27
ad5e350ab7 c-end-of-macro: Handle block coment lines with unescaped N... 06c302d425 Fix set-fontset-font with ADD arg non-nil 530067463b Correct "different than" to "different from" where appropr... 56b8768b32 More accurate documentation of 'package-menu-hide-package'
Diffstat (limited to 'src/frame.h')
-rw-r--r--src/frame.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/frame.h b/src/frame.h
index 68dc0ce3649..641bb430d0e 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -108,7 +108,7 @@ struct frame
to redirect keystrokes to a surrogate minibuffer frame when
needed.
- Note that a value of nil is different than having the field point
+ Note that a value of nil is different from having the field point
to the frame itself. Whenever the Fselect_frame function is used
to shift from one frame to the other, any redirections to the
original frame are shifted to the newly selected frame; if