Merge from mainline.

10 files changed, 176 insertions, 140 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c942f9c52ca..392510c63d0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,26 @@
+2011-02-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * net/rcirc.el (rcirc-send-ctcp): Remove spurious arg to `format'.
+
 2011-02-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * server.el (server-process-filter): Use pcase.
+
+        * emacs-lisp/smie.el (smie-blink-matching-open): Don't use `pos' in two
+        conflicting ways.
+        (smie-indent--parent): Extend to "parent of arg".
+        (smie-indent-inside-string): New function.
+        (smie-indent-functions): Use it.
+
+        * vc/vc-dir.el (vc-dir-refresh): Reorder operations to try and avoid
+        bzr locking race condition.
+
+        * emacs-lisp/edebug.el (edebug-instrument-function): Check a marker is
+        still valid before using it.
+
+        * progmodes/grep.el (grep-mode-font-lock-keywords): Adjust to
+        `message' -> `compilation-message' rename (bug#8004).
+
         Move keymap initialization into declaration.
         * textmodes/enriched.el (enriched-mode-map):
         * textmodes/bib-mode.el (bib-mode-map):
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index f281521841c..70a7983dbea 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -3394,7 +3394,7 @@ go to the end of the last sexp, or if that is the same point, then step."
   ;; Return the function symbol, or nil if not instrumented.
   (let ((func-marker (get func 'edebug)))
     (cond
-     ((markerp func-marker)
+     ((and (markerp func-marker) (marker-buffer func-marker))
       ;; It is uninstrumented, so instrument it.
       (with-current-buffer (marker-buffer func-marker)
         (goto-char func-marker)
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index 702e8d880ba..e81a8b37981 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -915,7 +915,7 @@ This uses SMIE's tables and is expected to be placed on `post-self-insert-hook'.
                      ;; anything else than this trigger char, lest we'd blink
                      ;; both when inserting the trigger char and when
                      ;; inserting a subsequent trigger char like SPC.
-                     (or (eq (point) pos)
+                     (or (eq (char-before) last-command-event)
                          (not (memq (char-before)
                                     smie-blink-matching-triggers)))
                      (or smie-blink-matching-inners
@@ -998,7 +998,10 @@ the beginning of a line."
           (unless (numberp (cadr (assoc tok smie-grammar)))
             (goto-char pos))
           (setq smie--parent
-                (smie-backward-sexp 'halfsexp))))))
+                (or (smie-backward-sexp 'halfsexp)
+                    (let (res)
+                      (while (null (setq res (smie-backward-sexp))))
+                      (list nil (point) (nth 2 res)))))))))
 
 (defun smie-rule-parent-p (&rest parents)
   "Return non-nil if the current token's parent is among PARENTS.
@@ -1403,6 +1406,10 @@ should not be computed on the basis of the following token."
   (and (nth 4 (syntax-ppss))
        'noindent))
 
+(defun smie-indent-inside-string ()
+  (and (nth 3 (syntax-ppss))
+       'noindent))
+
 (defun smie-indent-after-keyword ()
   ;; Indentation right after a special keyword.
   (save-excursion
@@ -1476,8 +1483,9 @@ should not be computed on the basis of the following token."
 
 (defvar smie-indent-functions
   '(smie-indent-fixindent smie-indent-bob smie-indent-close
-                          smie-indent-comment smie-indent-comment-continue smie-indent-comment-close
-                          smie-indent-comment-inside smie-indent-keyword smie-indent-after-keyword
+    smie-indent-comment smie-indent-comment-continue smie-indent-comment-close
+    smie-indent-comment-inside smie-indent-inside-string
+    smie-indent-keyword smie-indent-after-keyword
                           smie-indent-exps)
   "Functions to compute the indentation.
 Each function is called with no argument, shouldn't move point, and should
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ba4d270951b..8781ab3c0ec 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2011-02-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * message.el (message-bury): Don't pop up a new window when selected
+        window is dedicated.
+
+2011-02-10  Antoine Levitt  <antoine.levitt@gmail.com>  (tiny change)
+
+        * gnus-sum.el (gnus-summary-save-parts): Use read-directory-name.
+
 2011-02-09  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * nntp.el (nntp-retrieve-group-data-early-disabled): Disable the async
@@ -22,7 +31,7 @@
         (nnimap-update-info): Clean up slightly.
         (nnimap-quirk): Add quirk for Gmail IMAP which bugs out on NUL
         characters.
-        (nnimap-process-quirk): Renamed function to avoid collision.
+        (nnimap-process-quirk): Rename function to avoid collision.
         (nnimap-update-info): Fix macrology bug-out.
         (nnimap-update-info): Simplify split history test.
 
@@ -43,7 +52,7 @@
         * message.el (message-setup-1): Remove the read-only stuff, since it
         doesn't work under XEmacs, for some reason.
 
-        * gnus-sum.el (gnus-user-date): Renamed back from
+        * gnus-sum.el (gnus-user-date): Rename back from
         gnus-summary-user-date since user code refers to it.
 
         * shr.el (shr-render-td): Store the actual background colour used.
@@ -228,8 +237,8 @@
 
 2011-01-28  Daiki Ueno  <ueno@unixuser.org>
 
-        * mml2015.el (mml2015-epg-sign, mml2015-epg-encrypt): Give
-        mml2015-signers higher precedence over mml2015-sign-with-sender.
+        * mml2015.el (mml2015-epg-sign, mml2015-epg-encrypt):
+        Give mml2015-signers higher precedence over mml2015-sign-with-sender.
 
 2011-01-27  Lars Ingebrigtsen  <larsi@gnus.org>
 
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 8221667ab65..8fac5021df3 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -12087,9 +12087,9 @@ If REVERSE, save parts that do not match TYPE."
                           gnus-summary-save-parts-default-mime)
                       'gnus-summary-save-parts-type-history)
          (setq gnus-summary-save-parts-last-directory
-               (read-file-name "Save to directory: "
-                               gnus-summary-save-parts-last-directory
-                               nil t))
+               (read-directory-name "Save to directory: "
+                                    gnus-summary-save-parts-last-directory
+                                    nil t))
          current-prefix-arg))
   (gnus-summary-iterate n
     (let ((gnus-display-mime-function nil)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index e30f7f2c973..42b61950986 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4011,11 +4011,11 @@ Instead, just auto-save the buffer and then bury it."
 
 (defun message-bury (buffer)
   "Bury this mail BUFFER."
-  (let ((newbuf (other-buffer buffer)))
-    (bury-buffer buffer)
-    (if message-return-action
-        (apply (car message-return-action) (cdr message-return-action))
-      (switch-to-buffer newbuf))))
+  (if message-return-action
+      (progn
+        (bury-buffer buffer)
+        (apply (car message-return-action) (cdr message-return-action)))
+    (with-current-buffer buffer (bury-buffer))))
 
 (defun message-send (&optional arg)
   "Send the message in the current buffer.
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 8e4ded624de..c3e4f3d6169 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -720,7 +720,7 @@ Function is called with PROCESS, COMMAND, SENDER, ARGS and LINE.")
 (defun rcirc-send-ctcp (process target request &optional args)
   (let ((args (if args (concat " " args) "")))
     (rcirc-send-privmsg process target
-                        (format "\C-a%s%s\C-a" request args ""))))
+                        (format "\C-a%s%s\C-a" request args))))
 
 (defun rcirc-buffer-process (&optional buffer)
   "Return the process associated with channel BUFFER.
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 4bab8a18dee..32ab52228f9 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -388,13 +388,13 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
       1 grep-error-face)
      ;; remove match from grep-regexp-alist before fontifying
      ("^Grep[/a-zA-z]* started.*"
-      (0 '(face nil message nil help-echo nil mouse-face nil) t))
+      (0 '(face nil compilation-message nil help-echo nil mouse-face nil) t))
      ("^Grep[/a-zA-z]* finished \\(?:(\\(matches found\\))\\|with \\(no matches found\\)\\).*"
-      (0 '(face nil message nil help-echo nil mouse-face nil) t)
+      (0 '(face nil compilation-message nil help-echo nil mouse-face nil) t)
       (1 compilation-info-face nil t)
       (2 compilation-warning-face nil t))
      ("^Grep[/a-zA-z]* \\(exited abnormally\\|interrupt\\|killed\\|terminated\\)\\(?:.*with code \\([0-9]+\\)\\)?.*"
-      (0 '(face nil message nil help-echo nil mouse-face nil) t)
+      (0 '(face nil compilation-message nil help-echo nil mouse-face nil) t)
       (1 grep-error-face)
       (2 grep-error-face nil t))
      ("^.+?-[0-9]+-.*\n" (0 grep-context-face))
diff --git a/lisp/server.el b/lisp/server.el
index 62c59b41cee..df8cae0a6af 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -937,126 +937,122 @@ The following commands are accepted by the client:
                 tty-type   ; string.
                 files
                 filepos
-                command-line-args-left
-                arg)
+                args-left)
             ;; Remove this line from STRING.
             (setq string (substring string (match-end 0)))
-            (setq command-line-args-left
+            (setq args-left
                   (mapcar 'server-unquote-arg (split-string request " " t)))
-            (while (setq arg (pop command-line-args-left))
-                (cond
-                 ;; -version CLIENT-VERSION: obsolete at birth.
-                 ((and (equal "-version" arg) command-line-args-left)
-                  (pop command-line-args-left))
-
-                 ;; -nowait:  Emacsclient won't wait for a result.
-                 ((equal "-nowait" arg) (setq nowait t))
-
-                 ;; -current-frame:  Don't create frames.
-                 ((equal "-current-frame" arg) (setq use-current-frame t))
-
-                 ;; -display DISPLAY:
-                 ;; Open X frames on the given display instead of the default.
-                 ((and (equal "-display" arg) command-line-args-left)
-                  (setq display (pop command-line-args-left))
-                  (if (zerop (length display)) (setq display nil)))
-
-                 ;; -parent-id ID:
-                 ;; Open X frame within window ID, via XEmbed.
-                 ((and (equal "-parent-id" arg) command-line-args-left)
-                  (setq parent-id (pop command-line-args-left))
-                  (if (zerop (length parent-id)) (setq parent-id nil)))
-
-                 ;; -window-system:  Open a new X frame.
-                 ((equal "-window-system" arg)
-                  (setq dontkill t)
-                  (setq tty-name 'window-system))
-
-                 ;; -resume:  Resume a suspended tty frame.
-                 ((equal "-resume" arg)
-                  (lexical-let ((terminal (process-get proc 'terminal)))
-                    (setq dontkill t)
-                    (push (lambda ()
-                            (when (eq (terminal-live-p terminal) t)
-                              (resume-tty terminal)))
-                          commands)))
-
-                 ;; -suspend:  Suspend the client's frame.  (In case we
-                 ;; get out of sync, and a C-z sends a SIGTSTP to
-                 ;; emacsclient.)
-                 ((equal "-suspend" arg)
-                  (lexical-let ((terminal (process-get proc 'terminal)))
-                    (setq dontkill t)
-                    (push (lambda ()
-                            (when (eq (terminal-live-p terminal) t)
-                              (suspend-tty terminal)))
-                          commands)))
-
-                 ;; -ignore COMMENT:  Noop; useful for debugging emacsclient.
-                 ;; (The given comment appears in the server log.)
-                 ((and (equal "-ignore" arg) command-line-args-left
-                  (setq dontkill t)
-                  (pop command-line-args-left)))
-
-                 ;; -tty DEVICE-NAME TYPE:  Open a new tty frame at the client.
-                 ((and (equal "-tty" arg)
-                       (cdr command-line-args-left))
-                  (setq tty-name (pop command-line-args-left)
-                        tty-type (pop command-line-args-left)
-                        dontkill (or dontkill
-                                     (not use-current-frame))))
-
-                 ;; -position LINE[:COLUMN]:  Set point to the given
-                 ;;  position in the next file.
-                 ((and (equal "-position" arg)
-                       command-line-args-left
-                       (string-match "\\+\\([0-9]+\\)\\(?::\\([0-9]+\\)\\)?"
-                                     (car command-line-args-left)))
-                  (setq arg (pop command-line-args-left))
-                  (setq filepos
-                        (cons (string-to-number (match-string 1 arg))
-                              (string-to-number (or (match-string 2 arg) "")))))
-
-                 ;; -file FILENAME:  Load the given file.
-                 ((and (equal "-file" arg)
-                       command-line-args-left)
-                  (let ((file (pop command-line-args-left)))
-                    (if coding-system
-                        (setq file (decode-coding-string file coding-system)))
-                    (setq file (expand-file-name file dir))
-                    (push (cons file filepos) files)
-                    (server-log (format "New file: %s %s"
-                                        file (or filepos "")) proc))
-                  (setq filepos nil))
-
-                 ;; -eval EXPR:  Evaluate a Lisp expression.
-                 ((and (equal "-eval" arg)
-                       command-line-args-left)
-                  (if use-current-frame
-                      (setq use-current-frame 'always))
-                  (lexical-let ((expr (pop command-line-args-left)))
-                    (if coding-system
-                        (setq expr (decode-coding-string expr coding-system)))
-                    (push (lambda () (server-eval-and-print expr proc))
-                          commands)
-                    (setq filepos nil)))
-
-                 ;; -env NAME=VALUE:  An environment variable.
-                 ((and (equal "-env" arg) command-line-args-left)
-                  (let ((var (pop command-line-args-left)))
-                    ;; XXX Variables should be encoded as in getenv/setenv.
-                    (process-put proc 'env
-                                 (cons var (process-get proc 'env)))))
-
-                 ;; -dir DIRNAME:  The cwd of the emacsclient process.
-                 ((and (equal "-dir" arg) command-line-args-left)
-                  (setq dir (pop command-line-args-left))
-                  (if coding-system
-                      (setq dir (decode-coding-string dir coding-system)))
-                  (setq dir (command-line-normalize-file-name dir)))
-
-                 ;; Unknown command.
-                 (t (error "Unknown command: %s" arg))))
+            (while args-left
+              (pcase (pop args-left)
+                ;; -version CLIENT-VERSION: obsolete at birth.
+                (`"-version" (pop args-left))
+
+                ;; -nowait:  Emacsclient won't wait for a result.
+                (`"-nowait" (setq nowait t))
+
+                ;; -current-frame:  Don't create frames.
+                (`"-current-frame" (setq use-current-frame t))
+
+                ;; -display DISPLAY:
+                ;; Open X frames on the given display instead of the default.
+                (`"-display"
+                 (setq display (pop args-left))
+                 (if (zerop (length display)) (setq display nil)))
+
+                ;; -parent-id ID:
+                ;; Open X frame within window ID, via XEmbed.
+                (`"-parent-id"
+                 (setq parent-id (pop args-left))
+                 (if (zerop (length parent-id)) (setq parent-id nil)))
+
+                ;; -window-system:  Open a new X frame.
+                (`"-window-system"
+                 (setq dontkill t)
+                 (setq tty-name 'window-system))
+
+                ;; -resume:  Resume a suspended tty frame.
+                (`"-resume"
+                 (lexical-let ((terminal (process-get proc 'terminal)))
+                   (setq dontkill t)
+                   (push (lambda ()
+                           (when (eq (terminal-live-p terminal) t)
+                             (resume-tty terminal)))
+                         commands)))
+
+                ;; -suspend:  Suspend the client's frame.  (In case we
+                ;; get out of sync, and a C-z sends a SIGTSTP to
+                ;; emacsclient.)
+                (`"-suspend"
+                 (lexical-let ((terminal (process-get proc 'terminal)))
+                   (setq dontkill t)
+                   (push (lambda ()
+                           (when (eq (terminal-live-p terminal) t)
+                             (suspend-tty terminal)))
+                         commands)))
+
+                ;; -ignore COMMENT:  Noop; useful for debugging emacsclient.
+                ;; (The given comment appears in the server log.)
+                (`"-ignore"
+                 (setq dontkill t)
+                 (pop args-left))
+
+                ;; -tty DEVICE-NAME TYPE:  Open a new tty frame at the client.
+                (`"-tty"
+                 (setq tty-name (pop args-left)
+                       tty-type (pop args-left)
+                       dontkill (or dontkill
+                                    (not use-current-frame))))
+
+                ;; -position LINE[:COLUMN]:  Set point to the given
+                ;;  position in the next file.
+                (`"-position"
+                 (if (not (string-match "\\+\\([0-9]+\\)\\(?::\\([0-9]+\\)\\)?"
+                                        (car args-left)))
+                     (error "Invalid -position command in client args"))
+                 (let ((arg (pop args-left)))
+                   (setq filepos
+                         (cons (string-to-number (match-string 1 arg))
+                               (string-to-number (or (match-string 2 arg)
+                                                     ""))))))
+
+                ;; -file FILENAME:  Load the given file.
+                (`"-file"
+                 (let ((file (pop args-left)))
+                   (if coding-system
+                       (setq file (decode-coding-string file coding-system)))
+                   (setq file (expand-file-name file dir))
+                   (push (cons file filepos) files)
+                   (server-log (format "New file: %s %s"
+                                       file (or filepos "")) proc))
+                 (setq filepos nil))
+
+                ;; -eval EXPR:  Evaluate a Lisp expression.
+                (`"-eval"
+                 (if use-current-frame
+                     (setq use-current-frame 'always))
+                 (lexical-let ((expr (pop args-left)))
+                   (if coding-system
+                       (setq expr (decode-coding-string expr coding-system)))
+                   (push (lambda () (server-eval-and-print expr proc))
+                         commands)
+                   (setq filepos nil)))
+
+                ;; -env NAME=VALUE:  An environment variable.
+                (`"-env"
+                 (let ((var (pop args-left)))
+                   ;; XXX Variables should be encoded as in getenv/setenv.
+                   (process-put proc 'env
+                                (cons var (process-get proc 'env)))))
+
+                ;; -dir DIRNAME:  The cwd of the emacsclient process.
+                (`"-dir"
+                 (setq dir (pop args-left))
+                 (if coding-system
+                     (setq dir (decode-coding-string dir coding-system)))
+                 (setq dir (command-line-normalize-file-name dir)))
+
+                ;; Unknown command.
+                (arg (error "Unknown command: %s" arg))))
 
             (setq frame
                   (cond
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 5f386bcee76..38fbaaedd32 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -1061,6 +1061,9 @@ Throw an error if another update process is in progress."
                   (unless (vc-dir-fileinfo->directory info)
                     (setf (vc-dir-fileinfo->needs-update info) t) nil))
                 vc-ewoc)
+      ;; Bzr has serious locking problems, so setup the headers first (this is
+      ;; synchronous) rather than doing it while dir-status is running.
+      (ewoc-set-hf vc-ewoc (vc-dir-headers backend def-dir) "")
       (lexical-let ((buffer (current-buffer)))
         (with-current-buffer vc-dir-process-buffer
           (cd def-dir)
@@ -1081,8 +1084,7 @@ Throw an error if another update process is in progress."
                        (vc-dir-refresh-files
                         (mapcar 'vc-dir-fileinfo->name remaining)
                         'up-to-date)
-                     (setq mode-line-process nil)))))))))
-      (ewoc-set-hf vc-ewoc (vc-dir-headers backend def-dir) ""))))
+                     (setq mode-line-process nil))))))))))))
 
 (defun vc-dir-show-fileentry (file)
   "Insert an entry for a specific file into the current *VC-dir* listing.