aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2012-08-08 00:19:58 -0700
committerGlenn Morris2012-08-08 00:19:58 -0700
commit32ac3a6ba32f947a8d6b81ef7609dc69fd6a5d48 (patch)
tree2f32b62631df39fe1aa672889881865c436e9701 /src
parent77c7bcb1157b405bde1227b20ef5f7ce9a90e689 (diff)
downloademacs-32ac3a6ba32f947a8d6b81ef7609dc69fd6a5d48.tar.gz
emacs-32ac3a6ba32f947a8d6b81ef7609dc69fd6a5d48.zip
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/ChangeLog4
-rw-r--r--src/lisp.mk1
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 @@
12012-08-08 Glenn Morris <rgm@gnu.org>
2
3 * lisp.mk (lisp): Remove language/persian.elc.
4
12012-08-08 Dmitry Antipov <dmantipov@yandex.ru> 52012-08-08 Dmitry Antipov <dmantipov@yandex.ru>
2 6
3 Cleanup intervals. 7 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 = \
95 $(lispsource)/language/japanese.elc \ 95 $(lispsource)/language/japanese.elc \
96 $(lispsource)/language/korean.elc \ 96 $(lispsource)/language/korean.elc \
97 $(lispsource)/language/lao.elc \ 97 $(lispsource)/language/lao.elc \
98 $(lispsource)/language/persian.elc \
99 $(lispsource)/language/tai-viet.elc \ 98 $(lispsource)/language/tai-viet.elc \
100 $(lispsource)/language/thai.elc \ 99 $(lispsource)/language/thai.elc \
101 $(lispsource)/language/tibetan.elc \ 100 $(lispsource)/language/tibetan.elc \