summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-10-30 18:52:38 -0400
committerGlenn Morris <rgm@gnu.org>2014-10-30 18:52:38 -0400
commitb77b92545557087ca7fe75c4bf79885354c58be4 (patch)
tree9fb6c97a73e2ba617690d772e2d936f1feb3d5f4
parentb6a7474272ce7de5cf0e5e444a0d9221d0493ab6 (diff)
downloademacs-b77b92545557087ca7fe75c4bf79885354c58be4.tar.gz
* lisp/startup.el (command-line): Remove pointless attempt to avoid statting fs
; which expand-file-name doesn't even do.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/startup.el5
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 91f61aa448b..e56829783f4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-30 Glenn Morris <rgm@gnu.org>
+
+ * startup.el (command-line): Remove pointless attempt to avoid
+ statting the file-system (which expand-file-name doesn't do).
+
2014-10-30 Alan Mackenzie <acm@muc.de>
Add "enum classs" support to C++ mode.
diff --git a/lisp/startup.el b/lisp/startup.el
index 88611a0cd8f..fcbd06da0d0 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1286,11 +1286,6 @@ the `--debug-init' option to view a complete error backtrace."
(let (warned)
(dolist (dir load-path)
(and (not warned)
- (string-match-p
- (format "/%s/?\\'"
- (regexp-quote
- (file-name-nondirectory
- (directory-file-name user-emacs-directory)))) dir)
(string-equal (file-name-as-directory (expand-file-name dir))
(expand-file-name user-emacs-directory))
(setq warned t)