Merge branch 'master' into bb_travis

emacs-w3m · Feb 19, 2019 · 1bfc1d9 · 1bfc1d9
2 parents f46b24a + 7fa00f9
commit 1bfc1d9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -91,8 +91,7 @@ script:
 #   slack:
 #     secure: KI95ZGXKWu2Bj2ee7xPovGQicL3opDLRwmkJszcW/6VjMbaSBKTM0KUOI97q0UgLbYCAJYa3/Upszbh64D+EOrIseynxmsD3ZC9VKB9YElyVoOr7wre+Kmh0F979pHNS/xqj5qabX8P+wA0zttW0zpSrT6yayntVHSS5Q7VOAzmTwr5MvEBv8SMQgI3LTwiXiRkrPs3bvjUom2NJAAG4Ir6OgzjSI0D0F9NfkWVDeckoX2YQzS/vW5GTbTedEQxXGpxWivWOkqwwW7XNSJY4rPQ6l66Jx+iT7wgNYX0RgWJTG63AbGEGSXX7urOROdzDm/9P7vh8n707wK0Fbf0hVc3zZGJG0HfpllvkiPbA9CTKSgsTbWpXlzkx8HFoAc7TC/j9jvdTYO0KktojCdADtne0A3Ms18nFxdHrn1bFowIWBSvdwlvVx0IWEy69bl8yui8Ecs/a60LL48BEm9lUxvQzn2NB4ku/oQsTQOfWTbnZPUzqC74N20i/80w7xS/LjsDx2fBMPGoedZ2Si+CW4ODTZ0S6C9b3sTiuDsDRiatfac01b/VGXL/oRVrSgiVhcsYqlb7TBd2u87HqbZ8BbAB4K6e2weUVnJD/+PdsFUgBQ4q/bcFvil9L7BK2x96LitdkYvxCjWuI8AYeMSsmGMGTFP9B3JhY4doC0gxmufg=
 
-
 branches:
   only:
-#  - master
-   - bb_travis
+   - master
+
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2019-02-19  Boruch Baum  <boruch_baum@gmx.com>
+
+  * .travis.yaml: Add support for multiple emacs versions
+  and multiple operating systems.
+
+  * READMME.md: Add the file as a stub, with example "badge"
+  picture for travis building and GPL licensing.
+
 2019-02-19  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	Add some tweaks to Boruch Baum's changes

diff --git a/w3m-dtree.el b/w3m-dtree.el
@@ -127,7 +127,9 @@ over the 'w3m-dtree-directory-depth'."
 	  (/= (nth 1 (file-attributes ,path)) 2))))
 
 (defun w3m-dtree-create-sub (path allfiles dirprefix fileprefix indent depth)
-  (let* ((files (directory-files path t))
+  (let* ((files (condition-case err
+                  (directory-files path t)
+                  (error (list "----"))))
 	 (limit (and (integerp w3m-dtree-directory-depth)
 		     (>= depth w3m-dtree-directory-depth)))
 	 (indent-sub1 (if limit