[Emacs-diffs] /srv/bzr/emacs/trunk r100423: Merge from emacs-23

[Stefan Monnier]

------------------------------------------------------------
revno: 100423 [merge]
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2010-05-24 20:54:13 -0400
message:
  Merge from emacs-23
modified:
  etc/ChangeLog
  etc/NEWS.23
  lisp/ChangeLog
  lisp/emacs-lisp/bytecomp.el
  lisp/textmodes/fill.el
  lisp/url/ChangeLog
  lisp/url/url-util.el
  src/ChangeLog
  src/cmds.c
  src/editfns.c

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2010-05-11 02:04:13 +0000
+++ b/etc/ChangeLog     2010-05-25 00:54:13 +0000
@@ -1,3 +1,7 @@
+2010-05-24  Stefan Monnier  <address@hidden>
+
+       * NEWS: Add sections for Emacs-23.3.
+
 2010-05-08  Chong Yidong  <address@hidden>
 
        * PROBLEMS: Document gcc-4.5 bug (Bug#6031).
@@ -43,8 +47,7 @@
 
 2010-03-24  Francesc Rocher  <address@hidden>
 
-       * MORE.STUFF: Remove CEDET entry, now distributed as part of
-       Emacs.
+       * MORE.STUFF: Remove CEDET entry, now distributed as part of Emacs.
 
 2010-03-22  Teodor Zlatanov  <address@hidden>
 

=== modified file 'etc/NEWS.23'
--- a/etc/NEWS.23       2010-05-08 18:47:07 +0000
+++ b/etc/NEWS.23       2010-05-25 00:54:13 +0000
@@ -15,6 +15,33 @@
 with a prefix argument or by typing C-u C-h C-n.
 
 
+* Installation Changes in Emacs 23.3
+
+* Startup Changes in Emacs 23.3
+
+* Changes in Emacs 23.3
+
+
+* Editing Changes in Emacs 23.3
+
+
+* Changes in Specialized Modes and Packages in Emacs 23.3
+
+
+* New Modes and Packages in Emacs 23.3
+
+
+* Incompatible Lisp Changes in Emacs 23.3
+
+
+* Lisp changes in Emacs 23.3
+
+** New function byte-to-string, like char-to-string but for bytes.
+
+
+* Changes in Emacs 23.3 on non-free operating systems
+
+
 * Installation Changes in Emacs 23.2
 
 ** New configure options for Emacs developers.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-22 16:48:01 +0000
+++ b/lisp/ChangeLog    2010-05-25 00:54:13 +0000
@@ -1,3 +1,12 @@
+2010-05-24  Uday S Reddy  <address@hidden>  (tiny change)
+
+       * textmodes/fill.el (fill-region): Don't fill past the end (bug#6201).
+
+2010-05-24  Stefan Monnier  <address@hidden>
+
+       * subr.el (read-quoted-char): Resolve modifiers after key
+       remapping (bug#6212).
+
 2010-05-22  Chong Yidong  <address@hidden>
 
        * image.el (image-refresh): Define as an alias for image-flush.
@@ -13,9 +22,9 @@
 
 2010-05-21  Alan Mackenzie  <address@hidden>
 
-       * progmodes/cc-engine.el (c-parse-state-get-strategy): Replace
-       parameter `here' with `here-' and `here-plus', which sandwich any
-       pertinent CPP construct.
+       * progmodes/cc-engine.el (c-parse-state-get-strategy):
+       Replace parameter `here' with `here-' and `here-plus', which sandwich
+       any pertinent CPP construct.
        (c-remove-stale-state-cache-backwards): Fix a bug which happens
        when doing (c-parse-state) in a CPP construct: Exclude any "new"
        CPP construct from taking part in the scanning.
@@ -23,8 +32,8 @@
 2010-05-21  Michael Albinus  <address@hidden>
 
        * net/tramp.el (tramp-do-copy-or-rename-file)
-       (tramp-handle-file-local-copy, tramp-maybe-open-connection): Tune
-       `with-progress-reporter' messages.
+       (tramp-handle-file-local-copy, tramp-maybe-open-connection):
+       Tune `with-progress-reporter' messages.
        (tramp-handle-vc-registered):
        * net/tramp-fish.el (tramp-fish-handle-file-local-copy)
        (tramp-fish-handle-insert-file-contents)

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- a/lisp/emacs-lisp/bytecomp.el       2010-04-23 16:26:11 +0000
+++ b/lisp/emacs-lisp/bytecomp.el       2010-05-25 00:54:13 +0000
@@ -353,7 +353,7 @@
 (defvar byte-compile-interactive-only-functions
   '(beginning-of-buffer end-of-buffer replace-string replace-regexp
     insert-file insert-buffer insert-file-literally previous-line next-line
-    goto-line comint-run)
+    goto-line comint-run delete-backward-char)
   "List of commands that are not meant to be called from Lisp.")
 
 (defvar byte-compile-not-obsolete-vars nil

=== modified file 'lisp/textmodes/fill.el'
--- a/lisp/textmodes/fill.el    2010-01-13 08:35:10 +0000
+++ b/lisp/textmodes/fill.el    2010-05-19 03:51:55 +0000
@@ -1036,7 +1036,7 @@
          (fill-forward-paragraph -1))
        (if (< (point) beg)
            (goto-char beg))
