Commit 11fdef7d authored by Glenn Morris's avatar Glenn Morris
Browse files

Merge from emacs-23; up to 2010-06-15T03:34:12Z!

parents 3794a2d3 c9e799db
2011-06-25 Chong Yidong <>
* 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 <>
* text.texi (Special Properties): Clarify role of font-lock-face.
......@@ -1441,9 +1441,9 @@ specify a particular attribute for certain text. @xref{Face
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.
......@@ -723,13 +723,13 @@ them:
(@var{find-in} overriding-terminal-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
2011-06-25 Eli Zaretskii <>
* 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.
2011-06-25 Juanma Barranquero <>
* allout.el (allout-unload-function): Pass -1 to `allout-mode'.
......@@ -3278,6 +3278,7 @@ system TYPE.")
(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)
2011-06-25 YAMAMOTO Mitsuharu <>
* dispnew.c (scrolling_window): Before scrolling, turn off a
mouse-highlight in the window being scrolled.
2011-06-24 Juanma Barranquero <>
Move DEFSYM to lisp.h and use everywhere.
......@@ -4543,6 +4543,7 @@ scrolling_window (struct window *w, int header_line_p)
/* 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. */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment