mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-05 19:31:02 -08:00
Merge changes from emacs-23 branch
This commit is contained in:
commit
07976ae3b8
46 changed files with 1227 additions and 523 deletions
|
|
@ -6680,8 +6680,9 @@
|
|||
buffer if the parent buffer is in vc-dired-mode.
|
||||
|
||||
2007-11-23 Mark A. Hershberger <mah@everybody.org>
|
||||
James Clark <none@example.com>
|
||||
|
||||
* nxml: Initial merge of nxml. Kept nxml/char-name subdir for now.
|
||||
* nxml/: Initial merge of nxml. Kept nxml/char-name subdir for now.
|
||||
|
||||
2007-11-23 Juri Linkov <juri@jurta.org>
|
||||
|
||||
|
|
@ -16693,10 +16694,9 @@ See ChangeLog.12 for earlier changes.
|
|||
|
||||
;; Local Variables:
|
||||
;; coding: utf-8
|
||||
;; add-log-time-zone-rule: t
|
||||
;; End:
|
||||
|
||||
Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
||||
Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Emacs.
|
||||
|
||||
|
|
@ -16712,5 +16712,3 @@ See ChangeLog.12 for earlier changes.
|
|||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
;; arch-tag: 1e8aa93a-fc6c-4ac3-9b10-1f445e1840af
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue