aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorGlenn Morris2020-04-11 07:50:12 -0700
committerGlenn Morris2020-04-11 07:50:12 -0700
commit1988ffbaed709dfc71126efbf06644476830f07e (patch)
treefdc98855a3ab7bf6d6cb4c8826ec4a9dfc603d33 /doc/misc
parentb902d7c9d07b2cc951fa5c789d585d65366d19d2 (diff)
parentfd27685c1e68e742abf1698573dac53743f15e48 (diff)
downloademacs-1988ffbaed709dfc71126efbf06644476830f07e.tar.gz
emacs-1988ffbaed709dfc71126efbf06644476830f07e.zip
Merge from origin/emacs-27
fd27685c1e (origin/emacs-27) ; * doc/lispref/keymaps.texi (Extended M... 6057d79a4e * doc/lispref/keymaps.texi (Extended Menu Items): Tweak :k... 17a1bb5a03 Fix redisplay when scrolling under redisplay-dont-pause 90321f595c Fix face extension in pulse.el 36c42d2a30 * doc/misc/tramp.texi (Bug Reports): Avoid line breaks in ... d5750af151 Avoid assertion violation in intervals.c 18d1bc0a09 Improve documentation of 'jit-lock-contextually' 08486f4cae Speed up 'resize-mode' child frames a little f451ef9308 ; * etc/NEWS: Mention 'executing-macro' in removed vars. c49d379f17 Fix some problems with moving and resizing child frames # Conflicts: # etc/NEWS
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/tramp.texi3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 75d2fd11bb4..4e39728a146 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -3842,7 +3842,8 @@ the verbosity level to 6 (@pxref{Traces and Profiles, Traces}) in the
3842contents of the @file{*tramp/foo*} and @file{*debug tramp/foo*} 3842contents of the @file{*tramp/foo*} and @file{*debug tramp/foo*}
3843buffers with the bug report. Both buffers could contain 3843buffers with the bug report. Both buffers could contain
3844non-@acronym{ASCII} characters which are relevant for analysis, append 3844non-@acronym{ASCII} characters which are relevant for analysis, append
3845the buffers as attachments to the bug report. 3845the buffers as attachments to the bug report. This is also needed in
3846order to avoid line breaks during mail transfer.
3846 3847
3847@strong{Note} that a verbosity level greater than 6 is not necessary 3848@strong{Note} that a verbosity level greater than 6 is not necessary
3848at this stage. Also note that a verbosity level of 6 or greater, the 3849at this stage. Also note that a verbosity level of 6 or greater, the