Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-300

6 files changed, 54 insertions, 34 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 586f250bd06..bfeb88f7830 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-14  Martin Rudalics  <rudalics@gmx.at>
+
+        * nonascii.texi (Encoding and I/O): Reword to avoid saying
+        "visit the current buffer".
+
+        * os.texi (System Interface): Fix typo.
+
 2007-12-04  Richard Stallman  <rms@gnu.org>
 
         * objects.texi (Symbol Type): Fix typo.
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 7c504aef2cd..16f70f57b9d 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -727,15 +727,15 @@ operation finishes the job of choosing a coding system.  Very often
 you will want to find out afterwards which coding system was chosen.
 
 @defvar buffer-file-coding-system
-This buffer-local variable records the coding system that was used to visit
-the current buffer.  It is used for saving the buffer, and for writing part
-of the buffer with @code{write-region}.  If the text to be written
-cannot be safely encoded using the coding system specified by this
-variable, these operations select an alternative encoding by calling
-the function @code{select-safe-coding-system} (@pxref{User-Chosen
-Coding Systems}).  If selecting a different encoding requires to ask
-the user to specify a coding system, @code{buffer-file-coding-system}
-is updated to the newly selected coding system.
+This buffer-local variable records the coding system used for saving the
+buffer and for writing part of the buffer with @code{write-region}.  If
+the text to be written cannot be safely encoded using the coding system
+specified by this variable, these operations select an alternative
+encoding by calling the function @code{select-safe-coding-system}
+(@pxref{User-Chosen Coding Systems}).  If selecting a different encoding
+requires to ask the user to specify a coding system,
+@code{buffer-file-coding-system} is updated to the newly selected coding
+system.
 
 @code{buffer-file-coding-system} does @emph{not} affect sending text
 to a subprocess.
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index bff759215da..6c237d83457 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -21,8 +21,8 @@ pertaining to the terminal and the screen.
 * System Environment::  Distinguish the name and kind of system.
 * User Identification:: Finding the name and user id of the user.
 * Time of Day::         Getting the current time.
-* Time Conversion::     Converting a time from numeric form
-                          to calendrical data, and vice versa).
+* Time Conversion::     Converting a time from numeric form to 
+                          calendrical data and vice versa.
 * Time Parsing::        Converting a time from numeric form to text
                           and vice versa.
 * Processor Run Time::  Getting the run time used by Emacs.
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 61fd28a0622..8e4eab56b15 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,13 @@
+2007-12-14  Sven Joachim  <svenjoac@gmx.de>
+
+        * gnus.texi (Score Variables): Fix typo.
+
+2007-12-07  Michael Albinus  <michael.albinus@gmx.de>
+
+        * dbus.texi (Synchronous Methods): Adapt dbus-call-method.
+        (Signals): Adapt dbus-send-signal and dbus-register-signal.
+        (Errors and Events): Adapt dbus-event.
+
 2007-12-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus.texi (Other Files): Add the yenc command.
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index 14ceea37d1d..b5c8ce3efb1 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -318,7 +318,7 @@ which carries the input parameters to the object owning the method to
 be called, and a reply message returning the resulting output
 parameters from the object.
 
-@defun dbus-call-method bus method service path interface &rest args
+@defun dbus-call-method bus service path interface method &rest args
 This function calls @var{method} on the D-Bus @var{bus}.  @var{bus} is
 either the symbol @code{:system} or the symbol @code{:session}.
 
@@ -336,8 +336,8 @@ Lisp objects, according to the type conversion rules described in
 
 @example
 (dbus-call-method
-  :session "GetKeyField" "org.gnome.seahorse"
-  "/org/gnome/seahorse/keys/openpgp" "org.gnome.seahorse.Keys"
+  :session "org.gnome.seahorse" "/org/gnome/seahorse/keys/openpgp"
+  "org.gnome.seahorse.Keys" "GetKeyField"
   "openpgp:657984B8C7A966DD" "simple-name")
 
 @result{} (t ("Philip R. Zimmermann"))
@@ -349,8 +349,9 @@ object.  Example:
 
 @example
 (dbus-call-method
-  :system "GetPropertyString" "org.freedesktop.Hal"
-  "/org/freedesktop/Hal/devices/computer" "org.freedesktop.Hal.Device"
+  :system "org.freedesktop.Hal"
+  "/org/freedesktop/Hal/devices/computer"
+  "org.freedesktop.Hal.Device" "GetPropertyString"
   "system.kernel.machine")
 
 @result{} "i686"
