Merge changes from emacs-23 branch.
This commit is contained in:
Juanma Barranquero
commit
95b6d681b1
9 changed files with 81 additions and 43 deletions
|
|
@ -1,3 +1,24 @@
|
|||
2010-09-27 Andreas Schwab <schwab@linux-m68k.org>
|
||||
|
||||
* 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
|
||||
"ustar" format.
|
||||
|
||||
2010-09-27 Kenichi Handa <handa@m17n.org>
|
||||
|
||||
* 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-27 Juanma Barranquero <lekktu@gmail.com>
|
||||
|
||||
* window.el (walk-windows): Doc fix (bug#7105).
|
||||
|
||||
2010-09-27 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||
|
||||
* emacs-lisp/float-sup.el (e): Remove.
|
||||
|
|
@ -1304,8 +1325,8 @@
|
|||
Setup standard-display-table for 8-bit characters by storing 8-bit
|
||||
characters in the element vector.
|
||||
|
||||
* disp-table.el (standard-display-8bit): Setup
|
||||
standard-display-table for 8-bit characters by storing 8-bit
|
||||
* disp-table.el (standard-display-8bit):
|
||||
Setup standard-display-table for 8-bit characters by storing 8-bit
|
||||
characters in the element vector.
|
||||
(standard-display-european): Likewise.
|
||||
|
||||
|
|
@ -1570,8 +1591,8 @@
|
|||
(tramp-compat-file-attributes): Handle only
|
||||
`wrong-number-of-arguments' error.
|
||||
|
||||
* net/tramp-fish.el (tramp-fish-handle-copy-file): Add
|
||||
PRESERVE_SELINUX_CONTEXT.
|
||||
* net/tramp-fish.el (tramp-fish-handle-copy-file):
|
||||
Add PRESERVE_SELINUX_CONTEXT.
|
||||
(tramp-fish-handle-delete-file): Add TRASH arg.
|
||||
(tramp-fish-handle-directory-files-and-attributes):
|
||||
Do not use `tramp-fish-handle-file-attributes.
|
||||
|
|
@ -1589,8 +1610,8 @@
|
|||
(with-tramp-dbus-call-method): Format trace message.
|
||||
(tramp-gvfs-handle-copy-file): Handle PRESERVE-SELINUX-CONTEXT.
|
||||
(tramp-gvfs-handle-copy-file, tramp-gvfs-handle-rename-file):
|
||||
Implement backup call, when operation on local files fails. Use
|
||||
progress reporter. Flush properties of changed files.
|
||||
Implement backup call, when operation on local files fails.
|
||||
Use progress reporter. Flush properties of changed files.
|
||||
(tramp-gvfs-handle-delete-file): Add TRASH arg. Use
|
||||
`tramp-compat-delete-file'.
|
||||
(tramp-gvfs-handle-expand-file-name): Expand "~/".
|
||||
|
|
@ -1601,12 +1622,12 @@
|
|||
into account for the resulting file name.
|
||||
(tramp-gvfs-handler-askquestion): Preserve current message, in
|
||||
order to let progress reporter continue afterwards. (Bug#6257)
|
||||
Return dummy mountpoint, when the answer is "no". See
|
||||
`tramp-gvfs-maybe-open-connection'.
|
||||
Return dummy mountpoint, when the answer is "no".
|
||||
See `tramp-gvfs-maybe-open-connection'.
|
||||
(tramp-gvfs-handler-mounted-unmounted)
|
||||
(tramp-gvfs-connection-mounted-p): Test also for new mountspec
|
||||
attribute "default_location". Set "prefix" property. Handle
|
||||
default-location.
|
||||
attribute "default_location". Set "prefix" property.
|
||||
Handle default-location.
|
||||
(tramp-gvfs-mount-spec): Return both prefix and mountspec.
|
||||
(tramp-gvfs-maybe-open-connection): Test, whether mountpoint
|
||||
exists. Raise an error, if not (due to a corresponding answer
|
||||
|
|
@ -1620,8 +1641,8 @@
|
|||
(tramp-imap-handle-file-local-copy): Use `with-progress-reporter'.
|
||||
(tramp-imap-handle-delete-file): Add TRASH arg.
|
||||
|
||||
* net/tramp-smb.el (tramp-smb-handle-copy-file): Add
|
||||
PRESERVE-SELINUX-CONTEXT.
|
||||
* net/tramp-smb.el (tramp-smb-handle-copy-file):
|
||||
Add PRESERVE-SELINUX-CONTEXT.
|
||||
(tramp-smb-handle-copy-file)
|
||||
(tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file)
|
||||
(tramp-smb-handle-write-region, tramp-smb-maybe-open-connection):
|
||||
|
|
@ -1688,8 +1709,8 @@
|
|||
(tramp-get-remote-path): Use `copy-tree'.
|
||||
(tramp-completion-handle-file-name-all-completions): Ensure, that
|
||||
non remote files are still checked. Oops.
|
||||
(tramp-handle-copy-file, tramp-do-copy-or-rename-file): Handle
|
||||
PRESERVE-SELINUX-CONTEXT.
|
||||
(tramp-handle-copy-file, tramp-do-copy-or-rename-file):
|
||||
Handle PRESERVE-SELINUX-CONTEXT.
|
||||
(tramp-do-copy-or-rename-file): Add progress reporter.
|
||||
(tramp-do-copy-or-rename-file-directly): Do not use
|
||||
`tramp-handle-file-remote-p'.
|
||||
|
|
@ -1703,8 +1724,8 @@
|
|||
cache.
|
||||
(tramp-handle-expand-file-name)
|
||||
(tramp-completion-handle-file-name-all-completions)
|
||||
(tramp-completion-handle-file-name-completion): Use
|
||||
`tramp-connectable-p'.
|
||||
(tramp-completion-handle-file-name-completion):
|
||||
Use `tramp-connectable-p'.
|
||||
(tramp-handle-start-file-process): Set connection property "vec".
|
||||
Use it, in order to invalidate file caches. Check only for
|
||||
`remote-tty' process property.
|
||||
|
|
@ -3219,8 +3240,7 @@
|
|||
2010-07-03 Michael Albinus <michael.albinus@gmx.de>
|
||||
|
||||
* net/zeroconf.el (zeroconf-resolve-service)
|
||||
(zeroconf-service-resolver-handler): Use
|
||||
`dbus-byte-array-to-string'.
|
||||
(zeroconf-service-resolver-handler): Use `dbus-byte-array-to-string'.
|
||||
(zeroconf-publish-service): Use `dbus-string-to-byte-array'.
|
||||
|
||||
2010-07-03 Jan Moringen <jan.moringen@uni-bielefeld.de>
|
||||
|
|
@ -3382,8 +3402,7 @@
|
|||
* emacs-lisp/package-x.el: New file. Package uploading
|
||||
functionality split out from package.el.
|
||||
|
||||
* startup.el (command-line): Load packages after reading init
|
||||
file.
|
||||
* startup.el (command-line): Load packages after reading init file.
|
||||
|
||||
2010-06-17 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
|
|
@ -3434,8 +3453,8 @@
|
|||
2010-06-21 Dan Nicolaescu <dann@ics.uci.edu>
|
||||
|
||||
Fix reading file names in Git annotate buffers.
|
||||
* vc/vc-git.el (vc-git-annotate-extract-revision-at-line): Remove
|
||||
trailing whitespace. Suggested by Eric Hanchrow. (Bug#6481)
|
||||
* vc/vc-git.el (vc-git-annotate-extract-revision-at-line):
|
||||
Remove trailing whitespace. Suggested by Eric Hanchrow. (Bug#6481)
|
||||
|
||||
2010-06-20 Alan Mackenzie <acm@muc.de>
|
||||
|
||||
|
|
@ -6228,10 +6247,6 @@
|
|||
|
||||
* net/trampver.el: Update release number.
|
||||
|
||||
2010-03-24 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* Makefile.in (ELCFILES): Add cedet/semantic/imenu.el.
|
||||
|
||||
2010-03-24 Michael Albinus <michael.albinus@gmx.de>
|
||||
|
||||
* net/tramp.el (tramp-find-executable):
|
||||
|
|
|
|||
|
|
@ -382,9 +382,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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -635,18 +635,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'
|
||||
|
||||
|
|
|
|||
|
|
@ -285,7 +285,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)))
|
||||
|
|
|
|||
|
|
@ -162,8 +162,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.
|
||||
|
|
@ -175,8 +175,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."
|
||||
|
|
|
|||
|
|
@ -1,5 +1,13 @@
|
|||
2010-09-27 Michael Albinus <michael.albinus@gmx.de>
|
||||
|
||||
* dbusbind.c (syms_of_dbusbind): Set $DBUS_FATAL_WARNINGS to "0".
|
||||
(Bug#7113)
|
||||
|
||||
2010-09-27 Jan Djärv <jan.h.d@swipnet.se>
|
||||
|
||||
* xgselect.c (xg_select): Clear file descriptors not set from
|
||||
rfds and wfds.
|
||||
|
||||
* process.c (wait_reading_process_output): Add missing FD_CLR
|
||||
for write_mask (must mirror connect_wait_mask).
|
||||
|
||||
|
|
|
|||
|
|
@ -2161,8 +2161,12 @@ be called when the D-Bus reply 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. */
|
||||
setenv ("DBUS_FATAL_WARNINGS", "0", 1);
|
||||
#endif
|
||||
|
||||
Fprovide (intern_c_string ("dbusbind"), Qnil);
|
||||
|
|
|
|||
|
|
@ -109,11 +109,17 @@ xg_select (int max_fds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
|
|||
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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue