Merge from origin/emacs-26

d382d2bfc5 * etc/DEBUG (Getting control to the debugger): Fix grammar. 687af4c8e8 * lisp/vc/vc.el (vc-region-history): log-view-vc-fileset h... 43e2aafae3 Don't bind dframe events on load (Bug#29599) ab31bf3c5f * lisp/textmodes/picture.el (picture-mode-exit): Doc fix. ... ed44d92fa6 * lisp/textmodes/picture.el (picture-open-line): Doc fix. ... b87a772612 Fix description of 'emacs-internal' a5256da588 Update PROBLEMS with selection-related issues c59ecb005e New customization variable for python-mode indentation (Bu... 4e20c8f220 Fix menu keyboard shortcuts on macOS (Bug#29595) # Conflicts: # etc/NEWS
author: Paul Eggert 2018-01-09 15:29:25 -0800
committer: Paul Eggert 2018-01-09 15:29:25 -0800
commit: 646c8e56f8a11832f25523907b85d6522a99f361 (patch)
tree: 80ffd41982cfa018b827304ec5137ae6025f6080 /etc/DEBUG
parent: 85f5ee14b55489845eaafbdf70d7f4e25ec44ed7 (diff)
parent: d382d2bfc5072d4220b3e51785d22f70b147d63f (diff)
download: emacs-646c8e56f8a11832f25523907b85d6522a99f361.tar.gz
emacs-646c8e56f8a11832f25523907b85d6522a99f361.zip
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/DEBUG b/etc/DEBUG
index bb81414c817..c4774b06d38 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -201,7 +201,7 @@ errors go through there.  If you are only interested in errors that
 would fire the Lisp debugger, breaking at 'maybe_call_debugger' is
 useful.
-Another technique for get control to the debugger is to put a
+Another technique for getting control to the debugger is to put a
 breakpoint in some rarely used function.  One such convenient function
 is Fredraw_display, which you can invoke at will interactively with
 "M-x redraw-display RET".
author	Paul Eggert	2018-01-09 15:29:25 -0800
committer	Paul Eggert	2018-01-09 15:29:25 -0800
commit	646c8e56f8a11832f25523907b85d6522a99f361 (patch)
tree	80ffd41982cfa018b827304ec5137ae6025f6080 /etc/DEBUG
parent	85f5ee14b55489845eaafbdf70d7f4e25ec44ed7 (diff)
parent	d382d2bfc5072d4220b3e51785d22f70b147d63f (diff)
download	emacs-646c8e56f8a11832f25523907b85d6522a99f361.tar.gz emacs-646c8e56f8a11832f25523907b85d6522a99f361.zip

diff --git a/etc/DEBUG b/etc/DEBUG index bb81414c817..c4774b06d38 100644 --- a/etc/DEBUG +++ b/etc/DEBUG
@@ -201,7 +201,7 @@ errors go through there. If you are only interested in errors that
201	would fire the Lisp debugger, breaking at 'maybe_call_debugger' is	201	would fire the Lisp debugger, breaking at 'maybe_call_debugger' is
202	useful.	202	useful.
203		203
204	Another technique for get control to the debugger is to put a	204	Another technique for getting control to the debugger is to put a
205	breakpoint in some rarely used function. One such convenient function	205	breakpoint in some rarely used function. One such convenient function
206	is Fredraw_display, which you can invoke at will interactively with	206	is Fredraw_display, which you can invoke at will interactively with
207	"M-x redraw-display RET".	207	"M-x redraw-display RET".