[Emacs-diffs] /srv/bzr/emacs/trunk r104707: Merge from emacs-23; up to r100601.

[Glenn Morris]

------------------------------------------------------------
revno: 104707 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-06-25 11:21:00 -0700
message:
  Merge from emacs-23; up to r100601.
modified:
  doc/lispref/ChangeLog
  doc/lispref/display.texi
  doc/lispref/keymaps.texi
  lisp/ChangeLog
  lisp/net/ange-ftp.el
  src/ChangeLog
  src/dispnew.c

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2011-06-15 18:45:28 +0000
+++ b/doc/lispref/ChangeLog     2011-06-25 18:21:00 +0000
@@ -1,3 +1,9 @@
+2011-06-25  Chong Yidong  <address@hidden>
+
+       * keymaps.texi (Searching Keymaps):
+       * display.texi (Overlay Properties): Fix errors in 2011-05-29
+       change.  Suggested by Johan Bockgård.
+
 2011-06-15  Chong Yidong  <address@hidden>
 
        * text.texi (Special Properties): Clarify role of font-lock-face.

=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi  2011-05-29 22:41:06 +0000
+++ b/doc/lispref/display.texi  2011-06-25 18:21:00 +0000
@@ -1441,9 +1441,9 @@
 Attributes}.
 
 @item
-A cons cell, either of the form @code{(fg-color . @var{color-name})}
-or @code{(bg-color . @var{color-name})}.  These elements specify just
-the foreground color or just the background color.
+A cons cell, of the form @code{(foreground-color . @var{color-name})}
+or @code{(background-color . @var{color-name})}.  These elements
+specify just the foreground color or just the background color.
 
 @code{(foreground-color . @var{color-name})} has the same effect as
 @code{(:foreground @var{color-name})}; likewise for the background.

=== modified file 'doc/lispref/keymaps.texi'
--- a/doc/lispref/keymaps.texi  2011-05-29 22:41:06 +0000
+++ b/doc/lispref/keymaps.texi  2011-06-25 18:21:00 +0000
@@ -723,13 +723,13 @@
       (@var{find-in} overriding-terminal-local-map))
      (overriding-local-map
       (@var{find-in} overriding-local-map))
-     (or (@var{find-in} (get-char-property (point) 'keymap))
-        (@var{find-in-any} emulation-mode-map-alists)
-        (@var{find-in-any} minor-mode-overriding-map-alist)
-        (@var{find-in-any} minor-mode-map-alist)
-        (if (get-text-property (point) 'local-map)
-            (@var{find-in} (get-char-property (point) 'local-map))
-          (@var{find-in} (current-local-map)))))
+     ((or (@var{find-in} (get-char-property (point) 'keymap))
+         (@var{find-in-any} emulation-mode-map-alists)
+         (@var{find-in-any} minor-mode-overriding-map-alist)
+         (@var{find-in-any} minor-mode-map-alist)
+         (if (get-text-property (point) 'local-map)
+             (@var{find-in} (get-char-property (point) 'local-map))
+           (@var{find-in} (current-local-map))))))
     (@var{find-in} (current-global-map)))
 @end lisp
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-25 18:08:41 +0000
+++ b/lisp/ChangeLog    2011-06-25 18:21:00 +0000
@@ -1,3 +1,10 @@
+2011-06-25  Eli Zaretskii  <address@hidden>
+
+       * net/ange-ftp.el (ange-ftp-insert-file-contents): Let-bind
+       buffer-file-type before setting its value, to avoid disastrous
+       global effects on decoding files for DOS/Windows systems.
+       (Bug#8780)
+
 2011-06-25  Juanma Barranquero  <address@hidden>
 
        * allout.el (allout-unload-function): Pass -1 to `allout-mode'.

=== modified file 'lisp/net/ange-ftp.el'
--- a/lisp/net/ange-ftp.el      2011-06-09 06:07:11 +0000
+++ b/lisp/net/ange-ftp.el      2011-06-25 18:21:00 +0000
@@ -3278,6 +3278,7 @@
                     (name (ange-ftp-quote-string (nth 2 parsed)))
                     (temp (ange-ftp-make-tmp-name host))
                     (binary (ange-ftp-binary-file filename))
+                    (buffer-file-type buffer-file-type)
                     (abbr (ange-ftp-abbreviate-filename filename))
                     (coding-system-used last-coding-system-used)
                     size)

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-06-24 21:25:22 +0000
+++ b/src/ChangeLog     2011-06-25 18:21:00 +0000
@@ -1,3 +1,8 @@
+2011-06-25  YAMAMOTO Mitsuharu  <address@hidden>
+
+       * dispnew.c (scrolling_window): Before scrolling, turn off a
+       mouse-highlight in the window being scrolled.
+
 2011-06-24  Juanma Barranquero  <address@hidden>
 
        Move DEFSYM to lisp.h and use everywhere.

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2011-06-24 21:25:22 +0000
+++ b/src/dispnew.c     2011-06-25 18:21:00 +0000
@@ -4543,6 +4543,7 @@
        /* Copy on the display.  */
        if (r->current_y != r->desired_y)
          {
+           rif->clear_window_mouse_face (w);
            rif->scroll_run_hook (w, r);
 
            /* Invalidate runs that copy from where we copied to.  */