Merge from emacs-24; up to 2012-12-17T11:17:34Z!rgm@gnu.org

19 files changed, 47 insertions, 41 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4222f818799..a1d7f0013b3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/ange-ftp.el (ange-ftp-make-directory): Don't raise an error,
+	if DIR exists and PARENTS is non-nil.
+
 2013-02-13  Juanma Barranquero  <lekktu@gmail.com>
 
 	* progmodes/js.el (js--multi-line-declaration-indentation):
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 700d319228f..2c45d3c24a1 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -4377,7 +4377,7 @@ The hook `gnus-exit-gnus-hook' is called before actually exiting."
 (defun gnus-group-browse-foreign-server (method)
   "Browse a foreign news server.
 If called interactively, this function will ask for a select method
- (nntp, nnspool, etc.) and a server address (eg. nntp.some.where).
+ (nntp, nnspool, etc.) and a server address (e.g., nntp.some.where).
 If not, METHOD should be a list where the first element is the method
 and the second element is the address."
   (interactive
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index aa8b6bf2703..48bb99bfbce 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -121,7 +121,7 @@ This variable can be a list of select methods which Gnus will query with
 the `ask-server' method in addition to the primary, secondary, and archive
 servers.
 
-Eg.
+E.g.:
   (setq gnus-check-new-newsgroups
 	'((nntp \"some.server\") (nntp \"other.server\")))
 
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 85a6d5639a1..a266567987d 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -179,7 +179,7 @@ is to be performed in, and it should return an integer that says how
 many days an article can be stored before it is considered \"old\".
 It can also return the values `never' and `immediate'.
 
-Eg.:
+E.g.:
 
 \(setq nnmail-expiry-wait-function
       (lambda (newsgroup)
@@ -291,7 +291,7 @@ directory.  This hook is called after the incoming mail box has been
 emptied, and can be used to call any mail box programs you have
 running (\"xwatch\", etc.)
 
-Eg.
+E.g.:
 
 \(add-hook 'nnmail-read-incoming-hook
 	  (lambda ()
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index 7e391c03778..2c2775dfbd7 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -214,7 +214,7 @@ Enabling this will have OpenSSL check the signers certificate
 against a certificate revocation list (CRL).
 
 For this to work the CRL must be up-to-date and since they are
-normally updated quite often (ie. several times a day) you
+normally updated quite often (i.e., several times a day) you
 probably need some tool to keep them up-to-date. Unfortunately
 Gnus cannot do this for you.
 
diff --git a/lisp/hexl.el b/lisp/hexl.el
index 13181ff0e3c..2ee492b4c5e 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -311,8 +311,8 @@ A sample format:
   000000c0: 7265 6769 6f6e 2e0a                      region..
 
 Movement is as simple as movement in a normal Emacs text buffer.  Most
-cursor movement bindings are the same (ie. Use \\[hexl-backward-char], \\[hexl-forward-char], \\[hexl-next-line], and \\[hexl-previous-line]
-to move the cursor left, right, down, and up).
+cursor movement bindings are the same: use \\[hexl-backward-char], \\[hexl-forward-char], \\[hexl-next-line], and \\[hexl-previous-line]
+to move the cursor left, right, down, and up.
 
 Advanced cursor movement commands (ala \\[hexl-beginning-of-line], \\[hexl-end-of-line], \\[hexl-beginning-of-buffer], and \\[hexl-end-of-buffer]) are
 also supported.
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 5e9ba6d9cea..2b8c7ae145b 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -4084,7 +4084,8 @@ directory, so that Emacs will know its current contents."
 	(or (file-exists-p parent)
 	    (ange-ftp-make-directory parent parents))))
   (if (file-exists-p dir)
-      (error "Cannot make directory %s: file already exists" dir)
+      (unless parents
+	(error "Cannot make directory %s: file already exists" dir))
     (let ((parsed (ange-ftp-ftp-name dir)))
       (if parsed
 	  (let* ((host (nth 0 parsed))
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 6c25d903feb..2ee73235dd0 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -159,12 +159,12 @@ This is not used directly, but only via inheritance by other faces."
 
 (defface nxml-comment-delimiter
   '((t (:inherit font-lock-comment-delimiter-face)))
-  "Face used for the delimiters of comments, i.e <!-- and -->."
+  "Face used for the delimiters of comments, i.e., <!-- and -->."
   :group 'nxml-faces)
 
 (defface nxml-processing-instruction-delimiter
   '((t (:inherit nxml-delimiter)))
-  "Face used for the delimiters of processing instructions, i.e <? and ?>."
+  "Face used for the delimiters of processing instructions, i.e., <? and ?>."
   :group 'nxml-faces)
 
 (defface nxml-processing-instruction-target
@@ -179,7 +179,7 @@ This is not used directly, but only via inheritance by other faces."
 
 (defface nxml-cdata-section-delimiter
   '((t (:inherit nxml-delimiter)))
-  "Face used for the delimiters of CDATA sections, i.e <![, [, and ]]>."
+  "Face used for the delimiters of CDATA sections, i.e., <![, [, and ]]>."
   :group 'nxml-faces)
 
 (defface nxml-cdata-section-CDATA
@@ -200,7 +200,7 @@ This includes ths `x' in hex references."
 
 (defface nxml-char-ref-delimiter
   '((t (:inherit nxml-ref)))
-  "Face used for the delimiters of character references, i.e &# and ;."
+  "Face used for the delimiters of character references, i.e., &# and ;."
   :group 'nxml-faces)
 
 (defface nxml-entity-ref-name
@@ -210,7 +210,7 @@ This includes ths `x' in hex references."
 
 (defface nxml-entity-ref-delimiter
   '((t (:inherit nxml-ref)))
-  "Face used for the delimiters of entity references, i.e & and ;."
+  "Face used for the delimiters of entity references, i.e., & and ;."
   :group 'nxml-faces)
 
 (defface nxml-tag-delimiter
diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el
index 6a0b8eee45c..5be14771961 100644
--- a/lisp/org/org-element.el
+++ b/lisp/org/org-element.el
@@ -3668,7 +3668,7 @@ containing the secondary string.  It is used to set correctly
 (defun org-element-map (data types fun &optional info first-match no-recursion)
   "Map a function on selected elements or objects.
 
-DATA is an Org buffer parse tree, as returned by, i.e,
+DATA is an Org buffer parse tree, as returned by, i.e.,
 `org-element-parse-buffer'.  TYPES is a symbol or list of symbols
 of elements or objects types (see `org-element-all-elements' and
 `org-element-all-objects' for a complete list of types).  FUN is
diff --git a/lisp/org/org.el b/lisp/org/org.el
index bba52a8b63a..ede633a0a93 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -928,7 +928,7 @@ nil, don't do anything special at the beginning of the buffer."
 (defcustom org-cycle-level-after-item/entry-creation t
   "Non-nil means cycle entry level or item indentation in new empty entries.
 
-When the cursor is at the end of an empty headline, i.e with only stars
+When the cursor is at the end of an empty headline, i.e., with only stars
 and maybe a TODO keyword, TAB will then switch the entry to become a child,
 and then all possible ancestor states, before returning to the original state.
 This makes data entry extremely fast:  M-RET to create a new headline,
diff --git a/lisp/progmodes/cc-align.el b/lisp/progmodes/cc-align.el
index b552b68c4b7..cb8d2d23c84 100644
--- a/lisp/progmodes/cc-align.el
+++ b/lisp/progmodes/cc-align.el
@@ -53,7 +53,7 @@
 (defun c-lineup-topmost-intro-cont (langelem)
   "Line up declaration continuation lines zero or one indentation step.
 For lines in the \"header\" of a definition, zero is used.  For other
-lines, `c-basic-offset' is added to the indentation.  E.g:
+lines, `c-basic-offset' is added to the indentation.  E.g.:
 
 int
 neg (int i)           <- c-lineup-topmost-intro-cont
@@ -165,7 +165,7 @@ Works with: topmost-intro-cont."
 As a special case, if the indented line is inside a brace block
 construct, the indentation is `c-basic-offset' only.  This is intended
 as a \"DWIM\" measure in cases like macros that contains statement
-blocks, e.g:
+blocks, e.g.:
 
 A_VERY_LONG_MACRO_NAME ({
         some (code, with + long, lines * in[it]);
@@ -340,7 +340,7 @@ Works with: arglist-cont, arglist-cont-nonempty."
 (defun c-lineup-close-paren (langelem)
   "Line up the closing paren under its corresponding open paren if the
 open paren is followed by code.  If the open paren ends its line, no
-indentation is added.  E.g:
+indentation is added.  E.g.:
 
 main (int,              main (
       char **               int, char **
@@ -394,7 +394,7 @@ Works with: stream-op."
 
 (defun c-lineup-multi-inher (langelem)
   "Line up the classes in C++ multiple inheritance clauses and member
-initializers under each other.  E.g:
+initializers under each other.  E.g.:
 
 class Foo:                Foo::Foo (int a, int b):
     public Cyphr,             Cyphr (a),
@@ -439,7 +439,7 @@ Works with: inher-cont, member-init-cont."
 If class names follow on the same line as the implements/extends
 keyword, they are lined up under each other.  Otherwise, they are
 indented by adding `c-basic-offset' to the column of the keyword.
-E.g:
+E.g.:
 
 class Foo             class Foo
     extends               extends Cyphr,
@@ -461,7 +461,7 @@ If exception names follow on the same line as the throws keyword,
 they are lined up under each other.  Otherwise, they are indented by
 adding `c-basic-offset' to the column of the throws keyword.  The
 throws keyword itself is also indented by `c-basic-offset' from the
-function declaration start if it doesn't hang.  E.g:
+function declaration start if it doesn't hang.  E.g.:
 
 int foo()           int foo() throws Cyphr,
     throws     <->                   Bar,    <- c-lineup-java-throws
@@ -485,7 +485,7 @@ Works with: func-decl-cont."
 
 (defun c-indent-one-line-block (langelem)
   "Indent a one line block `c-basic-offset' extra.
-E.g:
+E.g.:
 
 if (n > 0)                 if (n > 0)
     {m+=n; n=0;}    <->    {               <- c-indent-one-line-block
@@ -508,7 +508,7 @@ Work with: Almost all syntactic symbols, but most useful on *-open."
 
 (defun c-indent-multi-line-block (langelem)
   "Indent a multi line block `c-basic-offset' extra.
-E.g:
+E.g.:
 
 int *foo[] = {           int *foo[] = {
     NULL,                    NULL,
@@ -670,7 +670,7 @@ Works with: comment-intro."
 (defun c-lineup-knr-region-comment (langelem)
   "Line up a comment in the \"K&R region\" with the declaration.
 That is the region between the function or class header and the
-beginning of the block.  E.g:
+beginning of the block.  E.g.:
 
 int main()
 /* This is the main function. */  <- c-lineup-knr-region-comment
@@ -693,7 +693,7 @@ Works with: comment-intro."
 
 (defun c-lineup-runin-statements (langelem)
   "Line up statements when the first statement is on the same line as
-the block opening brace.  E.g:
+the block opening brace.  E.g.:
 
 int main()
 { puts (\"Hello world!\");
@@ -794,7 +794,7 @@ arglist-cont-nonempty."
   "Line up \"cascaded calls\" under each other.
 If the line begins with \"->\" or \".\" and the preceding line ends
 with one or more function calls preceded by the same token, then the
-arrow is lined up with the first of those tokens.  E.g:
+arrow is lined up with the first of those tokens.  E.g.:
 
 result = proc->add(17)->add(18)
              ->add(19) +           <- c-lineup-cascaded-calls
@@ -839,7 +839,7 @@ arglist-cont-nonempty."
 (defun c-lineup-string-cont (langelem)
   "Line up a continued string under the one it continues.
 A continued string in this sense is where a string literal follows
-directly after another one.  E.g:
+directly after another one.  E.g.:
 
 result = prefix + \"A message \"
                   \"string.\";      <- c-lineup-string-cont
@@ -921,7 +921,7 @@ Works with: objc-method-call-cont."
 				 ; no complete argument to indent yet
 				 (throw 'no-idea nil))))
 
-	     (extra (save-excursion 
+	     (extra (save-excursion
                       ; indent parameter to argument if needed
 		      (back-to-indentation)
 		      (c-backward-syntactic-ws (c-langelem-pos langelem))
@@ -1023,7 +1023,7 @@ Works with: inlambda, inexpr-statement, inexpr-class."
 (defun c-lineup-whitesmith-in-block (langelem)
   "Line up lines inside a block in Whitesmith style.
 It's done in a way that works both when the opening brace hangs and
-when it doesn't.  E.g:
+when it doesn't.  E.g.:
 
 something
     {                something {
@@ -1085,7 +1085,7 @@ arglist-cont."
 
 (defun c-lineup-cpp-define (langelem)
   "Line up macro continuation lines according to the indentation of
-the construct preceding the macro.  E.g:
+the construct preceding the macro.  E.g.:
 
 v beg of preceding constr      v beg of preceding constr
                              int dribble() {
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 89cf89f8770..0d5549e4441 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -2819,7 +2819,7 @@ undefined whether identifier syntax (see `c-identifier-syntax-table')
 is in effect or not.
 
 Note that it's used in cases like after \"foo (bar)\" so it should
-only match when it's certain that it's a declaration, e.g \"{\" but
+only match when it's certain that it's a declaration, e.g., \"{\" but
 not \",\" or \";\"."
   t "{"
   ;; If K&R style declarations should be recognized then one could
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index d2a9617e28e..9e9e2f0b090 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1949,7 +1949,7 @@ Runs `compilation-mode-hook' with `run-mode-hooks' (which see).
   "This is like `define-derived-mode' without the PARENT argument.
 The parent is always `compilation-mode' and the customizable `compilation-...'
 variables are also set from the name of the mode you have chosen,
-by replacing the first word, e.g `compilation-scroll-output' from
+by replacing the first word, e.g., `compilation-scroll-output' from
 `grep-scroll-output' if that variable exists."
   (let ((mode-name (replace-regexp-in-string "-mode\\'" "" (symbol-name mode))))
     `(define-derived-mode ,mode compilation-mode ,name
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 7d34269b6b5..e8678fe6281 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -1551,7 +1551,7 @@ and POD directives (Disabled by default, see `cperl-electric-keywords'.)
 
 The user types the keyword immediately followed by a space, which
 causes the construct to be expanded, and the point is positioned where
-she is most likely to want to be.  eg. when the user types a space
+she is most likely to want to be.  E.g., when the user types a space
 following \"if\" the following appears in the buffer: if () { or if ()
 } { } and the cursor is between the parentheses.  The user can then
 type some boolean expression within the parens.  Having done that,
diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el
index 76e94875c8d..8a868883a11 100644
--- a/lisp/progmodes/dcl-mode.el
+++ b/lisp/progmodes/dcl-mode.el
@@ -168,8 +168,8 @@ nil to get the default indentation.
 
 INDENT-TYPE is a symbol indicating what kind of indentation should be done.
 It can have the following values:
-  indent      the lines indentation should be increased, e.g. after THEN.
-  outdent     the lines indentation should be decreased, e.g a line with ENDIF.
+  indent      the indentation should be increased, e.g., after THEN.
+  outdent     the indentation should be decreased, e.g., a line with ENDIF.
   first-line  indentation for the first line in a buffer or SUBROUTINE.
 CUR-INDENT is the indentation of the preceding command line.
 EXTRA-INDENT is the default change in indentation for this line
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 55be6222586..5571a905f85 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -4777,7 +4777,7 @@ primitive or interface named NAME."
 		))))))))))
 
 (defun verilog-get-expr()
-  "Grab expression at point, e.g, case ( a | b & (c ^d))."
+  "Grab expression at point, e.g., case ( a | b & (c ^d))."
   (let* ((b (progn
 	      (verilog-forward-syntactic-ws)
 	      (skip-chars-forward " \t")
diff --git a/lisp/server.el b/lisp/server.el
index 64224d2a310..05ac345d904 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -154,7 +154,7 @@ long-lived shared key will decrease security (especially since
 the key is transmitted as plain-text).
 
 In some situations however, it can be difficult to share randomly
-generated passwords with remote hosts (eg. no shared directory),
+generated passwords with remote hosts (e.g., no shared directory),
 so you can set the key with this variable and then copy the
 server file to the remote host (with possible changes to IP
 address and/or port if that applies).
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index c22b5482b3e..c03d64a2f54 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -36,7 +36,7 @@ If `check', try to check if it does.
 If a list, assume that the listed features are supported, without checking.
 
 The relevant features are:
-  modifyOtherKeys  -- if supported, more key bindings work (e.g, \"\\C-,\")
+  modifyOtherKeys  -- if supported, more key bindings work (e.g., \"\\C-,\")
   reportBackground -- if supported, Xterm reports its background color
 "
   :version "24.1"
diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el
index c67aa338791..23e90552096 100644
--- a/lisp/textmodes/two-column.el
+++ b/lisp/textmodes/two-column.el
@@ -259,9 +259,9 @@ if that value is non-nil.
 These buffers can be edited separately, for example with `fill-paragraph'.
 If you want to disable parallel scrolling temporarily, use  \\[2C-toggle-autoscroll] .
 
-If you include long lines, i.e which will span both columns (eg.
-source code), they should be in what will be the first column, with
-the associated buffer having empty lines next to them.
+If you include long lines that span both columns (e.g., source
+code), they should be in what will be the first column, with the
+associated buffer having empty lines next to them.
 
 Potential uses are writing bilingual texts, or editing the comments of a
 source code.  See the file lisp/two-column.el for detailed examples.