mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-16 17:19:41 +00:00
Code Issues Releases Activity

Merge from emacs-23; up to 2010-06-15T03:34:12Z!rgm@gnu.org.

Browse Source
This commit is contained in:
Glenn Morris 2011-06-25 11:21:00 -07:00
commit 11fdef7d0c
7 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/lispref/ChangeLog
View File

@ -1,3 +1,9 @@
2011-06-25 Chong Yidong <cyd@stupidchicken.com>
* 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 <cyd@stupidchicken.com>
* text.texi (Special Properties): Clarify role of font-lock-face.

6
doc/lispref/display.texi
View File

@ -1441,9 +1441,9 @@ specify a particular attribute for certain text. @xref{Face
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.

14
doc/lispref/keymaps.texi
View File

@ -723,13 +723,13 @@ them:
(@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

7
lisp/ChangeLog
View File

@ -1,3 +1,10 @@
2011-06-25 Eli Zaretskii <eliz@gnu.org>
* 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 <lekktu@gmail.com>
* allout.el (allout-unload-function): Pass -1 to `allout-mode'.

1
lisp/net/ange-ftp.el
View File

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

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2011-06-25 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* dispnew.c (scrolling_window): Before scrolling, turn off a
mouse-highlight in the window being scrolled.
2011-06-24 Juanma Barranquero <lekktu@gmail.com>
Move DEFSYM to lisp.h and use everywhere.

1
src/dispnew.c
View File

@ -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. */