From fb5f3a23b58f1da26f3a7ec29e2517ce3856edbd Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sun, 26 Sep 2010 02:37:50 +0200 Subject: [PATCH 1/9] lisp/window.el (walk-windows): Doc fix (bug#7105). --- lisp/ChangeLog | 4 ++++ lisp/window.el | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 18643c3f824..518ebc3cab7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-09-26 Juanma Barranquero + + * window.el (walk-windows): Doc fix (bug#7105). + 2010-09-23 Glenn Morris * isearch.el (isearch-lazy-highlight-cleanup) diff --git a/lisp/window.el b/lisp/window.el index 41a5d17321f..4b1155f2388 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -160,8 +160,8 @@ counts, `walk-windows' includes the windows in the frame from which you entered the minibuffer, as well as the minibuffer window. -ALL-FRAMES nil or omitted means cycle through all windows on - WINDOW's frame, plus the minibuffer window if specified by the +ALL-FRAMES nil or omitted means cycle through all windows on the + selected frame, plus the minibuffer window if specified by the MINIBUF argument, see above. If the minibuffer counts, cycle through all windows on all frames that share that minibuffer too. @@ -173,8 +173,8 @@ ALL-FRAMES 0 means cycle through all windows on all visible and iconified frames. ALL-FRAMES a frame means cycle through all windows on that frame only. -Anything else means cycle through all windows on WINDOW's frame - and no others. +Anything else means cycle through all windows on the selected + frame and no others. This function changes neither the order of recently selected windows nor the buffer list." From 42d3022b00d62a27b9f3820b84032b92ac0b0363 Mon Sep 17 00:00:00 2001 From: Jan D Date: Sun, 26 Sep 2010 17:39:10 +0200 Subject: [PATCH 2/9] * xgselect.c (xg_select): Clear file descriptors not set from rfds and wfds. --- src/ChangeLog | 5 +++++ src/xgselect.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 36e1fbab2bf..435c09f0ff8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-09-26 Jan Djärv + + * xgselect.c (xg_select): Clear file descriptors not set from + rfds and wfds. + 2010-09-21 Stefan Monnier * syntax.c (back_comment): Detect the case where a 1-char comment diff --git a/src/xgselect.c b/src/xgselect.c index d93c1bdf405..a06713458a0 100644 --- a/src/xgselect.c +++ b/src/xgselect.c @@ -113,11 +113,17 @@ xg_select (max_fds, rfds, wfds, efds, timeout) if (rfds && FD_ISSET (i, rfds)) ++retval; else ++our_fds; } + else if (rfds) + FD_CLR (i, rfds); + if (have_wfds && FD_ISSET (i, &all_wfds)) { if (wfds && FD_ISSET (i, wfds)) ++retval; else ++our_fds; } + else if (wfds) + FD_CLR (i, wfds); + if (efds && FD_ISSET (i, efds)) ++retval; } From 368b3544429556ff4c536b8f1d7d896f4a8e1787 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Mon, 27 Sep 2010 13:52:56 +0900 Subject: [PATCH 3/9] international/mule-diag.el (describe-character-set): Use princ with proper print-length and print-level instead of insert. --- lisp/ChangeLog | 7 +++++++ lisp/international/mule-diag.el | 3 ++- lisp/international/mule.el | 17 +++++++++-------- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 518ebc3cab7..ce0236e34d7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2010-09-27 Kenichi Handa + + * international/mule.el (define-coding-system): Docstring fixed. + + * international/mule-diag.el (describe-character-set): Use princ + with proper print-length and print-level instead of insert. + 2010-09-26 Juanma Barranquero * window.el (walk-windows): Doc fix (bug#7105). diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el index a809b60da7f..ed2f7e33a4c 100644 --- a/lisp/international/mule-diag.el +++ b/lisp/international/mule-diag.el @@ -368,7 +368,8 @@ meanings of these arguments." (when val (if (cadr elt) (insert (cadr elt))) (if (nth 2 elt) - (insert (funcall (nth 2 elt) val))) + (let ((print-length 10) (print-level 2)) + (princ (funcall (nth 2 elt) val) (current-buffer)))) (insert ?\n))))))) ;;; CODING-SYSTEM diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 105163a5d11..992c6bd16bb 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -642,18 +642,19 @@ VALUE must be a translation table to use on encoding. VALUE must be a function to call after some text is inserted and decoded by the coding system itself and before any functions in -`after-insert-functions' are called. The arguments to this function -are the same as those of a function in `after-insert-file-functions', -i.e. LENGTH of the text to be decoded with point at the head of it, -and the function should leave point unchanged. +`after-insert-functions' are called. This function is passed one +argument; the number of characters in the text to convert, with +point at the start of the text. The function should leave point +the same, and return the new character count. `:pre-write-conversion' VALUE must be a function to call after all functions in -`write-region-annotate-functions' and `buffer-file-format' are called, -and before the text is encoded by the coding system itself. The -arguments to this function are the same as those of a function in -`write-region-annotate-functions'. +`write-region-annotate-functions' and `buffer-file-format' are +called, and before the text is encoded by the coding system +itself. This function should convert the whole text in the +current buffer. For backward compatibility, this funciton is +passed two arguments which can be ignored. `:default-char' From fd057fd25e400a18cc83ba17ce487c760a78f18d Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Mon, 27 Sep 2010 14:00:46 +0900 Subject: [PATCH 4/9] tar-mode.el (tar-header-block-tokenize): Decode filenames in "ustar" format. --- lisp/ChangeLog | 5 +++++ lisp/tar-mode.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ce0236e34d7..0bbc1648dec 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-09-27 Kenichi Handa + + * tar-mode.el (tar-header-block-tokenize): Decode filenames in + "ustar" format. + 2010-09-27 Kenichi Handa * international/mule.el (define-coding-system): Docstring fixed. diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el index be9af8e293d..a3f717ff40c 100644 --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el @@ -286,7 +286,8 @@ write-date, checksum, link-type, and link-name." (let* ((size (tar-parse-octal-integer string tar-size-offset tar-time-offset)) ;; -1 so as to strip the terminating 0 byte. - (name (buffer-substring pos (+ pos size -1))) + (name (decode-coding-string + (buffer-substring pos (+ pos size -1)) coding)) (descriptor (tar-header-block-tokenize (+ pos (tar-roundup-512 size)) coding))) From e0720500f63c0fc2224dda81d02970583dea135c Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 27 Sep 2010 10:59:16 +0200 Subject: [PATCH 5/9] * dbusbind.c (syms_of_dbusbind): Unset $DBUS_FATAL_WARNINGS. (Bug#7113) --- src/ChangeLog | 5 +++++ src/dbusbind.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 435c09f0ff8..380e8becc1f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-09-27 Michael Albinus + + * dbusbind.c (syms_of_dbusbind): Unset $DBUS_FATAL_WARNINGS. + (Bug#7113) + 2010-09-26 Jan Djärv * xgselect.c (xg_select): Clear file descriptors not set from diff --git a/src/dbusbind.c b/src/dbusbind.c index f710741b591..6fc5a923422 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -2132,6 +2132,8 @@ message arrives. */); Vdbus_debug = Qt; #else Vdbus_debug = Qnil; + /* We do not want to abort. */ + unsetenv ("DBUS_FATAL_WARNINGS"); #endif Fprovide (intern_c_string ("dbusbind"), Qnil); From 11a5af7c3f30a5aa9823cf386ac82a56b3b81f2c Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 27 Sep 2010 14:44:26 +0200 Subject: [PATCH 6/9] * dbusbind.c (syms_of_dbusbind): Set $DBUS_FATAL_WARNINGS to "0". (Bug#7113) --- src/ChangeLog | 2 +- src/dbusbind.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 380e8becc1f..c74dd66edbb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,6 +1,6 @@ 2010-09-27 Michael Albinus - * dbusbind.c (syms_of_dbusbind): Unset $DBUS_FATAL_WARNINGS. + * dbusbind.c (syms_of_dbusbind): Set $DBUS_FATAL_WARNINGS to "0". (Bug#7113) 2010-09-26 Jan Djärv diff --git a/src/dbusbind.c b/src/dbusbind.c index 6fc5a923422..0b5d32ce467 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -2130,10 +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. */ - unsetenv ("DBUS_FATAL_WARNINGS"); + setenv ("DBUS_FATAL_WARNINGS", 0, 1); #endif Fprovide (intern_c_string ("dbusbind"), Qnil); From 789af3cd80d7d399394e518ce0458c234fedf54a Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 27 Sep 2010 15:27:54 +0200 Subject: [PATCH 7/9] * dbusbind.c (syms_of_dbusbind): Set $DBUS_FATAL_WARNINGS to "0". (Bug#7113) --- src/dbusbind.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dbusbind.c b/src/dbusbind.c index 0b5d32ce467..93887fa9902 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -2135,7 +2135,7 @@ message arrives. */); #else Vdbus_debug = Qnil; /* We do not want to abort. */ - setenv ("DBUS_FATAL_WARNINGS", 0, 1); + setenv ("DBUS_FATAL_WARNINGS", "0", 1); #endif Fprovide (intern_c_string ("dbusbind"), Qnil); From c19f76a18bb56236a4e043928598dcac5831aa14 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 27 Sep 2010 19:14:58 +0200 Subject: [PATCH 8/9] * emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Avoid infinite recursion on erroneous lambda form. (Bug#7114) --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/byte-opt.el | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0bbc1648dec..45f32afa0a8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-09-27 Andreas Schwab + + * emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Avoid + infinite recursion on erroneous lambda form. (Bug#7114) + 2010-09-27 Kenichi Handa * tar-mode.el (tar-header-block-tokenize): Decode filenames in diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index e461010a6ce..4950511ebe2 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -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 From 0cceab3d5942aef608dc33be4616b77206201115 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 27 Sep 2010 23:32:36 +0200 Subject: [PATCH 9/9] * Makefile.in (ELCFILES): Update. --- lisp/ChangeLog | 2 ++ lisp/Makefile.in | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 45f32afa0a8..8e3164cc551 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2010-09-27 Andreas Schwab + * Makefile.in (ELCFILES): Update. + * emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Avoid infinite recursion on erroneous lambda form. (Bug#7114) diff --git a/lisp/Makefile.in b/lisp/Makefile.in index f9dc1710cc3..eaefbd7e734 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -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 \