From: Po Lu <luangruo@yahoo.com>
Date: Fri, 24 Nov 2023 00:44:34 +0000 (+0800)
Subject: Merge from savannah/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1737ffd3a83b0d2fd4a114e9b5187d28d577dc38;p=emacs.git

Merge from savannah/emacs-29

1978b603bc3 Make python-ts-mode's syntax-highlighting more standardized
99658346d1e ; Improve documentation of desktop.el in user manual
f7dc0202127 Fix "Text is read-only" on backspacing initial Calc input
662d54775d5 Add a doc string to simple.el (bug#67355)
5a5e36d2aad ; Improve function documentation tips
86016d8ecdb Mention "visual line" in user manual
4bb65ed77a8 ; * doc/lispref/minibuf.texi (Programmed Completion): Imp...
dfb3dcb404c Allow listing Emoji from a read-only buffer

# Conflicts:
#	lisp/calc/calc.el
#	lisp/international/emoji.el
---

1737ffd3a83b0d2fd4a114e9b5187d28d577dc38
diff --cc lisp/calc/calc.el
index b347cc1da23,06ccb0f0cfa..41aeb17c252
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@@ -2491,9 -2477,8 +2491,9 @@@ the United States.
  (defun calcDigit-backspace ()
    (interactive)
    (cond ((eq last-command 'calcDigit-start)
- 	 (erase-buffer))
+ 	 (delete-minibuffer-contents))
 -	(t (backward-delete-char 1)))
 +	(t (with-suppressed-warnings ((interactive-only backward-delete-char))
 +             (backward-delete-char 1))))
    (if (= (calc-minibuffer-size) 0)
        (progn
  	(setq last-command-event 13)