Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-300

28 files changed, 80 insertions, 15 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 0cd4f718b1a..19011436d3b 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,38 @@
+2007-12-15  Eli Zaretskii  <eliz@gnu.org>
+
+        The following files renamed to avoid file-name clashes in
+        8+3 (a.k.a. DOS) namespace:
+
+        * schema/xhtml-basic-form.rnc: Renamed to xhtml-bform.rnc.
+        * schema/xhtml-basic-table.rnc: Renamed to xhtml-btable.rnc.
+        * schema/xhtml-list.rnc: Renamed to xhtml-lst.rnc.
+        * schema/xhtml-target.rnc: Renamed to xhtml-tgt.rnc.
+        * schema/xhtml-style.rnc: Renamed to xhtml-xstyle.rnc.
+        * schema/xhtml-form.rnc, schema/xhtml-table.rnc, schema/xhtml.rnc:
+        Updated accordingly.
+
+        * schema/docbook-dyntbl.rnc, schema/docbook-dyntbl.rnc: Renamed to
+        docbk-dyntbl.rnc and docbk-soextbl.rnc, respectively.
+
+        * images/icons/macemacs_16.png, images/icons/macemacs_24.png:
+        * images/icons/macemacs_32.png, images/icons/macemacs_48.png:
+        * images/icons/macemacs_256.png, images/icons/macemacs_512.png:
+        Renamed to emacs16_mac.png, emacs24_mac.png, emacs32_mac.png,
+        emacs48_mac.png, emacs256_mac.png, and emacs512_mac.png,
+        respectively.
+
+2007-12-08  Ulrich Mueller <ulm@gentoo.org>  (tiny change)
+
+        * emacs.desktop (Exec, Icon, Categories): Fix entries.
+
+2007-12-08  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * NEWS: Add minimal Gnus item.
+
+2007-12-08  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * emacs.desktop: New file.
+
 2007-11-30  Kentaro Ohkouchi  <nanasess@fsm.ne.jp>
 
         * images/icons/macemacs_16.png, images/icons/macemacs_24.png:
diff --git a/etc/NEWS b/etc/NEWS
index 5af239c8f4c..fb51744bab6 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -55,7 +55,7 @@ testing for the `multi-tty' feature.
 OS-X-style icons (an application icon and a relevant document icon)
 were contributed by Kentaro Ohkouchi.
 Source files for these icons can be found in Emacs.app/Contents/Resources.
-PNG versions are available as etc/images/icons/macemacs_*.png.
+PNG versions are available as etc/images/icons/emacs*_mac.png.
 
 ** Built-in functions (subr) can now have an interactive specification
 that is not a prompt string.  If the `intspec' parameter of a `DEFUN'
@@ -234,7 +234,12 @@ position of point in help window (for example in `view-lossage').
 ** view-remove-frame-by-deleting is now by default t
 since users found iconification of view-mode frames distracting.
 
-** isearch can now search through multiple ChangeLog files.
+** Isearch mode
+
+*** New command `isearch-occur' bound to `M-s o' in isearch mode
+runs `occur' with the current search string.
+
+*** isearch can now search through multiple ChangeLog files.
 When running isearch in a ChangeLog file, if the search fails,
 then another C-s tries searching the previous ChangeLog,
 if there is one (e.g. go from ChangeLog to ChangeLog.12).
@@ -347,6 +352,14 @@ rather than fortran-indent-comment.
 +++
 *** (The increasingly misnamed) F90 mode supports Fortran 2003 syntax.
 
+** Gnus package
+
+*** The Gnus package has been updated
+
+*** There are many news features, bug fixes and improvements.
+
+See the file GNUS-NEWS or the node "No Gnus" in the Gnus manual for details.
+
 ** Miscellaneous
 
 *** comint-mode uses `start-file-process' now (see Lisp Changes).
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index d7368ac6f38..ccabf7d4faf 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -88,6 +88,8 @@ that the desktop being saved is not an update of the one on disk.
 
 ** The new package vera-mode.el provides a major mode for editing Vera files.
 
+** The new package verilog-mode.el provides a major mode for editing Verilog files.
+
 ** The new package socks.el implements the SOCKS v5 protocol.
 
 ** VC
diff --git a/etc/TODO b/etc/TODO
index a1b8659dfa3..495c4dbc536 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -25,10 +25,6 @@ I.e. mouse-set-font should use customize-face.
 
 ** Compute the list of active keymaps *after* reading the first event.
 
-** mouse-autoselect-window should wait to select the window until
-the mouse is put to rest or after a delay or both, so that moving over
-a window doesn't select it.
-
 ** Distribute a bar cursor of width > 1 evenly between the two glyphs
    on each side of the bar (what to do at the edges?).
 
@@ -38,6 +34,8 @@ a window doesn't select it.
 ** buffer-offer-save should be a permanent local.
 
 ** revert-buffer should eliminate overlays and the mark.
+   For related problems consult the thread starting with
+   http://lists.gnu.org/archive/html/emacs-devel/2005-11/msg01346.html
 
 ** erase-buffer should perhaps disregard read-only properties of text.
 
@@ -570,7 +568,7 @@ but which can also be used as a modifier).
    a derived mode of sendmail.el.  Or arrange for messages.el to be split
    into a small core and "the rest" so that we use less resources as long as
    we stick to the features provided in sendmail.el.
