Merge from emacs-24; up to 2012-04-22T13:58:00Z!cyd@gnu.org

4 files changed, 33 insertions, 11 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75fc7f5884d..b833e61bfa2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,28 @@
+2012-05-14  Troels Nielsen  <bn.troels@gmail.com>  (tiny change)
+
+        * progmodes/compile.el (compilation-internal-error-properties):
+        Calculate start position correctly when end-col is set but
+        end-line is not (Bug#11382).
+
+2012-05-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * net/rlogin.el (rlogin-mode-map): Fix last change.
+
+2012-05-14  Jason L. Wright  <jason.wright@inl.gov>  (tiny change)
+
+        * mail/smtpmail.el (smtpmail-send-command): Send the command and
+        the following \r\n using a single `process-send-string', since the
+        Lotus SMTP server refuses to accept any commands if they are sent
+        with two `process-send-string's (Bug#11444).
+
+2012-05-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * shell.el (shell-parse-pcomplete-arguments): Obey
+        pcomplete-arg-quote-list inside double-quoted args (Bug#11348).
+
 2012-05-14  Wolfgang Jenkner  <wjenkner@inode.at>
 
-        * image-mode.el: Fit to width/height for rotated images (bug#11431).
+        * image-mode.el: Fit to width/height for rotated images (Bug#11431).
         (image-transform-scale, image-transform-right-angle-fudge): New vars.
         (image-transform-width, image-transform-fit-width): New functions.
         (image-transform-properties): Use them.
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 8e96e2c9438..804fe7a8798 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -932,8 +932,7 @@ Returns an error if the server cannot be contacted."
       (insert (match-string 0 command) "<omitted>\r\n")
     (insert command "\r\n"))
   (setq smtpmail-read-point (point))
-  (process-send-string process command)
-  (process-send-string process "\r\n"))
+  (process-send-string process (concat command "\r\n")))
 
 (defun smtpmail-send-data-1 (process data)
   (goto-char (point-max))
diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el
index ac936ee1429..cef615dc320 100644
--- a/lisp/net/rlogin.el
+++ b/lisp/net/rlogin.el
@@ -114,12 +114,12 @@ this variable is set from that."
   (let ((map (if (consp shell-mode-map)
                  (cons 'keymap shell-mode-map)
                (copy-keymap shell-mode-map))))
-    (define-key rlogin-mode-map "\C-c\C-c" 'rlogin-send-Ctrl-C)
-    (define-key rlogin-mode-map "\C-c\C-d" 'rlogin-send-Ctrl-D)
-    (define-key rlogin-mode-map "\C-c\C-z" 'rlogin-send-Ctrl-Z)
-    (define-key rlogin-mode-map "\C-c\C-\\" 'rlogin-send-Ctrl-backslash)
-    (define-key rlogin-mode-map "\C-d" 'rlogin-delchar-or-send-Ctrl-D)
-    (define-key rlogin-mode-map "\C-i" 'rlogin-tab-or-complete)
+    (define-key map "\C-c\C-c" 'rlogin-send-Ctrl-C)
+    (define-key map "\C-c\C-d" 'rlogin-send-Ctrl-D)
+    (define-key map "\C-c\C-z" 'rlogin-send-Ctrl-Z)
+    (define-key map "\C-c\C-\\" 'rlogin-send-Ctrl-backslash)
+    (define-key map "\C-d" 'rlogin-delchar-or-send-Ctrl-D)
+    (define-key map "\C-i" 'rlogin-tab-or-complete)
     map)
   "Keymap for `rlogin-mode'.")
 
diff --git a/lisp/shell.el b/lisp/shell.el
index f7a530102ff..1784188f6ad 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -400,8 +400,9 @@ Thus, this does not include the shell's current directory.")
                      (t (match-string 3)))
                     arg))
              ((match-beginning 2)       ;Double quote.
-              (push (replace-regexp-in-string
-                     "\\\\\\(.\\)" "\\1" (match-string 2))
+              (push (if (null pcomplete-arg-quote-list) (match-string 2)
+                      (replace-regexp-in-string
+                       "\\\\\\(.\\)" "\\1" (match-string 2)))
                     arg))
              ((match-beginning 1)       ;Single quote.
               (push (match-string 1) arg))