auto upstream

4 files changed, 39 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 538206ae9d0..f87bdddacda 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2013-02-06  Nicolas Richard <theonewiththeevillook@yahoo.fr>  (tiny change)
+
+        * emacs-lisp/package.el (describe-package-1): Tell what archive is
+        used to install the package.
+
+2013-02-06  Glenn Morris  <rgm@gnu.org>
+
+        * vc/vc-hooks.el (vc-find-file-hook): Don't ask about following links
+        if we can't get user input.  (Bug#6567)
+
+        * startup.el (command-line): If simple.el is missing,
+        test and warn about for some possible causes.
+
 2013-02-05  Jan Djärv  <jan.h.d@swipnet.se>
 
         * cus-start.el (all): Add ns-use-native-fullscreen.
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 6059f03f999..dd828691158 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1182,7 +1182,7 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
   (require 'lisp-mnt)
   (let ((package-name (symbol-name package))
         (built-in (assq package package--builtins))
-        desc pkg-dir reqs version installable)
+        desc pkg-dir reqs version installable archive)
     (prin1 package)
     (princ " is ")
     (cond
@@ -1196,6 +1196,7 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
      ;; Available packages are in `package-archive-contents'.
      ((setq desc (cdr (assq package package-archive-contents)))
       (setq version (package-version-join (package-desc-vers desc))
+            archive (aref desc (- (length desc) 1))
             installable t)
       (if built-in
           (insert "a built-in package.\n\n")
@@ -1224,8 +1225,10 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
           (installable
            (if built-in
                (insert (propertize "Built-in." 'font-lock-face 'font-lock-builtin-face)
-                       "  Alternate version available -- ")
-             (insert "Available -- "))
+                       "  Alternate version available")
+             (insert "Available"))
+           (insert " from " archive)
+           (insert " -- ")
            (let ((button-text (if (display-graphic-p) "Install" "[Install]"))
                  (button-face (if (display-graphic-p)
                                   '(:box (:line-width 2 :color "dark grey")
diff --git a/lisp/startup.el b/lisp/startup.el
index 5406c0f6513..741c5aa9b46 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -770,11 +770,20 @@ Amongst another things, it parses the command-line arguments."
          (locate-file "simple" load-path (get-load-suffixes)))
         lisp-dir)
     ;; Don't abort if simple.el cannot be found, but print a warning.
+    ;; Although in most usage we are going to cryptically abort a moment
+    ;; later anyway, due to missing required bidi data files (eg bug#13430).
     (if (null simple-file-name)
-        (progn
-          (princ "Warning: Could not find simple.el nor simple.elc"
-                 'external-debugging-output)
-          (terpri 'external-debugging-output))
+        (let ((standard-output 'external-debugging-output)
+              (lispdir (expand-file-name "../lisp" data-directory)))
+          (princ "Warning: Could not find simple.el or simple.elc")
+          (terpri)
+          (when (getenv "EMACSLOADPATH")
+            (princ "The EMACSLOADPATH environment variable is set, \
+please check its value")
+            (terpri))
+          (unless (file-readable-p lispdir)
+            (princ (format "Lisp directory %s not readable?" lispdir))
+            (terpri)))
       (setq lisp-dir (file-truename (file-name-directory simple-file-name)))
       (setq load-history
             (mapcar (lambda (elt)
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 541b0c04b0b..818b37b3c34 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -866,6 +866,13 @@ current, and kill the buffer that visits the link."
                  (message
                   "Warning: symbolic link to %s-controlled source file" link-type))
                 ((or (not (eq vc-follow-symlinks 'ask))
+                     ;; Assume we cannot ask, default to yes.
+                     noninteractive
+                     ;; Copied from server-start.  Seems like there should
+                     ;; be a better way to ask "can we get user input?"...
+                     (and (daemonp)
+                          (null (cdr (frame-list)))
+                          (eq (selected-frame) terminal-frame))
                      ;; If we already visited this file by following
                      ;; the link, don't ask again if we try to visit
                      ;; it again.  GUD does that, and repeated questions