Merge from origin/emacs-24

a5f38fa Fix ChangeLog typo
c6400e1 Fix composition of characters from Syriac and Arabis scripts.
7e9dfde python.el: Fix message when sending region.
800260c python.el: Cleanup temp files even with eval errors.
ed65b91 Fix for previous commit
2dd5163 python.el: Handle file encoding for shell.
7aa506e Spelling fixes
4cd6d77 * automated/tramp-tests.el (tramp-test17-insert-directory): Do not expect a given order of "." and "..".
a41d07b Fix rendering of composed caharacters on the mode line.  (Bug#19435)
b70977c Small doc markup fixes
73c050c * doc/lispref/modes.texi (Defining Minor Modes, SMIE Lexer): Markup fixes.
1783e6c ChangeLog fix
c741b1b TUTORIAL.es: Improve style consistency
f89efea TUTORIAL.es: spelling fixes
0d48826 Avoid compiler warning.

Conflicts:
	doc/lispref/ChangeLog
	doc/lispref/control.texi
	etc/ChangeLog
	lisp/ChangeLog
	src/ChangeLog
	test/ChangeLog

5 files changed, 13 insertions, 6 deletions

diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index e0ed11ff862..e1993e5ed30 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -1358,7 +1358,7 @@ searches through each directory in the Emacs Lisp load path, trying to
 find a file matching that library name.  If the library name is
 @samp{@var{foo}}, it tries looking for files named
 @file{@var{foo}.elc}, @file{@var{foo}.el}, and @file{@var{foo}}.  The
-default behaviour is to load the first file found.  This command
+default behavior is to load the first file found.  This command
 prefers @file{.elc} files over @file{.el} files because compiled files
 load and run faster.  If it finds that @file{@var{lib}.el} is newer
 than @file{@var{lib}.elc}, it issues a warning, in case someone made
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 66f1d3a1785..feafee89241 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,10 @@
+2014-12-27  Glenn Morris  <rgm@gnu.org>
+
+	* control.texi (Pattern matching case statement):
+	* os.texi (Desktop Notifications):
+	* modes.texi (Defining Minor Modes, SMIE Lexer): Markup fixes.
+
+2014-12-27  Eli Zaretskii  <eliz@gnu.org>
 2014-12-27  Eli Zaretskii  <eliz@gnu.org>
 
 	* windows.texi (Recombining Windows): Index subject of sections.
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index fa760c45d6a..1e9f3461d0f 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -370,8 +370,8 @@ that location.
 More specifically, a Q-pattern can take the following forms:
 @table @code
 @item (@var{qpattern1} . @var{qpattern2})
-This pattern matches any cons cell whose @code{car} matches @var{QPATTERN1} and
-whose @code{cdr} matches @var{PATTERN2}.
+This pattern matches any cons cell whose @code{car} matches @var{qpattern1} and
+whose @code{cdr} matches @var{pattern2}.
 @item [@var{qpattern1} @var{qpattern2} @dots{} @var{qpatternm}]
 This pattern matches a vector of length @var{M} whose 0..(@var{M}-1)th
 elements match @var{qpattern1}, @var{qpattern2} @dots{} @var{qpatternm},
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index d67bac63b15..509982a008e 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -1490,7 +1490,7 @@ A positive prefix argument enables the mode, any other prefix argument
 disables it.  From Lisp, an argument of @code{toggle} toggles the mode,
 whereas an omitted or @code{nil} argument enables the mode.
 This makes it easy to enable the minor mode in a major mode hook, for example.
-If @var{doc} is nil, the macro supplies a default documentation string
+If @var{doc} is @code{nil}, the macro supplies a default documentation string
 explaining the above.
 
 By default, it also defines a variable named @var{mode}, which is set to
@@ -3659,7 +3659,7 @@ For example:
 Notice how those lexers return the empty string when in front of
 parentheses.  This is because SMIE automatically takes care of the
 parentheses defined in the syntax table.  More specifically if the lexer
-returns nil or an empty string, SMIE tries to handle the corresponding
+returns @code{nil} or an empty string, SMIE tries to handle the corresponding
 text as a sexp according to syntax tables.
 
 @node SMIE Tricks
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index e3e5613025d..1a6a031d013 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -2538,7 +2538,7 @@ The server's version number.
 The specification version the server is compliant with.
 @end table
 
-If @var{SPEC_VERSION} is @code{nil}, the server supports a
+If @var{spec_version} is @code{nil}, the server supports a
 specification prior to @samp{"1.0"}.
 @end defun