merge trunk

20 files changed, 387 insertions, 158 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 78e2473e373..0639aa50884 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,98 @@
 2010-04-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * international/mule.el: Help the user choose a valid coding-system.
+        (read-buffer-file-coding-system): New function.
+        (set-buffer-file-coding-system): Use it.  Prompt the user if the
+        coding-system cannot encode all the chars.
+
+        * vc-bzr.el: Use standard *vc* and *vc-diff* buffers.
+        (vc-bzr-shelve-show, vc-bzr-shelve-apply)
+        (vc-bzr-shelve-apply-and-keep, vc-bzr-shelve-snapshot):
+        Don't use *vc-bzr-shelve*.
+
+2010-04-19  Chong Yidong  <cyd@stupidchicken.com>
+
+        * cedet/ede/pmake.el (ede-proj-makefile-insert-variables):
+        Don't destroy list before using it.
+
+2010-04-19  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Fix the version number for added files.
+        * vc-hg.el (vc-hg-working-revision): Check if the file is
+        registered after hg parent fails (Bug#5961).
+
+2010-04-19  Glenn Morris  <rgm@gnu.org>
+
+        * htmlfontify.el (htmlfontify-buffer)
+        (htmlfontify-copy-and-link-dir): Autoload entry points.
+
+2010-04-19  Magnus Henoch  <magnus.henoch@gmail.com>
+
+        * vc-hg.el (vc-hg-annotate-extract-revision-at-line): Expand file
+        name relative to the project root (Bug#5960).
+
+2010-04-19  Glenn Morris  <rgm@gnu.org>
+
+        * vc-git.el (vc-git-print-log): Doc fix.
+
+2010-04-19  Óscar Fuentes  <ofv@wanadoo.es>
+
+        * ido.el (ido-file-internal): Fix 2009-12-02 change.
+
+2010-04-19  Christoph  <cschol2112@googlemail.com>  (tiny change)
+
+        * progmodes/grep.el (grep-compute-defaults): Fix handling of host
+        default settings (Bug#5928).
+
+2010-04-19  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/fortran.el (fortran-match-and-skip-declaration):
+        New function.
+        (fortran-font-lock-keywords-3): Use it.  (Bug#1385)
+
+2010-04-19  Kenichi Handa  <handa@m17n.org>
+
+        * language/indian.el (malayalam-composable-pattern): Fix previous
+        change (add U+0D4D "SIGN VIRAMA").
+        (oriya-composable-pattern): Add U+0B30 and fix typo in the regexp.
+        (tamil-composable-pattern): Fix typo in the regexp.
+        (telugu-composable-pattern): Fix U+0C4D and typo in the regexp.
+        (kannada-composable-pattern): Fix U+0CB0 and typo in the regexp.
+        (malayalam-composable-pattern): Fix U+0D4D and typo in the regexp.
+
+2010-04-19  Chong Yidong  <cyd@stupidchicken.com>
+
+        * textmodes/tex-mode.el (latex-mode): Revert 2008-03-03 change to
+        paragraph-separate (Bug#5821).
+
+2010-04-19  Juri Linkov  <juri@jurta.org>
+
+        Put breadcrumbs on overlay instead of inserting to buffer (bug#5809).
+
+        * info.el (Info-find-node-2): Comment out code that skips
+        breadcrumbs line.
+        (Info-mouse-follow-link): New command.
+        (Info-link-keymap): New keymap.
+        (Info-breadcrumbs): Rename from `Info-insert-breadcrumbs'.
+        Return a string with links instead of inserting breadcrumbs
+        to the Info buffer.
+        (Info-fontify-node): Comment out code that inserts breadcrumbs.
+        Instead of putting the `invisible' text property over the Info
+        header, make an overlay over the Info header with the `invisible'
+        property and `after-string' set to the string returned by
+        `Info-breadcrumbs'.
+
+2010-04-19  Chong Yidong  <cyd@stupidchicken.com>
+
+        * help.el (help-window-setup-finish): Doc fix (Bug#5830).
+        Reported by monkey@sandpframing.com.
+
+2010-04-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * tmm.el (tmm-prompt): Remove obsolete call to x-popup-menu.
+        (tmm-get-keymap): Add key-binding shortcuts now that they're not
+        available in the "keyseq cache" any more.
+
         * custom.el (defcustom): Add edebug spec.
 
 2010-04-18  Juri Linkov  <juri@jurta.org>
@@ -355,32 +448,31 @@
 
 2010-04-07  Michael McNamara  <mac@mail.brushroad.com>
 
-        * progmodes/verilog-mode.el (verilog-forward-sexp):
+        * progmodes/verilog-mode.el (verilog-forward-sexp):
         (verilog-calc-1): Support "disable fork" and "fork wait" multi
         word keywords, suggested by Steve Pearlmutter.
-        (verilog-pretty-declarations): Support lineup of declarations in
+        (verilog-pretty-declarations): Support lineup of declarations in
         port lists.
-        (verilog-skip-backward-comments, verilog-skip-forward-comment-p):
-        fix bug for /* / comments
-        (verilog-backward-syntactic-ws, verilog-forward-syntactic-ws):
+        (verilog-skip-backward-comments, verilog-skip-forward-comment-p):
+        fix bug for /* / comments
+        (verilog-backward-syntactic-ws, verilog-forward-syntactic-ws):
         Speed up and simplfy as this is never called with a bound.
-        (verilog-pretty-declarations): Enhance to line up declarations
-        inside a parameter list, suggested by Alan Morgan.
-        (verilog-pretty-expr): Tune assignment regular expression match
-        string for corner cases; also use markers instead of character
-        number as indent changes the later.
+        (verilog-pretty-declarations): Enhance to line up declarations
+        inside a parameter list, suggested by Alan Morgan.
+        (verilog-pretty-expr): Tune assignment regular expression match
+        string for corner cases; also use markers instead of character
+        number as indent changes the later.
 
 2010-04-07  Wilson Snyder  <wsnyder@wsnyder.org>
 
-        * progmodes/verilog-mode.el (verilog-type-keywords): Fix pulldown as missing
-        keyword.
-        (verilog-read-sub-decls-line): Fix comments in AUTO_TEMPLATE
-        causing truncation of AUTOWIRE signals.  Reported by Bruce
-        Tennant.
-        (verilog-auto-inst, verilog-auto-inst-port): Add vl_mbits for
-        AUTO_TEMPLATEs needing multiple array bits.  Suggested by Bruce
-        Tennant.
-        (verilog-keywords):
+        * progmodes/verilog-mode.el (verilog-type-keywords): Fix pulldown
+        as missing keyword.
+        (verilog-read-sub-decls-line): Fix comments in AUTO_TEMPLATE
+        causing truncation of AUTOWIRE signals.  Reported by Bruce Tennant.
+        (verilog-auto-inst, verilog-auto-inst-port): Add vl_mbits for
+        AUTO_TEMPLATEs needing multiple array bits.  Suggested by Bruce
+        Tennant.
+        (verilog-keywords):
         (verilog-1800-2005-keywords, verilog-1800-2009-keywords): Add IEEE
         1800-2009 keywords, including "global.".
 
@@ -543,7 +635,7 @@
 
 2010-03-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        Make tmm-menubar work for the Buffers menu again.
+        Make tmm-menubar work for the Buffers menu again (bug#5726).
         * tmm.el (tmm-prompt): Also handle keymap entries in the form of
         vectors rather than cons cells, as used in menu-bar-update-buffers.
 
@@ -1267,11 +1359,6 @@
         * calendar/cal-hebrew.el (holiday-hebrew-passover): Fix date
         of Yom HaAtzma'ut when it falls on a Monday (rule changed in 2004).
 
-2010-03-01  Alan Mackenzie  <acm@muc.de>
-
-        * progmodes/cc-engine.el (c-remove-stale-state-cache):
-        Correct previous patch.
-
 2010-03-01  Kenichi Handa  <handa@m17n.org>
 
         * language/burmese.el (burmese-composable-pattern): Rename from
@@ -1283,11 +1370,6 @@
         (otf-script-alist): Likewise.
         (setup-default-fontset): Likewise.  Re-fix :otf spec.
 
-2010-03-01  Alan Mackenzie  <bug-cc-mode@gnu.org>
-
-        * cc-engine.el (c-remove-stale-state-cache): Take account of when
-        `good-pos' is in the same macro as `here'.  Fixes bug#5649.
-
 2010-02-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * menu-bar.el (menu-bar-manuals-menu): Fix typo.
@@ -1353,16 +1435,6 @@
         * mail/sendmail.el (send-mail-function): Autoload the call
         to custom-initialize-delay, not otherwise preserved in loaddefs.el.
 
-2010-02-25  Alan Mackenzie  <acm@muc.de>
-
-        * progmodes/cc-engine.el (c-clear-<-pair-props)
-        (c-clear->-pair-props): Correct to wipe category text props, not
-        syntax-table ones.
-
-        * progmodes/cc-mode.el (c-after-change): Remove any hard
-        syntax-table properties for <, > which, e.g., C-y has
-        inopportunely converted from category properties.
-
 2010-02-24  Chong Yidong  <cyd@stupidchicken.com>
 
         * files.el (hack-local-variables-filter): For eval forms, also
@@ -1700,33 +1772,6 @@
         (doc-view-pdf->png): Don't rely on doc-view-pdf/ps->png for the few
         windows that are not yet showing images.
 
-2010-02-04  Alan Mackenzie  <acm@muc.de>
-
-        Change strategy for marking < and > as template delimiters: mark
-        them strictly in matching pairs.
-
-        * cc-mode.el (c-before-change):
-        Use c-get-state-before-change-functions.
-        (c-common-init): Adapt to use
-        c-get-state-before-change-functions (note plural).
-
-        * cc-langs.el (c-no-parens-syntax-table): New syntax table, used
-        for searching syntactically for matching <s and >s.
-        (c-get-state-before-change-functions): New language variable (note
-        the plural) which supersedes c-get-state-before-change-function.
-
-        * cc-engine.el (c-clear-<-pair-props, c-clear->-pair-props)
-        (c-clear-<>-pair-props, c-clear-<-pair-props-if-match-after)
-        (c-clear->-pair-props-if-match-before)
-        (c-before-change-check-<>-operators): New functions.
-        (c-after-change-check-<>-operators): Use macro
-        c-unmark-<->-as-paren.
-
-        * cc-defs.el (c-search-backward-char-property): New macro.
-
-        * cc-cmds.el (c-electric-lt-gt): Do not set text properties on <
-        and > any more.  (These will be handled by font locking.)
-
 2010-02-04  Michael Albinus  <michael.albinus@gmx.de>
 
         * dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
diff --git a/lisp/cedet/ede/pmake.el b/lisp/cedet/ede/pmake.el
index 971cd70a6ee..19c4b26edcd 100644
--- a/lisp/cedet/ede/pmake.el
+++ b/lisp/cedet/ede/pmake.el
@@ -425,10 +425,9 @@ sources variable."
         (link (ede-proj-linkers this))
         (name (ede-proj-makefile-target-name this))
         (src (oref this source)))
-    (while comp
-      (ede-compiler-only-once (car comp)
-        (ede-proj-makefile-insert-variables (car comp)))
-      (setq comp (cdr comp)))
+    (dolist (obj comp)
+      (ede-compiler-only-once obj
+                              (ede-proj-makefile-insert-variables obj)))
     (ede-proj-makefile-insert-object-variables (car comp) name src)
     (while link
       (ede-linker-only-once (car link)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b0b3cd11b6a..94524c262ac 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,6 +1,15 @@
+2010-04-17  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * smime.el: Don't mention CVS.
+
+        * nnrss.el (nnrss-fetch): Don't mention CVS.
+
+        * nnir.el: Don't mention CVS.
+
 2010-04-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * gnus-sum.el (gnus-summary-bookmark-make-record): Add `location' field.
+        * gnus-sum.el (gnus-summary-bookmark-make-record):
+        Add `location' field.
 
 2010-04-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 5475506746a..c14d9a1b6aa 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -52,7 +52,7 @@
 
 
 ;; The most recent version of this can always be fetched from the Gnus
-;; CVS repository.  See http://www.gnus.org/ for more information.
+;; repository.  See http://www.gnus.org/ for more information.
 
 ;; This code is still in the development stage but I'd like other
 ;; people to have a look at it.  Please do not hesitate to contact me
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el
index 36291537909..08b621919eb 100644
--- a/lisp/gnus/nnrss.el
+++ b/lisp/gnus/nnrss.el
@@ -427,7 +427,7 @@ otherwise return nil."
 (defun nnrss-fetch (url &optional local)
   "Fetch URL and put it in a the expected Lisp structure."
   (mm-with-unibyte-buffer
-    ;;some CVS versions of url.el need this to close the connection quickly
+    ;;some versions of url.el need this to close the connection quickly
     (let (cs xmlform htmlform)
       ;; bit o' work necessary for w3 pre-cvs and post-cvs
       (if local
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index 8780d6cfb61..b60acee445d 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -42,7 +42,7 @@
 ;; done on messages encoded in these formats.  The terminology chosen
 ;; reflect this.
 ;;
-;; The home of this file is in Gnus CVS, but also available from
+;; The home of this file is in Gnus, but also available from
 ;; http://josefsson.org/smime.html.
 
 ;;; Quick introduction:
diff --git a/lisp/help.el b/lisp/help.el
index 5e4c4ebaf61..899547aa0a1 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1048,10 +1048,9 @@ scroll the \"other\" window."
 Select WINDOW according to the value of `help-window-select'.
 Display message telling how to scroll and eventually quit WINDOW.
 
-Optional argument REUSE non-nil means WINDOW has been reused \(by
-`display-buffer'\) for displaying help.  Optional argument
-KEEP-FRAME non-nil means that quitting must no delete the frame
-of WINDOW."
+Optional argument REUSE non-nil means WINDOW has been reused by
+`display-buffer'.  Optional argument KEEP-FRAME non-nil means
+that quitting should not delete WINDOW's frame."
   (let ((number-of-windows
          (length (window-list (window-frame window) 'no-mini window))))
     (cond
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index dbf5cea7fc8..19aae590cb2 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -1790,6 +1790,7 @@ FILE, if set, is the file name."
     (when font-lock-defaults
       (font-lock-fontify-buffer)) ))
 
+;;;###autoload
 (defun htmlfontify-buffer (&optional srcdir file)
   "Create a new buffer, named for the current buffer + a .html extension,
 containing an inline CSS-stylesheet and formatted CSS-markup HTML
@@ -2276,6 +2277,7 @@ See also `hfy-load-tags-cache'."
     (save-buffer)
     (kill-buffer B)))
 
+;;;###autoload
 (defun htmlfontify-copy-and-link-dir (srcdir dstdir &optional f-ext l-ext)
   "Trawl SRCDIR and write fontified-and-hyperlinked output in DSTDIR.
 F-EXT and L-EXT specify values for `hfy-extn' and `hfy-link-extn'.\n
diff --git a/lisp/ido.el b/lisp/ido.el
index ebfcbd4da88..57aa7d4a723 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2312,7 +2312,8 @@ If cursor is not at the end of the user input, move to end of input."
            (or ido-use-url-at-point ido-use-filename-at-point))
       (let (fn d)
         (require 'ffap)
-        ;; Duplicate code from ffap-guesser as we want different behavior for files and URLs.
+        ;; Duplicate code from ffap-guesser as we want different
+        ;; behavior for files and URLs.
         (cond
          ((with-no-warnings
             (and ido-use-url-at-point
@@ -2328,7 +2329,10 @@ If cursor is not at the end of the user input, move to end of input."
                               (ffap-guesser)
                             (ffap-string-at-point))))
                (not (string-match "^http:/" fn))
-               (setq d (file-name-directory (expand-file-name fn)))
+               (let ((absolute-fn (expand-file-name fn)))
+                 (setq d (if (file-directory-p absolute-fn)
+                             (file-name-as-directory absolute-fn)
+                           (file-name-directory absolute-fn))))
                (file-directory-p d))
           (setq ido-current-directory d)
           (setq initial (file-name-nondirectory fn))))))
diff --git a/lisp/info.el b/lisp/info.el
index 18a11d28777..aea283403ec 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1053,8 +1053,8 @@ a case-insensitive match is tried."
             (Info-select-node)
             (goto-char (point-min))
             (forward-line 1)                   ; skip header line
-            (when (> Info-breadcrumbs-depth 0) ; skip breadcrumbs line
-              (forward-line 1))
+            ;; (when (> Info-breadcrumbs-depth 0) ; skip breadcrumbs line
+            ;;   (forward-line 1))
 
             (cond (anchorpos
                    (let ((new-history (list Info-current-file
@@ -3602,6 +3602,19 @@ If FORK is non-nil, it is passed to `Info-goto-node'."
      ((setq node (Info-get-token (point) "Prev: " "Prev: \\([^,\n\t]*\\)"))
       (Info-goto-node node fork)))
     node))
+
+(defun Info-mouse-follow-link (click)
+  "Follow a link where you click."
+  (interactive "e")
+  (let* ((position (event-start click))
+         (posn-string (and position (posn-string position)))
+         (string (car-safe posn-string))
+         (string-pos (cdr-safe posn-string))
+         (link-args (and string string-pos
+                         (get-text-property string-pos 'link-args string))))
+    (when link-args
+      (Info-goto-node link-args))))
+
 
 (defvar Info-mode-map
   (let ((map (make-keymap)))
@@ -4183,11 +4196,22 @@ the variable `Info-file-list-for-emacs'."
     keymap)
   "Keymap to put on the Up link in the text or the header line.")
 
-(defun Info-insert-breadcrumbs ()
+(defvar Info-link-keymap
+  (let ((keymap (make-sparse-keymap)))
+    (define-key keymap [header-line mouse-1] 'Info-mouse-follow-link)
+    (define-key keymap [header-line mouse-2] 'Info-mouse-follow-link)
+    (define-key keymap [header-line down-mouse-1] 'ignore)
+    (define-key keymap [mouse-2] 'Info-mouse-follow-link)
+    (define-key keymap [follow-link] 'mouse-face)
+    keymap)
+  "Keymap to put on the link in the text or the header line.")
+
+(defun Info-breadcrumbs ()
   (let ((nodes (Info-toc-nodes Info-current-file))
         (node Info-current-node)
         (crumbs ())
-        (depth Info-breadcrumbs-depth))
+        (depth Info-breadcrumbs-depth)
+        line)
 
     ;; Get ancestors from the cached parent-children node info
     (while (and (not (equal "Top" node)) (> depth 0))
@@ -4214,15 +4238,25 @@ the variable `Info-file-list-for-emacs'."
                              (file-name-nondirectory Info-current-file)
                            ;; Some legacy code can still use a symbol.
                            Info-current-file)))))
-          (insert (if (bolp) "" " > ")
-                  (cond
-                   ((null node) "...")
-                   ((equal node Info-current-node)
-                    ;; No point linking to ourselves.
-                    (propertize text 'font-lock-face 'info-header-node))
-                   (t
-                    (concat "*Note " text "::"))))))
-      (insert "\n"))))
+          (setq line (concat
+                      line
+                      (if (null line) "" " > ")
+                      (cond
+                       ((null node) "...")
+                       ((equal node Info-current-node)
+                        ;; No point linking to ourselves.
+                        (propertize text 'font-lock-face 'info-header-node))
+                       (t
+                        (propertize text
+                                    'mouse-face 'highlight
+                                    'font-lock-face 'info-header-xref
+                                    'help-echo "mouse-2: Go to node"
+                                    'keymap Info-link-keymap
+                                    'link-args text)))))))
+      (setq line (concat line "\n")))
+    ;; (font-lock-append-text-property 0 (length line)
+    ;;                              'font-lock-face 'header-line line)
+    line))
 
 (defun Info-fontify-node ()
   "Fontify the node."
@@ -4269,8 +4303,8 @@ the variable `Info-file-list-for-emacs'."
                 ((string-equal (downcase tag) "next") Info-next-link-keymap)
                 ((string-equal (downcase tag) "up"  ) Info-up-link-keymap))))))
 
-        (when (> Info-breadcrumbs-depth 0)
-          (Info-insert-breadcrumbs))
+        ;; (when (> Info-breadcrumbs-depth 0)
+        ;;   (insert (Info-breadcrumbs)))
 
         ;; Treat header line.
         (when Info-use-header-line
@@ -4302,7 +4336,10 @@ the variable `Info-file-list-for-emacs'."
             ;; that is in the header, if it is just part.
             (cond
              ((> Info-breadcrumbs-depth 0)
-              (put-text-property (point-min) (1+ header-end) 'invisible t))
+              (let ((ov (make-overlay (point-min) (1+ header-end))))
+                (overlay-put ov 'invisible t)
+                (overlay-put ov 'after-string (Info-breadcrumbs))
+                (overlay-put ov 'evaporate t)))
              ((not (bobp))
               ;; Hide the punctuation at the end, too.
               (skip-chars-backward " \t,")
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 244bfca8d28..ac33d26779f 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1165,6 +1165,64 @@ Internal use only.")
 (make-variable-buffer-local 'buffer-file-coding-system-explicit)
 (put 'buffer-file-coding-system-explicit 'permanent-local t)
 
+(defun read-buffer-file-coding-system ()
+  (let* ((bcss (find-coding-systems-region (point-min) (point-max)))
+         (css-table
+          (unless (equal bcss '(undecided))
+            (append '("dos" "unix" "mac")
+                    (delq nil (mapcar (lambda (cs)
+                                        (if (memq (coding-system-base cs) bcss)
+                                            (symbol-name cs)))
+                                      coding-system-list)))))
+         (combined-table
+          (if css-table
+              (completion-table-in-turn css-table coding-system-alist)
+            coding-system-alist))
+         (auto-cs
+          (unless find-file-literally
+            (save-excursion
+              (save-restriction
+                (widen)
+                (goto-char (point-min))
+                (funcall set-auto-coding-function
+                         (or buffer-file-name "") (buffer-size))))))
+         (preferred
+          (let ((bfcs (default-value 'buffer-file-coding-system)))
+            (cons (and (or (equal bcss '(undecided))
+                           (memq (coding-system-base bfcs) bcss))
+                       bfcs)
+                  (mapcar (lambda (cs)
+                            (and (coding-system-p cs)
+                                 (coding-system-get cs :mime-charset)
+                                 (or (equal bcss '(undecided))
+                                     (memq (coding-system-base cs) bcss))
+                                 cs))
+                          (coding-system-priority-list)))))
+         (default
+           (let ((current (coding-system-base buffer-file-coding-system)))
+             ;; Generally use as a default the first preferred coding-system
+             ;; different from the current coding-system, except for
+             ;; the case of auto-cs since choosing anything else is asking
+             ;; for trouble (would lead to using a different coding
+             ;; system than specified in the coding tag).
+             (or auto-cs
+                 (car (delq nil
+                            (mapcar (lambda (cs)
+                                      (if (eq current (coding-system-base cs))
+                                          nil
+                                        cs))
+                                    preferred))))))
+         (completion-ignore-case t)
+         (completion-pcm--delim-wild-regex ; Let "u8" complete to "utf-8".
+          (concat completion-pcm--delim-wild-regex
+                  "\\|\\([[:alpha:]]\\)[[:digit:]]"))
+         (cs (completing-read
+              (format "Coding system for saving file (default %s): " default)
+              combined-table
+              nil t nil 'coding-system-history
+              (if default (symbol-name default)))))
+    (unless (zerop (length cs)) (intern cs))))
+
 (defun set-buffer-file-coding-system (coding-system &optional force nomodify)
   "Set the file coding-system of the current buffer to CODING-SYSTEM.
 This means that when you save the buffer, it will be converted
@@ -1182,19 +1240,26 @@ surely saves the buffer with CODING-SYSTEM.  From a program, if you
 don't want to mark the buffer modified, specify t for NOMODIFY.
 If you know exactly what coding system you want to use,
 just set the variable `buffer-file-coding-system' directly."
-  (interactive "zCoding system for saving file (default nil): \nP")
+  (interactive
+   (list (read-buffer-file-coding-system)
+         current-prefix-arg))
   (check-coding-system coding-system)
   (if (and coding-system buffer-file-coding-system (null force))
       (setq coding-system
             (merge-coding-systems coding-system buffer-file-coding-system)))
+  (when (called-interactively-p 'interactive)
+    ;; Check whether save would succeed, and jump to the offending char(s)
+    ;; if not.
+    (let ((css (find-coding-systems-region (point-min) (point-max))))
+      (unless (or (eq (car css) 'undecided)
+                  (memq (coding-system-base coding-system) css))
+        (setq coding-system (select-safe-coding-system-interactively
+                             (point-min) (point-max) css
+                             (list coding-system))))))
   (setq buffer-file-coding-system coding-system)
   (if buffer-file-coding-system-explicit
       (setcdr buffer-file-coding-system-explicit coding-system)
     (setq buffer-file-coding-system-explicit (cons nil coding-system)))
-  ;; This is in case of an explicit call.  Normally, `normal-mode' and
-  ;; `set-buffer-major-mode-hook' take care of setting the table.
-  (if (fboundp 'ucs-set-table-for-input) ; don't lose when building
-      (ucs-set-table-for-input))
   (unless nomodify
     (set-buffer-modified-p t))
   (force-mode-line-update))
diff --git a/lisp/language/indian.el b/lisp/language/indian.el
index dd5bf2960b1..3414da2e045 100644
--- a/lisp/language/indian.el
+++ b/lisp/language/indian.el
@@ -241,7 +241,7 @@ South Indian language Malayalam is supported in this language environment."))
       ;; syllables with an independent vowel, or
       "\\(?:RH\\)?Vn?\\(?:J?HR\\)?v*n?a?A?\\|"
       ;; consonant-based syllables, or
-      "Cn?\\(?:J?HJ?Cn?\\)*\\(?:H[NJ]?|v*n?a?A?\\)\\|"
+      "Cn?\\(?:J?HJ?Cn?\\)*\\(?:H[NJ]?\\|v*n?a?A?\\)\\|"
       ;; special consonant form, or
       "JHR\\|"
       ;; any other singleton characters
@@ -256,8 +256,9 @@ South Indian language Malayalam is supported in this language environment."))
            ("V" . "[\u0B05-\u0B14\u0B60-\u0B61]") ; independent vowel
            ("C" . "[\u0B15-\u0B39\u0B5C-\u0B5D\u0B71]") ; consonant
            ("B" . "[\u0B15-\u0B17\u0B1B-\u0B1D\u0B1F-\u0B21\u0B23-\u0B24\u0B27-\u0B30\u0B32-\u0B35\u0B38-\u0B39]") ; consonant with below form
+           ("R" . "\u0B30")             ; RA
            ("n" . "\u0B3C")             ; NUKTA
-           ("v" . "[\u0B3E-\u0B44\u0B56-\u0B57\u0B62-\u0B63]") ; vowel sign
+           ("v" . "[\u0B3E-\u0B44\u0B47\u0B56-\u0B57\u0B62-\u0B63]") ; vowel sign
            ("H" . "\u0B4D")             ; VIRAMA
            ("N" . "\u200C")             ; ZWNJ
            ("J" . "\u200D")             ; ZWJ
@@ -267,7 +268,7 @@ South Indian language Malayalam is supported in this language environment."))
       ;; syllables with an independent vowel, or
       "\\(?:RH\\)?Vn?\\(?:J?HB\\)?v*n?a?A?\\|"
       ;; consonant-based syllables, or
-      "Cn?\\(?:J?HJ?Cn?\\)*\\(?:H[NJ]?|v*n?a?A?\\)\\|"
+      "Cn?\\(?:J?HJ?Cn?\\)*\\(?:H[NJ]?\\|v*n?a?A?\\)\\|"
       ;; special consonant form, or
       "JHB\\|"
       ;; any other singleton characters
@@ -288,7 +289,7 @@ South Indian language Malayalam is supported in this language environment."))
     (indian-compose-regexp
      (concat
       ;; consonant-based syllables, or
-      "C\\(?:J?HJ?C\\)*\\(?:H[NJ]?|v*a?\\)\\|"
+      "C\\(?:J?HJ?C\\)*\\(?:H[NJ]?\\|v*a?\\)\\|"
       ;; syllables with an independent vowel, or
       "Vv*a?\\|"
       ;; any other singleton characters
@@ -302,14 +303,14 @@ South Indian language Malayalam is supported in this language environment."))
            ("V" . "[\u0C05-\u0C14\u0C60-\u0C61]") ; independent vowel
            ("C" . "[\u0C15-\u0C39\u0C58-\u0C59]") ; consonant
            ("v" . "[\u0C3E-\u0C4C\u0C55-\u0C56\u0C62-\u0C63]")  ; vowel sign
-           ("H" . "\u0BCD")             ; VIRAMA
+           ("H" . "\u0C4D")             ; VIRAMA
            ("N" . "\u200C")             ; ZWNJ
            ("J" . "\u200D")             ; ZWJ
            ("X" . "[\u0C00-\u0C7F]")))) ; all coverage
     (indian-compose-regexp
      (concat
       ;; consonant-based syllables, or
-      "C\\(?:J?HJ?C\\)*\\(?:H[NJ]?|v*a?\\)\\|"
+      "C\\(?:J?HJ?C\\)*\\(?:H[NJ]?\\|v*a?\\)\\|"
       ;; syllables with an independent vowel, or
       "V\\(?:J?HC\\)?v*a?\\|"
       ;; special consonant form, or
@@ -324,7 +325,7 @@ South Indian language Malayalam is supported in this language environment."))
          '(("A" . "[\u0C82-\u0C83]")    ; SIGN ANUSVARA .. VISARGA
            ("V" . "[\u0C85-\u0C94\u0CE0-\u0CE1]") ; independent vowel
            ("C" . "[\u0C95-\u0CB9\u0CDE]")        ; consonant
-           ("B" . "\u0CB0")             ; RA
+           ("R" . "\u0CB0")             ; RA
            ("n" . "\u0CBC")             ; NUKTA
            ("v" . "[\u0CBE-\u0CCC\u0CD5-\u0CD6\u0CE2-\u0CE3]") ; vowel sign
            ("H" . "\u0CCD")             ; VIRAMA
@@ -336,9 +337,9 @@ South Indian language Malayalam is supported in this language environment."))
       ;; syllables with an independent vowel, or
       "\\(?:RH\\)?Vn?\\(?:J?HC\\)?v?A?\\|"
       ;; consonant-based syllables, or
-      "Cn?\\(?:J?HJ?Cn?\\)*\\(?:H[NJ]?|v*n?A?\\)\\|"
+      "Cn?\\(?:J?HJ?Cn?\\)*\\(?:H[NJ]?\\|v*n?A?\\)\\|"
       ;; special consonant form, or
-      "JHB\\|"
+      "JHC\\|"
       ;; any other singleton characters
       "X")
      table))
@@ -351,13 +352,14 @@ South Indian language Malayalam is supported in this language environment."))
            ("C" . "[\u0D15-\u0D39]")              ; consonant 
            ("Y" . "[\u0D2F-\u0D30\u0D32\u0D35]")  ; YA, RA, LA, VA
            ("v" . "[\u0D3E-\u0D48\u0D57\u0D62-\u0D63]") ; postbase matra
+           ("H" . "\u0D4D")                       ; SIGN VIRAMA
            ("N" . "\u200C")                       ; ZWNJ
            ("J" . "\u200D")                       ; ZWJ
            ("X" . "[\u0D00-\u0D7F]"))))           ; all coverage
     (indian-compose-regexp
      (concat
       ;; consonant-based syllables, or
-      "\\(?:CJ?HJ?C\\)*\\(?:H[NJ]?\\|v?A?\\)\\|"
+      "C\\(?:J?HJ?C\\)*\\(?:H[NJ]?\\|v?A?\\)\\|"
       ;; syllables with an independent vowel, or
       "V\\(?:J?HY\\)?v*?A?\\|"
       ;; special consonant form, or
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 05cc13bd2e4..2730350c3df 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -381,21 +381,38 @@ the second failed attempt to complete."
 (defconst completion-styles-alist
   '((emacs21
      completion-emacs21-try-completion completion-emacs21-all-completions
-     "Simple prefix-based completion.")
+     "Simple prefix-based completion.
+I.e. when completing \"foo_bar\" (where _ is the position of point),
+it will consider all completions candidates matching the glob
+pattern \"foobar*\".")
     (emacs22
      completion-emacs22-try-completion completion-emacs22-all-completions
-     "Prefix completion that only operates on the text before point.")
+     "Prefix completion that only operates on the text before point.
+I.e. when completing \"foo_bar\" (where _ is the position of point),
+it will consider all completions candidates matching the glob
+pattern \"foo*\" and will add back \"bar\" to the end of it.")
     (basic
      completion-basic-try-completion completion-basic-all-completions
-     "Completion of the prefix before point and the suffix after point.")
+     "Completion of the prefix before point and the suffix after point.
+I.e. when completing \"foo_bar\" (where _ is the position of point),
+it will consider all completions candidates matching the glob
+pattern \"foo*bar*\".")
     (partial-completion
      completion-pcm-try-completion completion-pcm-all-completions
      "Completion of multiple words, each one taken as a prefix.
-E.g. M-x l-c-h can complete to list-command-history
-and C-x C-f /u/m/s to /usr/monnier/src.")
+I.e. when completing \"l-co_h\" (where _ is the position of point),
+it will consider all completions candidates matching the glob
+pattern \"l*-co*h*\".
+Furthermore, for completions that are done step by step in subfields,
+the method is applied to all the preceding fields that do not yet match.
+E.g. C-x C-f /u/mo/s TAB could complete to /usr/monnier/src.
+Additionally the user can use the char \"*\" as a glob pattern.")
     (substring
      completion-substring-try-completion completion-substring-all-completions
-     "Completion of the string taken as a substring.")
+     "Completion of the string taken as a substring.
+I.e. when completing \"foo_bar\" (where _ is the position of point),
+it will consider all completions candidates matching the glob
+pattern \"*foo*bar*\".")
     (initials
      completion-initials-try-completion completion-initials-all-completions
      "Completion of acronyms and initialisms.
@@ -410,7 +427,19 @@ ALL-COMPLETIONS is the function that lists the completions (it should
 follow the calling convention of `completion-all-completions'),
 and DOC describes the way this style of completion works.")
 
-(defcustom completion-styles '(basic partial-completion emacs22)
+(defcustom completion-styles
+  ;; First, use `basic' because prefix completion has been the standard
+  ;; for "ever" and works well in most cases, so using it first
+  ;; ensures that we obey previous behavior in most cases.
+  '(basic
+    ;; Then use `partial-completion' because it has proven to
+    ;; be a very convenient extension.
+    partial-completion
+    ;; Finally use `emacs22' so as to maintain (in many/most cases)
+    ;; the previous behavior that when completing "foobar" with point
+    ;; between "foo" and "bar" the completion try to complete "foo"
+    ;; and simply add "bar" to the end of the result.
+    emacs22)
   "List of completion styles to use.
 The available styles are listed in `completion-styles-alist'."
   :type `(repeat (choice ,@(mapcar (lambda (x) (list 'const (car x)))
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index 6ba9fac608d..3784ba787c4 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -403,6 +403,28 @@ program\\|subroutine\\)\\>[ \t]*\\(\\sw+\\)?"
            '("^ *\\([0-9]+\\)" . font-lock-constant-face)))
   "Medium level highlighting for Fortran mode.")
 
+;; See bug#1385. Never really looked into _why_ this matters...
+(defun fortran-match-and-skip-declaration (limit)
+  "Like `font-lock-match-c-style-declaration-item-and-skip-to-next'.
+The only difference is, it returns t in a case when the default returns nil."
+  (when (looking-at "[ \n\t*]*\\(\\sw+\\)[ \t\n]*\\(((?\\)?")
+    (when (and (match-end 2) (> (- (match-end 2) (match-beginning 2)) 1))
+      (let ((pos (point)))
+        (skip-chars-backward " \t\n")
+        (skip-syntax-backward "w")
+        (unless (looking-at "\\(\\sw+\\)[ \t\n]*\\sw+[ \t\n]*\\(((?\\)?")
+          (goto-char pos)
+          (looking-at "[ \n\t*]*\\(\\sw+\\)[ \t\n]*\\(((?\\)?"))))
+    (save-match-data
+      (condition-case nil
+          (save-restriction
+            (narrow-to-region (point-min) limit)
+            (goto-char (match-end 1))
+            (while (not (looking-at "[ \t\n]*\\(\\(,\\)\\|;\\|\\'\\)"))
+              (goto-char (or (scan-sexps (point) 1) (point-max))))
+            (goto-char (match-end 2)))
+        (error t)))))
+
 (defvar fortran-font-lock-keywords-3
   (append
    fortran-font-lock-keywords-1
@@ -412,7 +434,7 @@ program\\|subroutine\\)\\>[ \t]*\\(\\sw+\\)?"
           ;; Type specifier.
           '(1 font-lock-type-face)
           ;; Declaration item (or just /.../ block name).
-          `(font-lock-match-c-style-declaration-item-and-skip-to-next
+          `(fortran-match-and-skip-declaration
             ;; Start after any *(...) expression.
             (condition-case nil
                 (and (match-beginning ,(1+ (regexp-opt-depth
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index b13a75e3844..de94620c737 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -513,8 +513,8 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
                        grep-find-template grep-find-use-xargs
                        grep-highlight-matches))
       (set setting
-           (or (cadr (assq setting host-defaults))
-               (cadr (assq setting defaults)))))
+           (cadr (or (assq setting host-defaults)
+                     (assq setting defaults)))))
 
     (unless (or (not grep-use-null-device) (eq grep-use-null-device t))
       (setq grep-use-null-device
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 38698af7885..5fc92a92d37 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1060,7 +1060,7 @@ subshell is initiated, `tex-shell-hook' is run."
                 "\\>\\|\\\\[a-z]*" (regexp-opt '("space" "skip" "page") t)
                 "\\>\\)"))
   (setq paragraph-separate
-        (concat "[\f]\\|[ \t]*\\($\\|"
+        (concat "[\f%]\\|[ \t]*\\($\\|"
                 "\\\\[][]\\|"
                 "\\\\" (regexp-opt (append
                                     (mapcar 'car latex-section-alist)
diff --git a/lisp/tmm.el b/lisp/tmm.el
index e453dbde84b..0cbc72673a4 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -262,9 +262,6 @@ Its value should be an event that has a binding in MENU."
            (condition-case nil
                (require 'mouse)
              (error nil))
-           (condition-case nil
-               (x-popup-menu nil choice) ; Get the shortcuts
-             (error nil))
            (tmm-prompt choice))
           ;; We just handled a menu keymap and found a command.
           (choice
@@ -445,7 +442,7 @@ element of keymap, an `x-popup-menu' argument, or an element of
 `x-popup-menu' argument (when IN-X-MENU is not-nil).
 This function adds the element only if it is not already present.
 It uses the free variable `tmm-table-undef' to keep undefined keys."
-  (let (km str cache plist filter visible enable (event (car elt)))
+  (let (km str plist filter visible enable (event (car elt)))
     (setq elt (cdr elt))
     (if (eq elt 'undefined)
         (setq tmm-table-undef (cons (cons event nil) tmm-table-undef))
@@ -468,11 +465,7 @@ It uses the free variable `tmm-table-undef' to keep undefined keys."
                  (and (symbolp (cdr-safe (cdr-safe elt)))
                                (fboundp (cdr-safe (cdr-safe elt)))))
                (setq km (cddr elt))
-               (and (stringp (car elt)) (setq str (car elt)))
-               (and str
-                    (stringp (cdr-safe (cadr elt))) ; keyseq cache
-                    (setq cache (cdr (cadr elt)))
-                    cache (setq str (concat str cache))))
+               (and (stringp (car elt)) (setq str (car elt))))
 
               ((eq (car-safe elt) 'menu-item)
                ;; (menu-item TITLE COMMAND KEY ...)
@@ -489,13 +482,7 @@ It uses the free variable `tmm-table-undef' to keep undefined keys."
                    (setq km (and (eval visible) km)))
                (setq enable (plist-get plist :enable))
                (if enable
-                   (setq km (if (eval enable) km 'ignore)))
-               (and str
-                    (consp (nth 3 elt))
-                    (stringp (cdr (nth 3 elt))) ; keyseq cache
-                    (setq cache (cdr (nth 3 elt)))
-                    cache
-                    (setq str (concat str cache))))
+                   (setq km (if (eval enable) km 'ignore))))
 
               ((if (listp (cdr-safe (cdr-safe (cdr-safe elt))))
                    (or (keymapp (cdr-safe (cdr-safe (cdr-safe elt))))
@@ -504,16 +491,25 @@ It uses the free variable `tmm-table-undef' to keep undefined keys."
                       (fboundp (cdr-safe (cdr-safe (cdr-safe elt))))))
                                          ; New style of easy-menu
                (setq km (cdr (cddr elt)))
-               (and (stringp (car elt)) (setq str (car elt)))
-               (and str
-                    (stringp (cdr-safe (car (cddr elt)))) ; keyseq cache
-                    (setq cache (cdr (car (cdr (cdr elt)))))
-                    cache (setq str (concat str cache))))
+               (and (stringp (car elt)) (setq str (car elt))))
 
               ((stringp event)          ; x-popup or x-popup element
                (if (or in-x-menu (stringp (car-safe elt)))
                    (setq str event event nil km elt)
-                 (setq str event event nil km (cons 'keymap elt))))))
+                 (setq str event event nil km (cons 'keymap elt)))))
+        (unless (eq km 'ignore)
+          (let ((binding (where-is-internal km nil t)))
+            (when binding
+              (setq binding (key-description binding))
+              ;; Try to align the keybindings.
+              (let ((colwidth (min 30 (- (/ (window-width) 2) 10))))
+                (setq str
+                      (concat str
+                              (make-string (max 2 (- colwidth
+                                                     (string-width str)
+                                                     (string-width binding)))
+                                           ?\s)
+                              binding)))))))
       (and km (stringp km) (setq str km))
       ;; Verify that the command is enabled;
       ;; if not, don't mention it.
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index 2c576623120..64935f16dbd 100644
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -899,10 +899,10 @@ stream.  Standard error output is discarded."
 (defun vc-bzr-shelve-show (name)
   "Show the contents of shelve NAME."
   (interactive "sShelve name: ")
-  (vc-setup-buffer "*vc-bzr-shelve*")
+  (vc-setup-buffer "*vc-diff*")
   ;; FIXME: how can you show the contents of a shelf?
-  (vc-bzr-command "unshelve" "*vc-bzr-shelve*" 'async nil "--preview" name)
-  (set-buffer "*vc-bzr-shelve*")
+  (vc-bzr-command "unshelve" "*vc-diff*" 'async nil "--preview" name)
+  (set-buffer "*vc-diff*")
   (diff-mode)
   (setq buffer-read-only t)
   (pop-to-buffer (current-buffer)))
@@ -910,13 +910,13 @@ stream.  Standard error output is discarded."
 (defun vc-bzr-shelve-apply (name)
   "Apply shelve NAME and remove it afterwards."
   (interactive "sApply (and remove) shelf: ")
-  (vc-bzr-command "unshelve" "*vc-bzr-shelve*" 0 nil "--apply" name)
+  (vc-bzr-command "unshelve" nil 0 nil "--apply" name)
   (vc-resynch-buffer (vc-bzr-root default-directory) t t))
 
 (defun vc-bzr-shelve-apply-and-keep (name)
   "Apply shelve NAME and keep it afterwards."
   (interactive "sApply (and keep) shelf: ")
-  (vc-bzr-command "unshelve" "*vc-bzr-shelve*" 0 nil "--apply" "--keep" name)
+  (vc-bzr-command "unshelve" nil 0 nil "--apply" "--keep" name)
   (vc-resynch-buffer (vc-bzr-root default-directory) t t))
 
 (defun vc-bzr-shelve-snapshot ()
@@ -927,7 +927,7 @@ stream.  Standard error output is discarded."
                     (concat
                      (format-time-string "Snapshot on %Y-%m-%d" ct)
                      (format-time-string " at %H:%M" ct))))
-  (vc-bzr-command "unshelve" "*vc-bzr-shelve*" 0 nil "--apply" "--keep")
+  (vc-bzr-command "unshelve" nil 0 nil "--apply" "--keep")
   (vc-resynch-buffer (vc-bzr-root default-directory) t t))
 
 (defun vc-bzr-shelve-list ()
diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index 6010aa20b35..14cdb4a1e38 100644
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -420,6 +420,7 @@ or an empty string if none."
      (vc-git-command (current-buffer) 'async files
                      "ls-files" "-z" "-o" "-i" "--directory"
                      "--no-empty-directory" "--exclude-standard" "--"))
+    ;; --relative added in Git 1.5.5.
     (diff-index
      (vc-git-command (current-buffer) 'async files
                      "diff-index" "--relative" "-z" "-M" "HEAD" "--")))
@@ -578,7 +579,9 @@ or an empty string if none."
 ;;; HISTORY FUNCTIONS
 
 (defun vc-git-print-log (files buffer &optional shortlog start-revision limit)
-  "Get change log associated with FILES."
+  "Get change log associated with FILES.
+Note that using SHORTLOG requires at least Git version 1.5.6,
+for the --graph option."
   (let ((coding-system-for-read git-commits-coding-system))
     ;; `vc-do-command' creates the buffer, but we need it before running
     ;; the command.
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index fae9a15fed2..e67342d707a 100644
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -196,16 +196,16 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
   (let*
       ((status nil)
        (default-directory (file-name-directory file))
+       ;; Avoid localization of messages so we can parse the output.
+       (avoid-local-env (append (list "TERM=dumb" "LANGUAGE=C" "HGRC=")
+                                     process-environment))
        (out
         (with-output-to-string
           (with-current-buffer
               standard-output
             (setq status
                   (condition-case nil
-                      (let ((process-environment
-                             ;; Avoid localization of messages so we can parse the output.
-                             (append (list "TERM=dumb" "LANGUAGE=C" "HGRC=")
-                                     process-environment)))
+                      (let ((process-environment avoid-local-env))
                         ;; Ignore all errors.
                         (process-file
                          "hg" nil t nil
@@ -213,7 +213,23 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
                     ;; Some problem happened.  E.g. We can't find an `hg'
                     ;; executable.
                     (error nil)))))))
-    (when (eq 0 status) out)))
+    (if (eq 0 status)
+        out
+      ;; Check if the file is in the 'added state, the above hg
+      ;; command does not distinguish between 'added and 'unregistered.
+      (setq status
+            (condition-case nil
+                (let ((process-environment avoid-local-env))
+                  (process-file
+                   "hg" nil nil nil
+                   ;; We use "log" here, if there's a faster command
+                   ;; that returns true for an 'added file and false
+                   ;; for an 'unregistered one, we could use that.
+                   "log" "-l1" (file-relative-name file)))
+              ;; Some problem happened.  E.g. We can't find an `hg'
+              ;; executable.
+              (error nil)))
+      (when (eq 0 status) "0"))))
 
 ;;; History functions
 
@@ -356,7 +372,8 @@ Optional arg REVISION is a revision to annotate from."
       (if (match-beginning 3)
           (match-string-no-properties 1)
         (cons (match-string-no-properties 1)
-              (expand-file-name (match-string-no-properties 4)))))))
+              (expand-file-name (match-string-no-properties 4)
+                                (vc-hg-root default-directory)))))))
 
 (defun vc-hg-previous-revision (file rev)
   (let ((newrev (1- (string-to-number rev))))