@@ -368,14 +369,14 @@ emulate the @code{lshal} command on GNU/Linux systems:
 @example
 (dolist (device
           (dbus-call-method
-            :system "GetAllDevices" "org.freedesktop.Hal"
+            :system "org.freedesktop.Hal"
             "/org/freedesktop/Hal/Manager"
-            "org.freedesktop.Hal.Manager"))
+            "org.freedesktop.Hal.Manager" "GetAllDevices"))
   (message "\nudi = %s" device)
   (dolist (properties
             (dbus-call-method
-              :system "GetAllProperties" "org.freedesktop.Hal"
-              device "org.freedesktop.Hal.Device"))
+              :system "org.freedesktop.Hal" device
+              "org.freedesktop.Hal.Device" "GetAllProperties"))
     (message "  %s = %S"
              (car properties) (or (caar (cdr properties)) ""))))
 
@@ -406,7 +407,7 @@ emulate the @code{lshal} command on GNU/Linux systems:
 Signals are broadcast messages.  They carry input parameters, which
 are received by all objects which have registered for such a signal.
 
-@defun dbus-send-signal bus signal service path interface &rest args
+@defun dbus-send-signal bus service path interface signal &rest args
 This function is similar to @code{dbus-call-method}.  The difference
 is, that there are no returning output parameters.
 
@@ -425,12 +426,12 @@ Conversion}.  Example:
 
 @example
 (dbus-send-signal
-  :session "FileModified" "org.gnu.Emacs" "/org/gnu/Emacs"
-  "org.gnu.Emacs.FileManager" "/home/albinus/.emacs")
+  :session "org.gnu.Emacs" "/org/gnu/Emacs"
+  "org.gnu.Emacs.FileManager" "FileModified" "/home/albinus/.emacs")
 @end example
 @end defun
 
-@defun dbus-register-signal bus signal service path interface handler
+@defun dbus-register-signal bus service path interface signal handler
 With this function, an application registers for @var{signal} on the
 D-Bus @var{bus}.
 
@@ -461,13 +462,15 @@ received.  It must accept as arguments the output parameters
 (defun my-dbus-signal-handler (device)
   (message "Device %s added" device))
 
+@result{} my-dbus-signal-handler
+
 (dbus-register-signal
-  :system "DeviceAdded"
-  (dbus-get-name-owner :system "org.freedesktop.Hal")
-  "/org/freedesktop/Hal/Manager" "org.freedesktop.Hal.Manager"
+  :system "org.freedesktop.Hal" "/org/freedesktop/Hal/Manager"
+  "org.freedesktop.Hal.Manager" "DeviceAdded"
   'my-dbus-signal-handler)
 
-@result{} (:system "org.freedesktop.Hal.Manager" "DeviceAdded")
+@result{} (:system ":1.3" "/org/freedesktop/Hal/Manager"
+    "org.freedesktop.Hal.Manager" "DeviceAdded")
 @end example
 
 As we know from the inspection data of interface
@@ -503,13 +506,9 @@ Incoming D-Bus messages are handled as Emacs events (see @pxref{Misc
 Events, , , elisp}).  The generated event has this form:
 
 @example
-(dbus-event @var{handler} @var{bus} @var{service} @var{path} @var{interface} @var{member} &rest @var{args})
+(dbus-event @var{bus} @var{service} @var{path} @var{interface} @var{member} @var{handler} &rest @var{args})
 @end example
 
-@var{handler} is the callback function which has been registered for
-this signal (see @pxref{Signals}).  When a @code{dbus-event} event
-arrives, @var{handler} is called with @var{args} as arguments.
-
 @var{bus} identifies the D-Bus the signal is coming from.  It is
 either the symbol @code{:system} or the symbol @code{:session}.
 
@@ -517,6 +516,10 @@ either the symbol @code{:system} or the symbol @code{:session}.
 of the D-Bus object emitting the signal.  @var{interface} and
 @var{member} denote the signal which has been sent.
 
+@var{handler} is the callback function which has been registered for
+this signal (see @pxref{Signals}).  When a @code{dbus-event} event
+arrives, @var{handler} is called with @var{args} as arguments.
+
 In order to inspect the @code{dbus-event} data, you could extend the
 definition of the callback function in @ref{Signals}:
 
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 8ec39ce81fe..4a165c62b25 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -20529,7 +20529,7 @@ Suffix to add to the group name to arrive at the score file name
 @vindex gnus-score-uncacheable-files
 @cindex score cache
 All score files are normally cached to avoid excessive re-loading of
-score files.  However, if this might make your Emacs grow big and
+score files.  However, this might make your Emacs grow big and
 bloated, so this regexp can be used to weed out score files unlikely
 to be needed again.  It would be a bad idea to deny caching of
 @file{all.SCORE}, while it might be a good idea to not cache