diff options
| author | Xue Fuqiao | 2013-11-19 17:47:02 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-11-19 17:47:02 +0800 |
| commit | a6e3a5d5d5f56c5f523f65e42fa76aa22e0adcf1 (patch) | |
| tree | 2ae317fd966935c07a5757cfa3740f56d7f5a061 | |
| parent | e0855d7de9e223738866e5059e287947aaf0587e (diff) | |
| download | emacs-a6e3a5d5d5f56c5f523f65e42fa76aa22e0adcf1.tar.gz emacs-a6e3a5d5d5f56c5f523f65e42fa76aa22e0adcf1.zip | |
Doc fixes.
* lisp/filenotify.el (file-notify-add-watch): Refine doc string.
* doc/lispref/os.texi (File Notifications): Add an index.
* doc/lispref/loading.texi (Loading): Add an cross-reference.
| -rw-r--r-- | doc/lispref/ChangeLog | 6 | ||||
| -rw-r--r-- | doc/lispref/files.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/loading.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/os.texi | 1 | ||||
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/filenotify.el | 2 |
6 files changed, 16 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index b35358366e3..e298f79d1c0 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-11-19 Xue Fuqiao <xfq.free@gmail.com> | ||
| 2 | |||
| 3 | * os.texi (File Notifications): Add an index. | ||
| 4 | |||
| 5 | * loading.texi (Loading): Add an cross-reference. | ||
| 6 | |||
| 1 | 2013-11-18 Xue Fuqiao <xfq.free@gmail.com> | 7 | 2013-11-18 Xue Fuqiao <xfq.free@gmail.com> |
| 2 | 8 | ||
| 3 | * os.texi (Session Management, Desktop Notifications): Add some | 9 | * os.texi (Session Management, Desktop Notifications): Add some |
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 944a1e37cc4..36c6aa5e5ee 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi | |||
| @@ -1663,6 +1663,8 @@ version of an existing file; saving a file preserves its existing | |||
| 1663 | permissions. | 1663 | permissions. |
| 1664 | @end defun | 1664 | @end defun |
| 1665 | 1665 | ||
| 1666 | @c FIXME: The return value is decimal? Octal? We should explain it | ||
| 1667 | @c further. --xfq | ||
| 1666 | @defun default-file-modes | 1668 | @defun default-file-modes |
| 1667 | This function returns the default file permissions, as an integer. | 1669 | This function returns the default file permissions, as an integer. |
| 1668 | @end defun | 1670 | @end defun |
diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index 637057c99b0..07dbce21cb2 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi | |||
| @@ -29,6 +29,8 @@ into a buffer and evaluated there. (Indeed, most code is tested this | |||
| 29 | way.) Most often, the forms are function definitions and variable | 29 | way.) Most often, the forms are function definitions and variable |
| 30 | definitions. | 30 | definitions. |
| 31 | 31 | ||
| 32 | For on-demand loading of external libraries, @pxref{Dynamic Libraries}. | ||
| 33 | |||
| 32 | @menu | 34 | @menu |
| 33 | * How Programs Do Loading:: The @code{load} function and others. | 35 | * How Programs Do Loading:: The @code{load} function and others. |
| 34 | * Load Suffixes:: Details about the suffixes that @code{load} tries. | 36 | * Load Suffixes:: Details about the suffixes that @code{load} tries. |
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index c0e029be912..ed9b8b93a89 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi | |||
| @@ -2526,6 +2526,7 @@ specification prior to @samp{"1.0"}. | |||
| 2526 | @node File Notifications | 2526 | @node File Notifications |
| 2527 | @section Notifications on File Changes | 2527 | @section Notifications on File Changes |
| 2528 | @cindex file notifications | 2528 | @cindex file notifications |
| 2529 | @cindex watch, for filesystem events | ||
| 2529 | 2530 | ||
| 2530 | Several operating systems support watching of filesystems for changes | 2531 | Several operating systems support watching of filesystems for changes |
| 2531 | of files. If configured properly, Emacs links a respective library | 2532 | of files. If configured properly, Emacs links a respective library |
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2efec7efe99..9ad7e8a7d79 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-11-19 Xue Fuqiao <xfq.free@gmail.com> | ||
| 2 | |||
| 3 | * filenotify.el (file-notify-add-watch): Doc fix. | ||
| 4 | |||
| 1 | 2013-11-19 Leo Liu <sdl.web@gmail.com> | 5 | 2013-11-19 Leo Liu <sdl.web@gmail.com> |
| 2 | 6 | ||
| 3 | * obsolete/rcompile.el: Mark obsolete. | 7 | * obsolete/rcompile.el: Mark obsolete. |
diff --git a/lisp/filenotify.el b/lisp/filenotify.el index 5a5435bb4cb..c980d720714 100644 --- a/lisp/filenotify.el +++ b/lisp/filenotify.el | |||
| @@ -207,7 +207,7 @@ include the following symbols: | |||
| 207 | permissions or modification time | 207 | permissions or modification time |
| 208 | 208 | ||
| 209 | If FILE is a directory, 'change' watches for file creation or | 209 | If FILE is a directory, 'change' watches for file creation or |
| 210 | deletion in that directory. | 210 | deletion in that directory. This does not work recursively. |
| 211 | 211 | ||
| 212 | When any event happens, Emacs will call the CALLBACK function passing | 212 | When any event happens, Emacs will call the CALLBACK function passing |
| 213 | it a single argument EVENT, which is of the form | 213 | it a single argument EVENT, which is of the form |