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

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 119-122)

   - Update from CVS

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/progmodes/sh-script.el
Simple merge

diff --cc man/cc-mode.texi
index 00bd427f5dd125f8788bff28becae9da0890e462,80aff8b1604e061d9c55860056307b6df5e42977..d541e306ae47692f402bb9e8c4f858bafe9fad96
--- 1/man/cc-mode.texi
--- 2/man/cc-mode.texi
+++ b/man/cc-mode.texi
@@@ -208,9 -208,9 +208,9 @@@ license to the document, as described i
  @vskip 0pt plus 1filll
  @insertcopying
  
 -This manual was generated from $Revision: 1.35 $ of $RCSfile: cc-mode.texi,v $, which can be
 +This manual was generated from $Revision$ of $RCSfile$, which can be
  downloaded from
- @url{http://cvs.sf.net/viewcvs.py/cc-mode/cc-mode/cc-mode.texi}.
+ @url{http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/man/cc-mode.texi}.
  @end titlepage
  
  @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

diff --cc src/ChangeLog
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/fileio.c
index ad3d89aa98350b13eb9b23f7e252749b8710e7d7,73dd799f806038497d53243208790cbf4d0887e7..b1f9b91654a0d5e08580a197ed55715ec6080b2a
--- 1/src/fileio.c
--- 2/src/fileio.c
+++ b/src/fileio.c
@@@ -4386,19 -4406,20 +4386,21 @@@ actually used.  */
        }
        /* Insert from the file at the proper position.  */
        SET_PT_BOTH (temp, same_at_start);
 -      insert_1 (conversion_buffer + same_at_start - BEGV_BYTE, inserted,
 -              0, 0, 0);
 -      if (coding.cmp_data && coding.cmp_data->used)
 -      coding_restore_composition (&coding, Fcurrent_buffer ());
 -      coding_free_composition_data (&coding);
 -
 +      same_at_start_charpos
 +      = buf_bytepos_to_charpos (XBUFFER (conversion_buffer),
 +                                same_at_start);
 +      inserted_chars
 +      = (buf_bytepos_to_charpos (XBUFFER (conversion_buffer),
 +                                 same_at_start + inserted)
 +         - same_at_start_charpos);
 +      insert_from_buffer (XBUFFER (conversion_buffer),
 +                        same_at_start_charpos, inserted_chars, 0);
        /* Set `inserted' to the number of inserted characters.  */
        inserted = PT - temp;
+       /* Set point before the inserted characters.  */
+       SET_PT_BOTH (temp, same_at_start);
  
 -      xfree (conversion_buffer);
 -      emacs_close (fd);
 -      specpdl_ptr--;
 +      unbind_to (this_count, Qnil);
  
        goto handled;
      }

diff --cc src/process.c
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xterm.c
Simple merge

diff --cc src/xterm.h
Simple merge