Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-25

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 173-179)

   - Update from CVS

diff --cc etc/NEWS
Simple merge

diff --cc etc/TODO
Simple merge

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/fileio.c
index db511aa,db1ea66..c62c1e8
--- 1/src/fileio.c
--- 2/src/fileio.c
+++ b/src/fileio.c
@@@ -4504,11 -4538,10 +4516,10 @@@ actually used.  */
  
              args[0] = Qinsert_file_contents, args[1] = orig_filename;
              args[2] = visit, args[3] = beg, args[4] = end, args[5] = Qnil;
 -            coding_systems = Ffind_operation_coding_system (6, args);
 -            if (CONSP (coding_systems))
 -              val = XCAR (coding_systems);
 +            coding_system = Ffind_operation_coding_system (6, args);
 +            if (CONSP (coding_system))
 +              coding_system = XCAR (coding_system);
            }
- 
          unbind_to (count, Qnil);
          inserted = Z_BYTE - BEG_BYTE;
        }

diff --cc src/xfns.c
Simple merge

diff --cc src/xmenu.c
Simple merge