summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/byte-run.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2021-10-05 07:50:22 -0700
committerGlenn Morris <rgm@gnu.org>2021-10-05 07:50:22 -0700
commit2dc88a27a46ab1798383483454e45a7d69caa3d0 (patch)
tree23d4b8709c7c3c12f65c97ac4f51b9cc13d47f35 /lisp/emacs-lisp/byte-run.el
parent6090e0f23e80945641970a6caa3681870b80e7fa (diff)
parent63abe976ce65e42d67730d0577854867bc83e69c (diff)
downloademacs-2dc88a27a46ab1798383483454e45a7d69caa3d0.tar.gz
emacs-2dc88a27a46ab1798383483454e45a7d69caa3d0.tar.bz2
emacs-2dc88a27a46ab1798383483454e45a7d69caa3d0.zip
Merge from origin/emacs-28
63abe976ce (origin/emacs-28) Document minibuffer-default-prompt-forma... b5afbedc90 Backward compatibility option for 'nobreak-char-display' ea1b728a06 ; * lisp/dired.el: Fix typo. 984eafeb98 Unbreak the build after Gnulib update 5946370cd1 Check, whether an FUSE mount has been broken in Tramp 90575a6c0c Disable 'nobreak-char-display' in Eldoc buffers 570e2c9a17 Fix small error in comint-send-input fd7bb31412 Update documentation of search-whitespace-regexp 1f4ced47a1 Fix cc-compat.el syntax error b431f54c1b Mention `seq-uniq' in `delete-dups' documentation 0a7bab689c ; Minor stylistic fixes found by checkdoc e2861e2d08 ; * etc/NEWS: Fix typo. 1a65d49931 Port recent Gnulib changes to MS-Windows 68a256c892 Update from Gnulib 63cb65dcce * Fix mh tests for native comp builds (bug#50975) e606cc6f40 * Fix `batch-native-compile' not to spawn a subprocess 894dfe70da Fix native-compilation build from tarball on Cygwin 2ce5e08058 Remove U+FE0F from script-representative-chars # Conflicts: # etc/NEWS
Diffstat (limited to 'lisp/emacs-lisp/byte-run.el')
-rw-r--r--lisp/emacs-lisp/byte-run.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 35c80e524cf..da86fa5cecf 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -422,7 +422,8 @@ was first made obsolete, for example a date or a release number."
&optional docstring)
"Set OBSOLETE-NAME's function definition to CURRENT-NAME and mark it obsolete.
-\(define-obsolete-function-alias \\='old-fun \\='new-fun \"28.1\" \"old-fun's doc.\")
+\(define-obsolete-function-alias \\='old-fun \\='new-fun \"28.1\" \
+\"old-fun's doc.\")
is equivalent to the following two lines of code: