aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/data.c10
-rw-r--r--src/fileio.c2
3 files changed, 11 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 72aaea5eeb6..6f864f5eef5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12014-06-08 Glenn Morris <rgm@gnu.org>
2
3 * fileio.c (write-region-inhibit-fsync): Doc tweak.
4
5 * data.c (Flss, Fgtr, Fleq, Fgeq): Doc tweaks.
6
12014-06-08 Paul Eggert <eggert@cs.ucla.edu> 72014-06-08 Paul Eggert <eggert@cs.ucla.edu>
2 8
3 If a C name must be extern on some platforms, make it extern on all. 9 If a C name must be extern on some platforms, make it extern on all.
diff --git a/src/data.c b/src/data.c
index 0c90944f0ad..2de1c19452c 100644
--- a/src/data.c
+++ b/src/data.c
@@ -2347,7 +2347,7 @@ usage: (= NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */)
2347} 2347}
2348 2348
2349DEFUN ("<", Flss, Slss, 1, MANY, 0, 2349DEFUN ("<", Flss, Slss, 1, MANY, 0,
2350 doc: /* Return t if each arg is less than the next arg. All must be numbers or markers. 2350 doc: /* Return t if each arg (a number or marker), is less than the next arg.
2351usage: (< NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */) 2351usage: (< NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */)
2352 (ptrdiff_t nargs, Lisp_Object *args) 2352 (ptrdiff_t nargs, Lisp_Object *args)
2353{ 2353{
@@ -2355,7 +2355,7 @@ usage: (< NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */)
2355} 2355}
2356 2356
2357DEFUN (">", Fgtr, Sgtr, 1, MANY, 0, 2357DEFUN (">", Fgtr, Sgtr, 1, MANY, 0,
2358 doc: /* Return t if each arg is greater than the next arg. All must be numbers or markers. 2358 doc: /* Return t if each arg (a number or marker) is greater than the next arg.
2359usage: (> NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */) 2359usage: (> NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */)
2360 (ptrdiff_t nargs, Lisp_Object *args) 2360 (ptrdiff_t nargs, Lisp_Object *args)
2361{ 2361{
@@ -2363,8 +2363,7 @@ usage: (> NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */)
2363} 2363}
2364 2364
2365DEFUN ("<=", Fleq, Sleq, 1, MANY, 0, 2365DEFUN ("<=", Fleq, Sleq, 1, MANY, 0,
2366 doc: /* Return t if each arg is less than or equal to the next arg. 2366 doc: /* Return t if each arg (a number or marker) is less than or equal to the next.
2367All must be numbers or markers.
2368usage: (<= NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */) 2367usage: (<= NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */)
2369 (ptrdiff_t nargs, Lisp_Object *args) 2368 (ptrdiff_t nargs, Lisp_Object *args)
2370{ 2369{
@@ -2372,8 +2371,7 @@ usage: (<= NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */)
2372} 2371}
2373 2372
2374DEFUN (">=", Fgeq, Sgeq, 1, MANY, 0, 2373DEFUN (">=", Fgeq, Sgeq, 1, MANY, 0,
2375 doc: /* Return t if each arg is greater than or equal to the next arg. 2374 doc: /* Return t if each arg (a number or marker) is greater than or equal to the next.
2376All must be numbers or markers.
2377usage: (>= NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */) 2375usage: (>= NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */)
2378 (ptrdiff_t nargs, Lisp_Object *args) 2376 (ptrdiff_t nargs, Lisp_Object *args)
2379{ 2377{
diff --git a/src/fileio.c b/src/fileio.c
index 8b20c65802d..dc3ed431d40 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -6029,7 +6029,7 @@ file is usually more useful if it contains the deleted text. */);
6029 doc: /* Non-nil means don't call fsync in `write-region'. 6029 doc: /* Non-nil means don't call fsync in `write-region'.
6030This variable affects calls to `write-region' as well as save commands. 6030This variable affects calls to `write-region' as well as save commands.
6031Setting this to nil may avoid data loss if the system loses power or 6031Setting this to nil may avoid data loss if the system loses power or
6032the operating system crashes. */); 6032the operating system crashes. By default, it is non-nil in batch mode. */);
6033 write_region_inhibit_fsync = 0; /* See also `init_fileio' above. */ 6033 write_region_inhibit_fsync = 0; /* See also `init_fileio' above. */
6034 6034
6035 DEFVAR_BOOL ("delete-by-moving-to-trash", delete_by_moving_to_trash, 6035 DEFVAR_BOOL ("delete-by-moving-to-trash", delete_by_moving_to_trash,