]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-28
authorStefan Kangas <stefankangas@gmail.com>
Tue, 1 Nov 2022 09:30:09 +0000 (10:30 +0100)
committerStefan Kangas <stefankangas@gmail.com>
Tue, 1 Nov 2022 09:30:09 +0000 (10:30 +0100)
1862df834c ; * src/search.c (Fmatch_data): Doc fix.
15fc5225b1 ; * lisp/whitespace.el (whitespace-trailing): Fix a typo.
9f3c896f7c ; * doc/emacs/text.texi (Quotation Marks): Typo fix.  (Bug...

# Conflicts:
# src/search.c

1  2 
doc/emacs/text.texi
lisp/whitespace.el
src/search.c

Simple merge
Simple merge
diff --cc src/search.c
Simple merge