- 
+
 ** Replace gmalloc.c with the modified Doug Lea code from the current
    GNU libc so that the special mmapping of buffers can be removed --
    that apparently loses under Solaris, at least. [fx has mostly done
diff --git a/etc/emacs.desktop b/etc/emacs.desktop
new file mode 100644
index 00000000000..4e2603b32c8
--- /dev/null
+++ b/etc/emacs.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Emacs
+GenericName=Text Editor
+Comment=Edit text
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Exec=emacs %F
+Icon=emacs_32
+Type=Application
+Terminal=false
+Categories=Development;TextEditor;
+StartupWMClass=Emacs
diff --git a/etc/images/icons/emacs16_mac.png b/etc/images/icons/emacs16_mac.png
new file mode 100644
index 00000000000..f1ad7558e49
--- /dev/null
+++ b/etc/images/icons/emacs16_mac.png
@@ -0,0 +1 @@
+‰PNG
diff --git a/etc/images/icons/emacs24_mac.png b/etc/images/icons/emacs24_mac.png
new file mode 100644
index 00000000000..f1ad7558e49
--- /dev/null
+++ b/etc/images/icons/emacs24_mac.png
@@ -0,0 +1 @@
+‰PNG
diff --git a/etc/images/icons/emacs256_mac.png b/etc/images/icons/emacs256_mac.png
new file mode 100644
index 00000000000..f1ad7558e49
--- /dev/null
+++ b/etc/images/icons/emacs256_mac.png
@@ -0,0 +1 @@
+‰PNG
diff --git a/etc/images/icons/emacs32_mac.png b/etc/images/icons/emacs32_mac.png
new file mode 100644
index 00000000000..f1ad7558e49
--- /dev/null
+++ b/etc/images/icons/emacs32_mac.png
@@ -0,0 +1 @@
+‰PNG
diff --git a/etc/images/icons/emacs48_mac.png b/etc/images/icons/emacs48_mac.png
new file mode 100644
index 00000000000..f1ad7558e49
--- /dev/null
+++ b/etc/images/icons/emacs48_mac.png
@@ -0,0 +1 @@
+‰PNG
diff --git a/etc/images/icons/emacs512_mac.png b/etc/images/icons/emacs512_mac.png
new file mode 100644
index 00000000000..f1ad7558e49
--- /dev/null
+++ b/etc/images/icons/emacs512_mac.png
@@ -0,0 +1 @@
+‰PNG
diff --git a/etc/images/icons/macemacs_16.png b/etc/images/icons/macemacs_16.png
deleted file mode 100644
index 0f112d87185..00000000000
--- a/etc/images/icons/macemacs_16.png
+++ /dev/null
diff --git a/etc/images/icons/macemacs_24.png b/etc/images/icons/macemacs_24.png
deleted file mode 100644
index 7666a1d1dea..00000000000
--- a/etc/images/icons/macemacs_24.png
+++ /dev/null
diff --git a/etc/images/icons/macemacs_256.png b/etc/images/icons/macemacs_256.png
deleted file mode 100644
index 5529c75a4ee..00000000000
--- a/etc/images/icons/macemacs_256.png
+++ /dev/null
diff --git a/etc/images/icons/macemacs_32.png b/etc/images/icons/macemacs_32.png
deleted file mode 100644
index 94bfe8893b6..00000000000
--- a/etc/images/icons/macemacs_32.png
+++ /dev/null
diff --git a/etc/images/icons/macemacs_48.png b/etc/images/icons/macemacs_48.png
deleted file mode 100644
index ac3e703f820..00000000000
--- a/etc/images/icons/macemacs_48.png
+++ /dev/null
diff --git a/etc/images/icons/macemacs_512.png b/etc/images/icons/macemacs_512.png
deleted file mode 100644
index b817081ad12..00000000000
--- a/etc/images/icons/macemacs_512.png
+++ /dev/null
diff --git a/etc/schema/dbdyntbl.rnc b/etc/schema/dbdyntbl.rnc
index 8e859145fd0..4ade70bbe2e 100644
--- a/etc/schema/dbdyntbl.rnc
+++ b/etc/schema/dbdyntbl.rnc
@@ -2,7 +2,7 @@
 # allows the table model to be selected dynamically based on the
 # definitions of cals.table.module and exchange.table.module.
 #
-# To use this copy, docbook.rnc to docbook-dyntbl.rnc replacing
+# To use this, copy docbook.rnc to docbook-dyntbl.rnc replacing
 # "dbcalstbl.rnc" by "dbdyntbl.rnc".  Then, you can override the
 # choice of table model by doing
 #
diff --git a/etc/schema/docbook-dyntbl.rnc b/etc/schema/docbk-dyntbl.rnc
index 9bb997ff734..9bb997ff734 100644
--- a/etc/schema/docbook-dyntbl.rnc
+++ b/etc/schema/docbk-dyntbl.rnc
diff --git a/etc/schema/docbook-soextbl.rnc b/etc/schema/docbk-soextbl.rnc
index 945a6219dba..945a6219dba 100644
--- a/etc/schema/docbook-soextbl.rnc
+++ b/etc/schema/docbk-soextbl.rnc
diff --git a/etc/schema/xhtml-basic-form.rnc b/etc/schema/xhtml-bform.rnc
index c0a78a1d72e..c0a78a1d72e 100644
--- a/etc/schema/xhtml-basic-form.rnc
+++ b/etc/schema/xhtml-bform.rnc
diff --git a/etc/schema/xhtml-basic-table.rnc b/etc/schema/xhtml-btable.rnc
index 97e10a56743..97e10a56743 100644
--- a/etc/schema/xhtml-basic-table.rnc
+++ b/etc/schema/xhtml-btable.rnc
diff --git a/etc/schema/xhtml-form.rnc b/etc/schema/xhtml-form.rnc
index f5544190b01..99a0474afbe 100644
--- a/etc/schema/xhtml-form.rnc
+++ b/etc/schema/xhtml-form.rnc
@@ -2,7 +2,7 @@
 
 # Unlike the DTD implementation, this builds on the basic-form module
 
-include "xhtml-basic-form.rnc" {
+include "xhtml-bform.rnc" {
   select = element select { select.attlist, (option | optgroup)+ }
 }
 form.attlist &=
diff --git a/etc/schema/xhtml-list.rnc b/etc/schema/xhtml-lst.rnc
index 8b994041eaa..8b994041eaa 100644
--- a/etc/schema/xhtml-list.rnc
+++ b/etc/schema/xhtml-lst.rnc
diff --git a/etc/schema/xhtml-table.rnc b/etc/schema/xhtml-table.rnc
index 70055b1598f..129d7b6742c 100644
--- a/etc/schema/xhtml-table.rnc
+++ b/etc/schema/xhtml-table.rnc
@@ -3,7 +3,7 @@
 # This builds on the basic tables module, unlike with the DTD
 # implementation.
 
-include "xhtml-basic-table.rnc" {
+include "xhtml-btable.rnc" {
   table =
     element table {
       table.attlist,
diff --git a/etc/schema/xhtml-target.rnc b/etc/schema/xhtml-tgt.rnc
index 505b37963a9..505b37963a9 100644
--- a/etc/schema/xhtml-target.rnc
+++ b/etc/schema/xhtml-tgt.rnc
diff --git a/etc/schema/xhtml-style.rnc b/etc/schema/xhtml-xstyle.rnc
index 93a52d5e2ad..93a52d5e2ad 100644
--- a/etc/schema/xhtml-style.rnc
+++ b/etc/schema/xhtml-xstyle.rnc
diff --git a/etc/schema/xhtml.rnc b/etc/schema/xhtml.rnc
index 3218cd71e5b..c85cb144e25 100644
--- a/etc/schema/xhtml.rnc
+++ b/etc/schema/xhtml.rnc
@@ -10,7 +10,7 @@ include "xhtml-attribs.rnc"
 include "xhtml-frames.rnc"
 include "xhtml-text.rnc"
 include "xhtml-hypertext.rnc"
-include "xhtml-list.rnc"
+include "xhtml-lst.rnc"
 include "xhtml-image.rnc"
 include "xhtml-ssismap.rnc"
 include "xhtml-base.rnc"
@@ -22,16 +22,16 @@ include "xhtml-bdo.rnc"
 include "xhtml-pres.rnc"
 include "xhtml-edit.rnc"
 include "xhtml-applet.rnc"
-# include "xhtml-basic-form.rnc"
+# include "xhtml-bform.rnc"
 include "xhtml-form.rnc"
-include "xhtml-style.rnc"
+include "xhtml-xstyle.rnc"
 include "xhtml-script.rnc"
-# include "xhtml-basic-table.rnc"
+# include "xhtml-btable.rnc"
 include "xhtml-table.rnc"
 include "xhtml-csismap.rnc"
 include "xhtml-events.rnc"
 include "xhtml-inlstyle.rnc"
-include "xhtml-target.rnc"
+include "xhtml-tgt.rnc"
 include "xhtml-iframe.rnc"
 include "xhtml-nameident.rnc"
 include "xhtml-legacy.rnc"