diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2013-05-31 22:16:33 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2013-05-31 22:16:33 +0200 |
| commit | cf4be58ed088a58f6f5c553f53e542f8c28b557f (patch) | |
| tree | 8896a44bc66c3e3e591a89ed37c30a32937efa4c | |
| parent | 0018c7fae33d283961b6baf20657beaff8218420 (diff) | |
| parent | 79fd43329e15432bab4f9f8856af385ac2ac0417 (diff) | |
Merge remote-tracking branch 'origin/master' into obsd
| -rw-r--r-- | cpprules.in | 1 | ||||
| -rw-r--r-- | xinitrc.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/cpprules.in b/cpprules.in index 92a987d..eaea428 100644 --- a/cpprules.in +++ b/cpprules.in @@ -10,7 +10,6 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ -e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \ -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \ -e '/^[ ]*XHASH/s/XHASH/\#/' \ - -e '/XSLASHGLOB/s/XSLASHGLOB/\/\*/' \ -e '/\@\@$$/s/\@\@$$/\\/' SUFFIXES = .cpp diff --git a/xinitrc.cpp b/xinitrc.cpp index e926b19..5b4076c 100644 --- a/xinitrc.cpp +++ b/xinitrc.cpp @@ -52,7 +52,7 @@ fi XCOMM start some nice programs if [ -d XINITDIR/xinitrc.d ] ; then - for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do + for f in XINITDIR/xinitrc.d/?*.sh ; do [ -x "$f" ] && . "$f" done unset f |