summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2021-11-24 07:00:27 +0100
committerStefan Kangas <stefan@marxist.se>2021-11-24 07:00:27 +0100
commitd112c75f53c690e6f13ec3b340dbc384425bb04d (patch)
tree733e936fc0d5dd46733e45118a92a1597aca1f32
parentc484b749f204522b3e9df643cb371b9f5511f4d2 (diff)
parent756b8a5f1bd28aeadc804fd2f93ce7e823a1d4a2 (diff)
downloademacs-d112c75f53c690e6f13ec3b340dbc384425bb04d.tar.gz
emacs-d112c75f53c690e6f13ec3b340dbc384425bb04d.tar.bz2
emacs-d112c75f53c690e6f13ec3b340dbc384425bb04d.zip
Merge from origin/emacs-28
756b8a5f1b Fix typos in documentation 38fdeaef46 ; * etc/DEBUG: Fix last change.
-rw-r--r--doc/lispref/anti.texi2
-rw-r--r--doc/misc/efaq.texi6
-rw-r--r--etc/DEBUG11
3 files changed, 11 insertions, 8 deletions
diff --git a/doc/lispref/anti.texi b/doc/lispref/anti.texi
index 118df05c791..45cbff61e0b 100644
--- a/doc/lispref/anti.texi
+++ b/doc/lispref/anti.texi
@@ -135,7 +135,7 @@ the programmers should be trusted to know what they are doing.
@item
We deleted several features of the @code{pcase} macro, in accordance
-with our general plane to remove @code{pcase} from Emacs:
+with our general plan to remove @code{pcase} from Emacs:
@itemize @minus
@item
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 18342e65b0a..cdb6f9b5848 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -1086,7 +1086,7 @@ Emacs Lisp form at point.
@cindex pasting text on text terminals
@cindex bracketed paste mode
@item
-On text terminals that support the ``bracketed paste mode'' EMacs now
+On text terminals that support the ``bracketed paste mode'' Emacs now
uses that mode by default. This mode allows Emacs to distinguish
between pasted text and text typed by the user.
@@ -2542,12 +2542,12 @@ load @code{dired-x} by adding the following to your @file{.emacs} file:
(require 'dired-x))
@end lisp
-With @code{dired-x} loaded, @kbd{M-o} toggles omitting in each dired buffer.
+With @code{dired-x} loaded, @kbd{C-x M-o} toggles omitting in each dired buffer.
You can make omitting the default for new dired buffers by putting the
following in your @file{.emacs}:
@lisp
-(add-hook 'dired-mode-hook 'dired-omit-toggle)
+(add-hook 'dired-mode-hook 'dired-omit-mode)
@end lisp
If you're tired of seeing backup files whenever you do an @samp{ls} at
diff --git a/etc/DEBUG b/etc/DEBUG
index ced6a92d711..a05aeef1606 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -591,10 +591,13 @@ If you cannot figure out the cause for the problem using the above,
native-compile the problematic file after setting the variable
'comp-libgccjit-reproducer' to a non-nil value. That should produce a
file named ELNFILENAME_libgccjit_repro.c, where ELNFILENAME is the
-name of the problematic .eln file in the same directory where the .eln
-file is produced, or a file repro.c under your ~/.emacs.d/eln-cache
-(which one depends on how the native-compilation is invoked). Then
-attach that reproducer C file to your bug report.
+name of the problematic .eln file, either in the same directory where
+the .eln file is produced, or under your ~/.emacs.d/eln-cache (which
+one depends on how the native-compilation is invoked). It is also
+possible that the reproducer file's name will be something like
+subr--trampoline-XXXXXXX_FUNCTION_libgccjit_repro.c, where XXXXXXX is
+a long string of hex digits and FUNCTION is some function from the
+compiled .el file. Attach that reproducer C file to your bug report.
** Following longjmp call.