diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-08-08 00:19:58 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-08-08 00:19:58 -0700 |
| commit | 32ac3a6ba32f947a8d6b81ef7609dc69fd6a5d48 (patch) | |
| tree | 2f32b62631df39fe1aa672889881865c436e9701 /src | |
| parent | 77c7bcb1157b405bde1227b20ef5f7ce9a90e689 (diff) | |
| download | emacs-32ac3a6ba32f947a8d6b81ef7609dc69fd6a5d48.tar.gz | |
Merge language/persian.el into language/misc-lang.el
* lisp/language/persian.el: Remove file.
* lisp/language/misc-lang.el: Move non-unique part of persian.el here.
* lisp/loadup.el: Remove language/persian.
* src/lisp.mk (lisp): Remove language/persian.elc.
* etc/NEWS: Improve entry.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/lisp.mk | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7919b6f8f8a..e68c6edc8d5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-08-08 Glenn Morris <rgm@gnu.org> + + * lisp.mk (lisp): Remove language/persian.elc. + 2012-08-08 Dmitry Antipov <dmantipov@yandex.ru> Cleanup intervals. diff --git a/src/lisp.mk b/src/lisp.mk index 70296e06368..162d8819917 100644 --- a/src/lisp.mk +++ b/src/lisp.mk @@ -95,7 +95,6 @@ lisp = \ $(lispsource)/language/japanese.elc \ $(lispsource)/language/korean.elc \ $(lispsource)/language/lao.elc \ - $(lispsource)/language/persian.elc \ $(lispsource)/language/tai-viet.elc \ $(lispsource)/language/thai.elc \ $(lispsource)/language/tibetan.elc \ |