Merge from mainline.

3 files changed, 47 insertions, 18 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cfde9093e75..1b493440367 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,22 @@
+2010-01-05  Kenichi Handa  <handa@m17n.org>
+
+        * language/indian.el (malayalam-composable-pattern): Fix ZWNJ and
+        ZWJ.
+
+2010-01-05  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * vc-bzr.el (vc-bzr-diff): Obey vc-disable-async-diff.
+
+2010-01-04  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * vc-bzr.el (vc-bzr-state-heuristic): Make it work for lightweight
+        checkouts.  (Bug#618)
+        (vc-bzr-log-view-mode): Also highlight the author.
+        (vc-bzr-shelve-map): Change binding for vc-bzr-shelve-apply-at-point.
+        (vc-bzr-shelve-menu-map):
+        (vc-bzr-dir-extra-headers): Improve menu and tooltip text.
+        (vc-bzr-shelve-apply): Make prompt more explicit.
+
 2010-01-02  Chong Yidong  <cyd@stupidchicken.com>
 
         * net/browse-url.el (browse-url-encode-url): Don't escape commas.
diff --git a/lisp/language/indian.el b/lisp/language/indian.el
index 82f24a0272f..b9ea94ab2d1 100644
--- a/lisp/language/indian.el
+++ b/lisp/language/indian.el
@@ -153,8 +153,8 @@ South Indian language Malayalam is supported in this language environment."))
            ("a" . "\u0903")                      ; vowel modifier (post) 
            ("S" . "\u0951")                      ; stress sign (above)
            ("s" . "\u0952")                      ; stress sign (below)
-           ("J" . "\u200D")                      ; ZWJ
            ("N" . "\u200C")                      ; ZWNJ
+           ("J" . "\u200D")                      ; ZWJ
            ("X" . "[\u0900-\u097F]"))))          ; all coverage
     (indian-compose-regexp
      (concat
@@ -195,8 +195,8 @@ South Indian language Malayalam is supported in this language environment."))
            ("b" . "[\u0D62-\u0D63]")              ; belowbase matra
            ("a" . "[\u0D02-\u0D03]")              ; abovebase sign
            ("H" . "\u0D4D")                       ; virama sign 
-           ("N" . "\u200D")                       ; ZWJ
-           ("J" . "\u200C")                       ; ZWNJ
+           ("N" . "\u200C")                       ; ZWNJ
+           ("J" . "\u200D")                       ; ZWJ
            ("X" . "[\u0D00-\u0D7F]"))))           ; all coverage
     (indian-compose-regexp
      (concat
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index fff4eca57fa..fc62696af1d 100644
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -176,13 +176,13 @@ Invoke the bzr command adding `BZR_PROGRESS_BAR=none' and
                                "\0"
                                "[^\0]*\0"     ;id?
                                "\\([^\0]*\\)\0" ;"a/f/d", a=removed?
-                               "[^\0]*\0" ;sha1 (empty if conflicted)?
-                               "\\([^\0]*\\)\0" ;size?
+                               "\\([^\0]*\\)\0" ;sha1 (empty if conflicted)?
+                               "\\([^\0]*\\)\0" ;size?p
                                "[^\0]*\0"       ;"y/n", executable?
                                "[^\0]*\0"       ;?
                                "\\([^\0]*\\)\0" ;"a/f/d" a=added?
                                "\\([^\0]*\\)\0" ;sha1 again?
-                               "[^\0]*\0"       ;size again?
+                               "\\([^\0]*\\)\0" ;size again?
                                "[^\0]*\0" ;"y/n", executable again?
                                "[^\0]*\0" ;last revid?
                                ;; There are more fields when merges are pending.
@@ -194,11 +194,20 @@ Invoke the bzr command adding `BZR_PROGRESS_BAR=none' and
                       ;; conflict markers).
                       (cond
                        ((eq (char-after (match-beginning 1)) ?a) 'removed)
-                       ((eq (char-after (match-beginning 3)) ?a) 'added)
-                       ((and (eq (string-to-number (match-string 2))
+                       ((eq (char-after (match-beginning 4)) ?a) 'added)
+                       ((or (and (eq (string-to-number (match-string 3))
                                  (nth 7 (file-attributes file)))
-                             (equal (match-string 4)
+                             (equal (match-string 5)
                                     (vc-bzr-sha1 file)))
+                            (and
+                             ;; It looks like for lightweight
+                             ;; checkouts \2 is empty and we need to
+                             ;; look for size in \6.
+                             (eq (match-beginning 2) (match-end 2))
+                             (eq (string-to-number (match-string 6))
+                                 (nth 7 (file-attributes file)))
+                             (equal (match-string 5)
+                                    (vc-bzr-sha1 file))))
                         'up-to-date)
                        (t 'edited))
                     'unregistered))))
@@ -475,7 +484,7 @@ REV non-nil gets an error."
                     (4 'change-log-list nil lax))))
          (append `((,log-view-message-re . 'log-view-message-face))
                  ;; log-view-font-lock-keywords
-                 '(("^ *committer: \
+                 '(("^ *\\(?:committer\\|author\\): \
 \\([^<(]+?\\)[  ]*[(<]\\([[:alnum:]_.+-]+@[[:alnum:]_.-]+\\)[>)]"
                     (1 'change-log-name)
                     (2 'change-log-email))
@@ -523,7 +532,8 @@ REV non-nil gets an error."
 (defun vc-bzr-diff (files &optional rev1 rev2 buffer)
   "VC bzr backend for diff."
   ;; `bzr diff' exits with code 1 if diff is non-empty.
-  (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*") 'async files
+  (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*")
+         (if vc-disable-async-diff 1 'async) files
          "--diff-options" (mapconcat 'identity
                                      (vc-switches 'bzr 'diff)
                                      " ")
@@ -732,7 +742,7 @@ stream.  Standard error output is discarded."
     (define-key map "\C-k" 'vc-bzr-shelve-delete-at-point)
     ;; (define-key map "=" 'vc-bzr-shelve-show-at-point)
     ;; (define-key map "\C-m" 'vc-bzr-shelve-show-at-point)
-    (define-key map "A" 'vc-bzr-shelve-apply-at-point)
+    (define-key map "P" 'vc-bzr-shelve-apply-at-point)
     map))
 
 (defvar vc-bzr-shelve-menu-map
@@ -740,9 +750,9 @@ stream.  Standard error output is discarded."
     (define-key map [de]
       '(menu-item "Delete shelf" vc-bzr-shelve-delete-at-point
                   :help "Delete the current shelf"))
-    (define-key map [ap]
-      '(menu-item "Apply shelf" vc-bzr-shelve-apply-at-point
-                  :help "Apply the current shelf"))
+    (define-key map [po]
+      '(menu-item "Apply and remove shelf (pop)" vc-bzr-shelve-apply-at-point
+                  :help "Apply the current shelf and remove it"))
     ;; (define-key map [sh]
     ;;   '(menu-item "Show shelve" vc-bzr-shelve-show-at-point
     ;;            :help "Show the contents of the current shelve"))
@@ -800,7 +810,7 @@ stream.  Standard error output is discarded."
              (propertize x
                          'face 'font-lock-variable-name-face
                          'mouse-face 'highlight
-                         'help-echo "mouse-3: Show shelve menu\nA: Apply shelf\nC-k: Delete shelf"
+                         'help-echo "mouse-3: Show shelve menu\nP: Apply and remove shelf (pop)\nC-k: Delete shelf"
                          'keymap vc-bzr-shelve-map))
            shelve "\n"))
        (concat
@@ -830,8 +840,8 @@ stream.  Standard error output is discarded."
 ;;   (pop-to-buffer (current-buffer)))
 
 (defun vc-bzr-shelve-apply (name)
-  "Apply shelve NAME."
-  (interactive "sApply shelf: ")
+  "Apply shelve NAME and remove it afterwards."
+  (interactive "sApply (and remove) shelf: ")
   (vc-bzr-command "unshelve" "*vc-bzr-shelve*" 0 nil "--apply" name)
   (vc-resynch-buffer (vc-bzr-root default-directory) t t))