aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/lispref/ChangeLog7
-rw-r--r--doc/lispref/errors.texi2
-rw-r--r--doc/lispref/files.texi2
-rw-r--r--doc/lispref/os.texi15
4 files changed, 12 insertions, 14 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 08ec4c2fef..d8d21794ba 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-24 Michael Albinus <[email protected]>
+
+ * errors.texi (Standard Errors): Fix typo.
+
+ * files.texi (Magic File Names):
+ * os.texi (File Notifications): Remove file-notify-supported-p.
+
2013-07-24 Paul Eggert <[email protected]>
* eval.texi (Special Forms): Mention 'lambda'. Also, say that
diff --git a/doc/lispref/errors.texi b/doc/lispref/errors.texi
index 264604470d..87cfcfa532 100644
--- a/doc/lispref/errors.texi
+++ b/doc/lispref/errors.texi
@@ -126,7 +126,7 @@ This is a subcategory of @code{file-error}. @xref{Modification Time}.
@c filenotify.el
@item file-notify-error
This is a subcategory of @code{file-error}. It happens, when a file
-could not be set to be watched for changes. @xref{File Notifications}.
+could not be watched for changes. @xref{File Notifications}.
@c net/ange-ftp.el
@item ftp-error
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index d2d327585c..77b097ae90 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -2780,7 +2780,6 @@ first, before handlers for jobs such as remote file access.
@code{file-name-nondirectory},
@code{file-name-sans-versions}, @code{file-newer-than-file-p},
@code{file-notify-add-watch}, @code{file-notify-rm-watch},
-@code{file-notify-supported-p},
@code{file-ownership-preserved-p},
@code{file-readable-p}, @code{file-regular-p},
@code{file-remote-p}, @code{file-selinux-context},
@@ -2834,7 +2833,6 @@ first, before handlers for jobs such as remote file access.
@code{file-name-nondirec@discretionary{}{}{}tory},
@code{file-name-sans-versions}, @code{file-newer-than-file-p},
@code{file-notify-add-watch}, @code{file-notify-rm-watch},
-@code{file-notify-supported-p},
@code{file-ownership-pre@discretionary{}{}{}served-p},
@code{file-readable-p}, @code{file-regular-p},
@code{file-remote-p}, @code{file-selinux-context},
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index fd52f55d81..071fcf526d 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -2529,17 +2529,6 @@ Since all these libraries emit different events on notified file
changes, there is the Emacs library @code{filenotify} which provides a
unique interface.
-@defun file-notify-supported-p file
-This function returns non-nil if the filesystem pertaining to
-@var{file} could be watched. This means, that Emacs is linked with a
-respective library (for local files), or Emacs has found an applicable
-file notification process on a remote machine.
-
-Sometimes, mounted filesystems cannot be watched for file changes.
-This is not detected by this function, a non-@code{nil} return value
-does not guarantee that changes on @var{file} will be notified.
-@end defun
-
@defun file-notify-add-watch file flags callback
Add a watch for filesystem events pertaining to @var{file}. This
arranges for filesystem events pertaining to @var{file} to be reported
@@ -2553,6 +2542,10 @@ integer as in the example below. It should be used for comparison by
If the @var{file} cannot be watched for some reason, this function
signals a @code{file-notify-error} error.
+Sometimes, mounted filesystems cannot be watched for file changes.
+This is not detected by this function, a non-@code{nil} return value
+does not guarantee that changes on @var{file} will be notified.
+
@var{flags} is a list of conditions to set what will be watched for.
It can include the following symbols: