[Emacs-diffs] /srv/bzr/emacs/trunk r111682: * lisp/startup.el (command-line): If simple.el is missing,

[Glenn Morris]

------------------------------------------------------------
revno: 111682
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-02-05 21:03:35 -0500
message:
  * lisp/startup.el (command-line): If simple.el is missing,
  test and warn about for some possible causes.
modified:
  lisp/ChangeLog
  lisp/startup.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-05 12:16:35 +0000
+++ b/lisp/ChangeLog    2013-02-06 02:03:35 +0000
@@ -1,3 +1,8 @@
+2013-02-06  Glenn Morris  <address@hidden>
+
+       * startup.el (command-line): If simple.el is missing,
+       test and warn about for some possible causes.
+
 2013-02-05  Jan Djärv  <address@hidden>
 
        * cus-start.el (all): Add ns-use-native-fullscreen.

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2013-01-02 16:13:04 +0000
+++ b/lisp/startup.el   2013-02-06 02:03:35 +0000
@@ -770,11 +770,20 @@
         (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)