summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2013-09-11 11:20:20 +0400
committerDmitry Antipov <dmantipov@yandex.ru>2013-09-11 11:20:20 +0400
commit53482f41157f37a7f6afb7f19be8fc63b015f6ed (patch)
treee5b18d5f114bcf9e0882d04f8deb35e57ab22e7c /src
parent2a08047aed0017cc2b639e189fc3b5d41c46fcbd (diff)
downloademacs-53482f41157f37a7f6afb7f19be8fc63b015f6ed.tar.gz
emacs-53482f41157f37a7f6afb7f19be8fc63b015f6ed.tar.bz2
emacs-53482f41157f37a7f6afb7f19be8fc63b015f6ed.zip
Fix last change.
* data.c (Feqlsign, Flss, Fgtr, Fleq, Fgeq): Add convenient 'usage' docstring entry to pacify make-docfile.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog15
-rw-r--r--src/data.c15
2 files changed, 25 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e609c38be7e..f51e6a147bf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2013-09-11 Dmitry Antipov <dmantipov@yandex.ru>
+
+ Fix last change.
+ * data.c (Feqlsign, Flss, Fgtr, Fleq, Fgeq): Add convenient
+ 'usage' docstring entry to pacify make-docfile.
+
+2013-09-11 Barry O'Reilly <gundaetiapo@gmail.com>
+
+ Change comparison functions =, <, >, <=, >= to take many arguments.
+ * data.c: Change comparison functions' interface and implementation.
+ * lisp.h: Make arithcompare available for efficient two arg
+ comparisons.
+ * bytecode.c: Use arithcompare.
+ * fileio.c: Use new interface.
+
2013-09-11 Stefan Monnier <monnier@iro.umontreal.ca>
* keyboard.c (read_char): Don't break immediate_echo (bug#15332).
diff --git a/src/data.c b/src/data.c
index 7f28028f604..51b0266eca1 100644
--- a/src/data.c
+++ b/src/data.c
@@ -2321,21 +2321,24 @@ arithcompare_driver (ptrdiff_t nargs, Lisp_Object *args,
}
DEFUN ("=", Feqlsign, Seqlsign, 1, MANY, 0,
- doc: /* Return t if args, all numbers or markers, are equal. */)
+ doc: /* Return t if args, all numbers or markers, are equal.
+usage: (= NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */)
(ptrdiff_t nargs, Lisp_Object *args)
{
return arithcompare_driver (nargs, args, ARITH_EQUAL);
}
DEFUN ("<", Flss, Slss, 1, MANY, 0,
- doc: /* Return t if each arg is less than the next arg. All must be numbers or markers. */)
+ doc: /* Return t if each arg is less than the next arg. All must be numbers or markers.
+usage: (< NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */)
(ptrdiff_t nargs, Lisp_Object *args)
{
return arithcompare_driver (nargs, args, ARITH_LESS);
}
DEFUN (">", Fgtr, Sgtr, 1, MANY, 0,
- doc: /* Return t if each arg is greater than the next arg. All must be numbers or markers. */)
+ doc: /* Return t if each arg is greater than the next arg. All must be numbers or markers.
+usage: (> NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */)
(ptrdiff_t nargs, Lisp_Object *args)
{
return arithcompare_driver (nargs, args, ARITH_GRTR);
@@ -2343,7 +2346,8 @@ DEFUN (">", Fgtr, Sgtr, 1, MANY, 0,
DEFUN ("<=", Fleq, Sleq, 1, MANY, 0,
doc: /* Return t if each arg is less than or equal to the next arg.
-All must be numbers or markers. */)
+All must be numbers or markers.
+usage: (<= NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */)
(ptrdiff_t nargs, Lisp_Object *args)
{
return arithcompare_driver (nargs, args, ARITH_LESS_OR_EQUAL);
@@ -2351,7 +2355,8 @@ All must be numbers or markers. */)
DEFUN (">=", Fgeq, Sgeq, 1, MANY, 0,
doc: /* Return t if each arg is greater than or equal to the next arg.
-All must be numbers or markers. */)
+All must be numbers or markers.
+usage: (= NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */)
(ptrdiff_t nargs, Lisp_Object *args)
{
return arithcompare_driver (nargs, args, ARITH_GRTR_OR_EQUAL);