Mercurial > emacs
annotate lispref/ChangeLog.multi-tty @ 83655:67f4cd925834
Fix 2007-08-21 merge conflicts.
author | Juri Linkov <juri@jurta.org> |
---|---|
date | Wed, 22 Aug 2007 23:45:47 +0000 |
parents | 70b38dec13a1 |
children | f9c0d7293a2c |
rev | line source |
---|---|
83640
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
1 2007-07-02 Dan Nicolaescu <dann@ics.uci.edu> |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
2 |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
3 * frames.texi (Basic Parameters): Add display-environment-variable |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
4 and term-environment-variable. |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
5 |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
6 ;; Local Variables: |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
7 ;; coding: iso-2022-7bit |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
8 ;; add-log-time-zone-rule: t |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
9 ;; End: |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
10 |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
11 Copyright (C) 2007 Free Software Foundation, Inc. |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
12 |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
13 This file is part of GNU Emacs. |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
14 |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
15 GNU Emacs is free software; you can redistribute it and/or modify |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
16 it under the terms of the GNU General Public License as published by |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
17 the Free Software Foundation; either version 2, or (at your option) |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
18 any later version. |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
19 |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
20 GNU Emacs is distributed in the hope that it will be useful, |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
21 but WITHOUT ANY WARRANTY; without even the implied warranty of |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
22 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
23 GNU General Public License for more details. |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
24 |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
25 You should have received a copy of the GNU General Public License |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
26 along with GNU Emacs; see the file COPYING. If not, write to the |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
27 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
28 Boston, MA 02110-1301, USA. |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
29 |
2aee92eacdab
* server.el (server-process-filter): Likewise.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
30 |
83643 | 31 ;; arch-tag: 95766b84-1e41-49e3-9841-4b8c2f9be2d7 |