summaryrefslogtreecommitdiff
path: root/src/frame.c
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-03-08 08:29:14 -0800
committerGlenn Morris <rgm@gnu.org>2018-03-08 08:29:14 -0800
commit43548b51cb94c15af41b61b90172e05b9443a39b (patch)
tree02b92328987a8c98f4e73a4081fb310ae1c83693 /src/frame.c
parent50e2c0fb5180a757d8d533518f68837ffe5909be (diff)
parentcb0d40eab406e7df22b09f7ae5557c820c087af4 (diff)
downloademacs-43548b51cb94c15af41b61b90172e05b9443a39b.tar.gz
emacs-43548b51cb94c15af41b61b90172e05b9443a39b.tar.bz2
emacs-43548b51cb94c15af41b61b90172e05b9443a39b.zip
Merge from origin/emacs-26
cb0d40e (origin/emacs-26) Minor change in the manual 7e26d83 More minor changes in the manual 6851754 Replace some obsolete aliases in code 6bcb48c Replace some obsolete aliases in documentation 317da2a Minor improvements in manuals 61c1f80 Minor copyedits in display.texi d523e4a Remove some unused spam.el variables 501808c Replace some obsolete aliases in code 19afff3 Replace some obsolete aliases in documentation c797bc9 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... 0efe0bd Obsolete eshell-cmpl-suffix-list add48d2 More minor changes in the Glossary of the Emacs manual f6bd7e0 Revert last commit af4697f Define if-let* and derivatives as aliases for if-let etc ec79bdc Minor fix in Emacs manual's Glossary
Diffstat (limited to 'src/frame.c')
-rw-r--r--src/frame.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/frame.c b/src/frame.c
index fdde3d99a93..86caa32615d 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1421,7 +1421,7 @@ do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object nor
/* We want to make sure that the next event generates a frame-switch
event to the appropriate frame. This seems kludgy to me, but
before you take it out, make sure that evaluating something like
- (select-window (frame-root-window (new-frame))) doesn't end up
+ (select-window (frame-root-window (make-frame))) doesn't end up
with your typing being interpreted in the new frame instead of
the one you're actually typing in. */
#ifdef HAVE_WINDOW_SYSTEM