merge trunk

10 files changed, 73 insertions, 14 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 4f83227c8dc..10199922b34 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * NEWS: Add sections for Emacs-23.3.
+
 2010-05-08  Chong Yidong  <cyd@stupidchicken.com>
 
         * PROBLEMS: Document gcc-4.5 bug (Bug#6031).
@@ -43,8 +47,7 @@
 
 2010-03-24  Francesc Rocher  <rocher@member.fsf.org>
 
-        * 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  <tzz@lifelogs.com>
 
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index b52b1f79f41..9124fe1c069 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -15,6 +15,33 @@ You can narrow news to a specific version by calling `view-emacs-news'
 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.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 72f00e60edf..061db502dc5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-24  Uday S Reddy  <u.s.reddy@cs.bham.ac.uk>  (tiny change)
+
+        * textmodes/fill.el (fill-region): Don't fill past the end (bug#6201).
+
+2010-05-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * subr.el (read-quoted-char): Resolve modifiers after key
+        remapping (bug#6212).
+
 2010-05-22  Chong Yidong  <cyd@stupidchicken.com>
 
         * image.el (image-refresh): Define as an alias for image-flush.
@@ -13,9 +22,9 @@
 
 2010-05-21  Alan Mackenzie  <acm@muc.de>
 
-        * 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  <michael.albinus@gmx.de>
 
         * 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)
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 0c3a7b69798..217afea9f8a 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -353,7 +353,7 @@ else the global value will be modified."
 (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
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 1b3cc8dc4d8..da6e02bfa2f 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -1036,7 +1036,7 @@ space does not end a sentence, so don't break a line there."
           (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))))
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 552f0703940..f61c8d2566d 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * url-util.el (url-unhex-string): Don't accidentally decode as latin-1.
+
 2010-05-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * Version 23.2 released.
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index c0b2595a6e0..e92ccc76285 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -322,10 +322,10 @@ forbidden in URL encoding."
                    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))
diff --git a/src/ChangeLog b/src/ChangeLog
index 67911d5def3..959c3fbcb54 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -23,13 +23,16 @@
 
 2010-05-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * editfns.c (Fbyte_to_string): New function.
+
+2010-05-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
         * process.c (Fmake_network_process): Set :host to nil if it's not used.
         Suggested by Masatake YAMATO <yamato@redhat.com>.
 
 2010-05-23  Eli Zaretskii  <eliz@gnu.org>
 
-        * dispextern.h (init_iterator): Sync prototype with changed
-        definition.
+        * dispextern.h (init_iterator): Sync prototype with changed definition.
 
 2010-05-19  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/src/cmds.c b/src/cmds.c
index b8a65324e9f..1fdd3729d68 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -278,7 +278,9 @@ DEFUN ("delete-backward-char", Fdelete_backward_char, Sdelete_backward_char,
        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;
 {
diff --git a/src/editfns.c b/src/editfns.c
index 9f30ea06411..caac2c5c199 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -220,6 +220,16 @@ usage: (char-to-string CHAR)  */)
   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 @@ functions if all the text being accessed has this property.  */);
   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);