[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 76cf14f 3/6: Merge from origin/emacs-27
From: |
Glenn Morris |
Subject: |
master 76cf14f 3/6: Merge from origin/emacs-27 |
Date: |
Sun, 3 May 2020 10:55:22 -0400 (EDT) |
branch: master
commit 76cf14f9ca312d6862515d7b9dc12c878eaa1d6b
Merge: f696dc8 1d477a0
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Merge from origin/emacs-27
1d477a0fec Recommend to avoid unnecessary abbreviations in doc
aea1b4db72 Revert "Fix calculator division truncation (bug#40892)"
---
doc/lispref/tips.texi | 8 ++++++++
lisp/calculator.el | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index 3b8da35..5b09b2c 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -821,6 +821,14 @@ most cases, the meaning is clear with just ``if''.
Otherwise, try to
find an alternate phrasing that conveys the meaning.
@item
+Try to avoid using abbreviations such as ``e.g.'' (for ``for
+example''), ``i.e.'' (for ``that is''), ``no.'' (for ``number''),
+``c.f.'' (for ``in contrast to'') and ``w.r.t.'' (for ``with respect
+to'') as much as possible. It is almost always clearer and easier to
+read the expanded version.@footnote{We do use these occasionally, but
+try not to overdo it.}
+
+@item
When a command is meaningful only in a certain mode or situation,
do mention that in the documentation string. For example,
the documentation of @code{dired-find-file} is:
diff --git a/lisp/calculator.el b/lisp/calculator.el
index 7e0b2fc..6996990 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -864,7 +864,7 @@ The result should not exceed the screen width."
"\\.\\([^0-9].*\\)?$" ".0\\1" str))
(str (replace-regexp-in-string
"[eE][+-]?\\([^0-9].*\\)?$" "e0\\1" str)))
- (float (string-to-number str)))))
+ (string-to-number str))))
(defun calculator-push-curnum ()
"Push the numeric value of the displayed number to the stack."
- master updated (5f516dc -> 4c1a28b), Glenn Morris, 2020/05/03
- master f696dc8 2/6: ; Merge from origin/emacs-27, Glenn Morris, 2020/05/03
- master c6d70f8 1/6: Merge from origin/emacs-27, Glenn Morris, 2020/05/03
- master 76cf14f 3/6: Merge from origin/emacs-27,
Glenn Morris <=
- master 8b4a61d 4/6: ; Merge from origin/emacs-27, Glenn Morris, 2020/05/03
- master 99a544c 5/6: Merge from origin/emacs-27, Glenn Morris, 2020/05/03
- master 4c1a28b 6/6: ; Merge from origin/emacs-27, Glenn Morris, 2020/05/03