auto upstream

5 files changed, 27 insertions, 11 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b71cc72baf2..4dc694e486c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,21 @@
+2012-12-01  Kirk Kelsey  <kirk.kelsey@0x4b.net>
+
+        * vc/vc-hg.el (vc-hg-next-revision):
+        Ensure use of default "tip" output format.  (Bug#6968)
+
+2012-12-01  Kim F. Storm  <storm@cua.dk>
+
+        * startup.el (fancy-startup-tail): Add a clickable link
+        (Bug#2176).
+
 2012-12-01  Chong Yidong  <cyd@gnu.org>
 
         * startup.el (fancy-startup-tail): Improve the message about
         auto-save files (Bug#2176).
 
+        * files.el (recover-session): Improve the descriptive message, and
+        use substitute-command-keys.
+
 2012-12-01  Glenn Morris  <rgm@gnu.org>
 
         * ido.el (ido-file-internal):
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 83657a98bfd..b97cd80cdba 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -7979,7 +7979,7 @@
         Remember the buffers at head, rather than their name.
         * iswitchb.el (iswitchb-kill-buffer): Re-make the list.
 
-2010-08-22  Kirk Kelsey  <kirk.kelsey@0x4b.net>  (tiny change)
+2010-08-22  Kirk Kelsey  <kirk.kelsey@0x4b.net>
             Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * progmodes/make-mode.el (makefile-fill-paragraph): Account for the
diff --git a/lisp/files.el b/lisp/files.el
index e03b02193a4..1bb140c0562 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5417,18 +5417,20 @@ Then you'll be asked about a number of files to recover."
   (let ((ls-lisp-support-shell-wildcards t))
     (dired (concat auto-save-list-file-prefix "*")
            (concat dired-listing-switches " -t")))
+  (use-local-map (nconc (make-sparse-keymap) (current-local-map)))
+  (define-key (current-local-map) "\C-c\C-c" 'recover-session-finish)
   (save-excursion
     (goto-char (point-min))
     (or (looking-at " Move to the session you want to recover,")
         (let ((inhibit-read-only t))
           ;; Each line starts with a space
           ;; so that Font Lock mode won't highlight the first character.
-          (insert " Move to the session you want to recover,\n"
-                  " then type C-c C-c to select it.\n\n"
-                  " You can also delete some of these files;\n"
-                  " type d on a line to mark that file for deletion.\n\n"))))
-  (use-local-map (nconc (make-sparse-keymap) (current-local-map)))
-  (define-key (current-local-map) "\C-c\C-c" 'recover-session-finish))
+          (insert " To recover a session, move to it and type C-c C-c.\n"
+                  (substitute-command-keys
+                   " To delete a session file, type \
+\\[dired-flag-file-deletion] on its line to flag
+ the file for deletion, then \\[dired-do-flagged-delete] to \
+delete flagged files.\n\n"))))))
 
 (defun recover-session-finish ()
   "Choose one saved session to recover auto-save files from.
diff --git a/lisp/startup.el b/lisp/startup.el
index 03181a79b15..ec6d45a294d 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1582,9 +1582,10 @@ a face or button specification."
                                     "\nAn auto-save file list was found.  "
                                   "\nAuto-save file lists were found.  ")
                                 "If an Emacs session crashed recently,\ntype "
-                                :face '(fixed-pitch font-lock-comment-face)
-                                "M-x recover-session RET"
-                                :face '(variable-pitch font-lock-comment-face)
+                                :link `("M-x recover-session RET"
+                                        ,(lambda (_button)
+                                           (call-interactively
+                                            'recover-session)))
                                 " to recover the files you were editing."))))
 
   (when concise
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 727fb08e388..50678fad075 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -384,7 +384,7 @@ Optional arg REVISION is a revision to annotate from."
   (let ((newrev (1+ (string-to-number rev)))
         (tip-revision
          (with-temp-buffer
-           (vc-hg-command t 0 nil "tip")
+           (vc-hg-command t 0 nil "tip" "--style=default")
            (goto-char (point-min))
            (re-search-forward "^changeset:[ \t]*\\([0-9]+\\):")
            (string-to-number (match-string-no-properties 1)))))