diff options
| author | Glenn Morris | 2013-11-06 00:09:15 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-11-06 00:09:15 -0800 |
| commit | 0a8b75e296b0f5ce30df18c662917fd16d64081d (patch) | |
| tree | e23395b74bf35482a3cac8bcc62726a76b92cebb | |
| parent | c76489d611ad7340a2e57f3312820494d5c7ddbb (diff) | |
| download | emacs-0a8b75e296b0f5ce30df18c662917fd16d64081d.tar.gz emacs-0a8b75e296b0f5ce30df18c662917fd16d64081d.zip | |
* lisp/Makefile.in (setwins, setwins_almost, setwins_for_subdirs): Simplify.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/Makefile.in | 15 |
2 files changed, 10 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 49dc1685063..3b475990d30 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-11-06 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (setwins, setwins_almost, setwins_for_subdirs): Simplify. | ||
| 4 | |||
| 1 | 2013-11-06 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2013-11-06 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * electric.el (electric-indent-just-newline): New command. | 7 | * electric.el (electric-indent-just-newline): New command. |
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 9733495403c..0c23264b06d 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in | |||
| @@ -109,25 +109,22 @@ COMPILE_FIRST = \ | |||
| 109 | emacs = unset EMACSLOADPATH; "$(EMACS)" $(EMACSOPT) | 109 | emacs = unset EMACSLOADPATH; "$(EMACS)" $(EMACSOPT) |
| 110 | 110 | ||
| 111 | # Common command to find subdirectories | 111 | # Common command to find subdirectories |
| 112 | setwins=subdirs=`find . -type d -print`; \ | 112 | setwins=for file in `find . -type d -print`; do \ |
| 113 | for file in $$subdirs; do \ | 113 | case $$file in */.* ) ;; \ |
| 114 | case $$file in */.* | */.*/* | */=* ) ;; \ | ||
| 115 | *) wins="$$wins$${wins:+ }$$file" ;; \ | 114 | *) wins="$$wins$${wins:+ }$$file" ;; \ |
| 116 | esac; \ | 115 | esac; \ |
| 117 | done | 116 | done |
| 118 | 117 | ||
| 119 | # Find all subdirectories except `obsolete' and `term'. | 118 | # Find all subdirectories except `obsolete' and `term'. |
| 120 | setwins_almost=subdirs=`find . -type d -print`; \ | 119 | setwins_almost=for file in `find . -type d -print`; do \ |
| 121 | for file in $$subdirs; do \ | 120 | case $$file in */.* | */obsolete | */term ) ;; \ |
| 122 | case $$file in */.* | */.*/* | */=* | */obsolete | */term ) ;; \ | ||
| 123 | *) wins="$$wins$${wins:+ }$$file" ;; \ | 121 | *) wins="$$wins$${wins:+ }$$file" ;; \ |
| 124 | esac; \ | 122 | esac; \ |
| 125 | done | 123 | done |
| 126 | 124 | ||
| 127 | # Find all subdirectories in which we might want to create subdirs.el | 125 | # Find all subdirectories in which we might want to create subdirs.el |
| 128 | setwins_for_subdirs=subdirs=`find . -type d -print`; \ | 126 | setwins_for_subdirs=for file in `find . -type d -print`; do \ |
| 129 | for file in $$subdirs; do \ | 127 | case $$file in */.* | */cedet* ) ;; \ |
| 130 | case $$file in */.* | */.*/* | */=* | */cedet* ) ;; \ | ||
| 131 | *) wins="$$wins$${wins:+ }$$file" ;; \ | 128 | *) wins="$$wins$${wins:+ }$$file" ;; \ |
| 132 | esac; \ | 129 | esac; \ |
| 133 | done | 130 | done |