aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXue Fuqiao2013-11-19 06:53:47 +0800
committerXue Fuqiao2013-11-19 06:53:47 +0800
commit4ae3802fbff3f1892abb86562509d078e28779db (patch)
tree83adf255a6ce293a3262cb5feb0a073bd5f82d8e
parent23e79746d106da98db4df48e02e256515bae02be (diff)
downloademacs-4ae3802fbff3f1892abb86562509d078e28779db.tar.gz
emacs-4ae3802fbff3f1892abb86562509d078e28779db.zip
Add some indexes and a cross-reference.
* doc/lispref/os.texi (Session Management, Desktop Notifications): Add some indexes and a cross-reference.
-rw-r--r--doc/emacs/cmdargs.texi1
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/os.texi5
3 files changed, 10 insertions, 1 deletions
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index d0f5f1e06b1..143e03cde63 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -10,6 +10,7 @@
10@cindex switches (command line) 10@cindex switches (command line)
11@cindex startup (command line arguments) 11@cindex startup (command line arguments)
12@cindex invocation (command line arguments) 12@cindex invocation (command line arguments)
13@c FIXME: Document `--smid'? --xfq
13 14
14 Emacs supports command line arguments to request various actions 15 Emacs supports command line arguments to request various actions
15when invoking Emacs. These are for compatibility with other editors 16when invoking Emacs. These are for compatibility with other editors
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index f4fc1acfa69..b35358366e3 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12013-11-18 Xue Fuqiao <xfq.free@gmail.com>
2
3 * os.texi (Session Management, Desktop Notifications): Add some
4 indexes and a cross-reference.
5
12013-11-17 Xue Fuqiao <xfq.free@gmail.com> 62013-11-17 Xue Fuqiao <xfq.free@gmail.com>
2 7
3 * os.texi (Time Parsing): 8 * os.texi (Time Parsing):
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 0cd9e1465dc..c0e029be912 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -2244,6 +2244,7 @@ saved session to restore. For Emacs, this argument is @samp{--smid
2244@var{session}}. 2244@var{session}}.
2245 2245
2246@defvar emacs-save-session-functions 2246@defvar emacs-save-session-functions
2247@cindex session file
2247Emacs supports saving state via a hook called 2248Emacs supports saving state via a hook called
2248@code{emacs-save-session-functions}. Emacs runs this hook when the 2249@code{emacs-save-session-functions}. Emacs runs this hook when the
2249session manager tells it that the window system is shutting down. The 2250session manager tells it that the window system is shutting down. The
@@ -2283,11 +2284,13 @@ Emacs is restarted by the session manager.
2283@node Desktop Notifications 2284@node Desktop Notifications
2284@section Desktop Notifications 2285@section Desktop Notifications
2285@cindex desktop notifications 2286@cindex desktop notifications
2287@cindex notifications, on desktop
2286 2288
2287Emacs is able to send @dfn{notifications} on systems that support the 2289Emacs is able to send @dfn{notifications} on systems that support the
2288freedesktop.org Desktop Notifications Specification. In order to use 2290freedesktop.org Desktop Notifications Specification. In order to use
2289this functionality, Emacs must have been compiled with D-Bus support, 2291this functionality, Emacs must have been compiled with D-Bus support,
2290and the @code{notifications} library must be loaded. 2292and the @code{notifications} library must be loaded. @xref{Top, ,
2293D-Bus,dbus,D-Bus integration in Emacs}.
2291 2294
2292@defun notifications-notify &rest params 2295@defun notifications-notify &rest params
2293This function sends a notification to the desktop via D-Bus, 2296This function sends a notification to the desktop via D-Bus,