-       (if (>= (point) initial)
+       (if (and (>= (point) initial) (< (point) end))
            (setq fill-pfx
                  (fill-region-as-paragraph (point) end justify nosqueeze))
          (goto-char end))))

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2010-05-08 18:47:07 +0000
+++ b/lisp/url/ChangeLog        2010-05-25 00:54:13 +0000
@@ -1,3 +1,7 @@
+2010-05-19  Stefan Monnier  <address@hidden>
+
+       * url-util.el (url-unhex-string): Don't accidentally decode as latin-1.
+
 2010-05-07  Chong Yidong  <address@hidden>
 
        * Version 23.2 released.

=== modified file 'lisp/url/url-util.el'
--- a/lisp/url/url-util.el      2010-01-23 22:50:13 +0000
+++ b/lisp/url/url-util.el      2010-05-19 15:23:53 +0000
@@ -322,10 +322,10 @@
                   tmp (substring str 0 start)
                   (cond
                    (allow-newlines
-                    (char-to-string code))
+                    (byte-to-string code))
                    ((or (= code ?\n) (= code ?\r))
                     " ")
-                   (t (char-to-string code))))
+                   (t (byte-to-string code))))
              str (substring str (match-end 0)))))
     (setq tmp (concat tmp str))
     tmp))

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-24 20:46:41 +0000
+++ b/src/ChangeLog     2010-05-25 00:54:13 +0000
@@ -1,12 +1,15 @@
 2010-05-24  Stefan Monnier  <address@hidden>
 
+       * editfns.c (Fbyte_to_string): New function.
+
+2010-05-24  Stefan Monnier  <address@hidden>
+
        * process.c (Fmake_network_process): Set :host to nil if it's not used.
        Suggested by Masatake YAMATO <address@hidden>.
 
 2010-05-23  Eli Zaretskii  <address@hidden>
 
-       * dispextern.h (init_iterator): Sync prototype with changed
-       definition.
+       * dispextern.h (init_iterator): Sync prototype with changed definition.
 
 2010-05-19  Eli Zaretskii  <address@hidden>
 

=== modified file 'src/cmds.c'
--- a/src/cmds.c        2010-05-15 13:23:48 +0000
+++ b/src/cmds.c        2010-05-25 00:54:13 +0000
@@ -278,7 +278,9 @@
        doc: /* Delete the previous N characters (following if N is negative).
 Optional second arg KILLFLAG non-nil means kill instead (save in kill ring).
 Interactively, N is the prefix arg, and KILLFLAG is set if
-N was explicitly specified.  */)
+N was explicitly specified.
+This is meant for interactive use only; from Lisp, better use `delete-char'
+with a negated argument.  */)
      (n, killflag)
      Lisp_Object n, killflag;
 {

=== modified file 'src/editfns.c'
--- a/src/editfns.c     2010-03-24 18:02:56 +0000
+++ b/src/editfns.c     2010-05-25 00:54:13 +0000
@@ -220,6 +220,16 @@
   return make_string_from_bytes (str, 1, len);
 }
 
+DEFUN ("byte-to-string", Fbyte_to_string, Sbyte_to_string, 1, 1, 0,
+       doc: /* Convert arg BYTE to a string containing that byte.  */)
+     (byte)
+     Lisp_Object byte;
+{
+  CHECK_NUMBER (byte);
+  unsigned char b = XINT (byte);
+  return make_string_from_bytes (&b, 1, 1);
+}
+
 DEFUN ("string-to-char", Fstring_to_char, Sstring_to_char, 1, 1, 0,
        doc: /* Convert arg STRING to a character, the first character of that 
string.
 A multibyte character is handled correctly.  */)
@@ -4686,6 +4696,7 @@
   defsubr (&Sgoto_char);
   defsubr (&Sstring_to_char);
   defsubr (&Schar_to_string);
+  defsubr (&Sbyte_to_string);
   defsubr (&Sbuffer_substring);
   defsubr (&Sbuffer_substring_no_properties);
   defsubr (&Sbuffer_string);