aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-02-05 21:03:35 -0500
committerGlenn Morris2013-02-05 21:03:35 -0500
commite86762ec4135da4018a76d173b91e411b5a30dbb (patch)
tree27bb99916451f9ba90e8a5c4997fdf706c6514d3
parentbc090916ed5323f7e234439066cac85abb43b6ab (diff)
downloademacs-e86762ec4135da4018a76d173b91e411b5a30dbb.tar.gz
emacs-e86762ec4135da4018a76d173b91e411b5a30dbb.zip
* lisp/startup.el (command-line): If simple.el is missing,
test and warn about for some possible causes.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/startup.el17
2 files changed, 18 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 538206ae9d0..0be77ed6737 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-02-06 Glenn Morris <rgm@gnu.org>
2
3 * startup.el (command-line): If simple.el is missing,
4 test and warn about for some possible causes.
5
12013-02-05 Jan Djärv <jan.h.d@swipnet.se> 62013-02-05 Jan Djärv <jan.h.d@swipnet.se>
2 7
3 * cus-start.el (all): Add ns-use-native-fullscreen. 8 * cus-start.el (all): Add ns-use-native-fullscreen.
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."
770 (locate-file "simple" load-path (get-load-suffixes))) 770 (locate-file "simple" load-path (get-load-suffixes)))
771 lisp-dir) 771 lisp-dir)
772 ;; Don't abort if simple.el cannot be found, but print a warning. 772 ;; Don't abort if simple.el cannot be found, but print a warning.
773 ;; Although in most usage we are going to cryptically abort a moment
774 ;; later anyway, due to missing required bidi data files (eg bug#13430).
773 (if (null simple-file-name) 775 (if (null simple-file-name)
774 (progn 776 (let ((standard-output 'external-debugging-output)
775 (princ "Warning: Could not find simple.el nor simple.elc" 777 (lispdir (expand-file-name "../lisp" data-directory)))
776 'external-debugging-output) 778 (princ "Warning: Could not find simple.el or simple.elc")
777 (terpri 'external-debugging-output)) 779 (terpri)
780 (when (getenv "EMACSLOADPATH")
781 (princ "The EMACSLOADPATH environment variable is set, \
782please check its value")
783 (terpri))
784 (unless (file-readable-p lispdir)
785 (princ (format "Lisp directory %s not readable?" lispdir))
786 (terpri)))
778 (setq lisp-dir (file-truename (file-name-directory simple-file-name))) 787 (setq lisp-dir (file-truename (file-name-directory simple-file-name)))
779 (setq load-history 788 (setq load-history
780 (mapcar (lambda (elt) 789 (mapcar (lambda (elt)