merge trunk

5 files changed, 22 insertions, 9 deletions

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))