Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
9fb7a510
Commit
9fb7a510
authored
Sep 29, 2010
by
Kenichi Handa
Browse files
merge emacs-23
parents
18acb5ad
dec83468
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
45 additions
and
10 deletions
+45
-10
lisp/ChangeLog
lisp/ChangeLog
+11
-0
lisp/Makefile.in
lisp/Makefile.in
+4
-0
lisp/dired.el
lisp/dired.el
+1
-1
lisp/emacs-lisp/byte-opt.el
lisp/emacs-lisp/byte-opt.el
+5
-3
src/ChangeLog
src/ChangeLog
+14
-0
src/dbusbind.c
src/dbusbind.c
+4
-0
src/keyboard.c
src/keyboard.c
+6
-6
No files found.
lisp/ChangeLog
View file @
9fb7a510
2010-09-27 Drew Adams <drew.adams@oracle.com>
* dired.el (dired-save-positions): Doc fix. (Bug#7119)
2010-09-27 Andreas Schwab <schwab@linux-m68k.org>
* Makefile.in (ELCFILES): Update.
* emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Avoid
infinite recursion on erroneous lambda form. (Bug#7114)
2010-09-27 Kenichi Handa <handa@m17n.org>
* tar-mode.el (tar-header-block-tokenize): Decode filenames in
...
...
lisp/Makefile.in
View file @
9fb7a510
...
...
@@ -311,11 +311,15 @@ ELCFILES = \
$(lisp)
/cedet/cedet.elc
\
$(lisp)
/cedet/data-debug.elc
\
$(lisp)
/cedet/ede.elc
\
$(lisp)
/cedet/ede/auto.elc
\
$(lisp)
/cedet/ede/autoconf-edit.elc
\
$(lisp)
/cedet/ede/base.elc
\
$(lisp)
/cedet/ede/cpp-root.elc
\
$(lisp)
/cedet/ede/custom.elc
\
$(lisp)
/cedet/ede/dired.elc
\
$(lisp)
/cedet/ede/emacs.elc
\
$(lisp)
/cedet/ede/files.elc
\
$(lisp)
/cedet/ede/generic.elc
\
$(lisp)
/cedet/ede/linux.elc
\
$(lisp)
/cedet/ede/locate.elc
\
$(lisp)
/cedet/ede/make.elc
\
...
...
lisp/dired.el
View file @
9fb7a510
...
...
@@ -1177,7 +1177,7 @@ Preserves old cursor, marks/flags, hidden-p."
The positions have the form (BUFFER-POSITION WINDOW-POSITIONS).
BUFFER-POSITION is the point position in the current dired buffer.
The buffer position
ha
ve
the form (BUFFER DIRED-FILENAME BUFFER-POINT).
It
ha
s
the form (BUFFER DIRED-FILENAME BUFFER-POINT).
WINDOW-POSITIONS are current positions in all windows displaying
this dired buffer. The window positions have the form (WINDOW
...
...
lisp/emacs-lisp/byte-opt.el
View file @
9fb7a510
...
...
@@ -381,9 +381,11 @@
form
))
((
or
(
byte-code-function-p
fn
)
(
eq
'lambda
(
car-safe
fn
)))
(
byte-optimize-form-code-walker
(
byte-compile-unfold-lambda
form
)
for-effect
))
(
let
((
newform
(
byte-compile-unfold-lambda
form
)))
(
if
(
eq
newform
form
)
;; Some error occured, avoid infinite recursion
form
(
byte-optimize-form-code-walker
newform
for-effect
))))
((
memq
fn
'
(
let
let*
))
;; recursively enter the optimizer for the bindings and body
;; of a let or let*. This for depth-firstness: forms that
...
...
src/ChangeLog
View file @
9fb7a510
...
...
@@ -3,6 +3,20 @@
* xfont.c (xfont_open): Fix setting of font->average_width from
:avgwidth property (Bug#7123).
2010-09-28 Michael Albinus <michael.albinus@gmx.de>
* dbusbind.c (syms_of_dbusbind): Use putenv instead of setenv, it
is more portable.
* keyboard.c (gobble_input): Move call of xd_read_queued_messages ...
(kbd_buffer_get_event): ... here. This is needed for cygwin, which
has not defined SIGIO.
2010-09-27 Michael Albinus <michael.albinus@gmx.de>
* dbusbind.c (syms_of_dbusbind): Set $DBUS_FATAL_WARNINGS to "0".
(Bug#7113)
2010-09-26 Jan Djärv <jan.h.d@swipnet.se>
* xgselect.c (xg_select): Clear file descriptors not set from
...
...
src/dbusbind.c
View file @
9fb7a510
...
...
@@ -2130,8 +2130,12 @@ message arrives. */);
doc:
/* If non-nil, debug messages of D-Bus bindings are raised. */
);
#ifdef DBUS_DEBUG
Vdbus_debug
=
Qt
;
/* We can also set environment DBUS_VERBOSE=1 in order to see more
traces. */
#else
Vdbus_debug
=
Qnil
;
/* We do not want to abort. */
putenv
(
"DBUS_FATAL_WARNINGS=0"
);
#endif
Fprovide
(
intern_c_string
(
"dbusbind"
),
Qnil
);
...
...
src/keyboard.c
View file @
9fb7a510
...
...
@@ -4106,6 +4106,11 @@ kbd_buffer_get_event (kbp, used_mouse_menu, end_time)
/* One way or another, wait until input is available; then, if
interrupt handlers have not read it, read it now. */
#ifdef HAVE_DBUS
/* Read D-Bus messages. */
xd_read_queued_messages ();
#endif /* HAVE_DBUS */
/* Note SIGIO has been undef'd if FIONREAD is missing. */
#ifdef SIGIO
gobble_input (0);
...
...
@@ -4757,7 +4762,7 @@ timer_check (do_it_now)
{
EMACS_TIME nexttime;
do
do
{
nexttime = timer_check_2 ();
}
...
...
@@ -7051,11 +7056,6 @@ void
gobble_input (expected)
int expected;
{
#ifdef HAVE_DBUS
/* Read D-Bus messages. */
xd_read_queued_messages ();
#endif /* HAVE_DBUS */
#ifdef SIGIO
if (interrupt_input)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment