From: Andreas Schwab Date: Wed, 9 Jun 2010 22:08:50 +0000 (+0200) Subject: Merge from emacs-23 X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/639b2760f19231881f753c8f1f7822eab457c751 Merge from emacs-23 --- 639b2760f19231881f753c8f1f7822eab457c751 diff --cc lisp/ChangeLog index 1d1ebbb844,d193663ed0..f02772f0c9 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,244 -1,45 +1,285 @@@ + 2010-06-09 Stefan Monnier + + * emacs-lisp/advice.el (ad-compile-function): + Define warning-suppress-types before we let-bind it (bug#6275). + + * vc-dispatcher.el: Rename mode-line-hook to vc-mode-line-hook; + declare it, make it buffer-local and permanent-local (bug#6324). + (vc-resynch-window): Adjust name. + * vc-hooks.el (vc-find-file-hook): Adjust name. + +2010-06-09 Michael Albinus + + * net/notifications.el (notifications-notify): Fix docstring. + +2010-06-09 Juanma Barranquero + + Update to Unicode 6.0.0 beta. + * international/charprop.el: Update copyright. + * international/mule-cmds.el (ucs-names): Update character ranges. + * international/uni-bidi.el: + * international/uni-category.el: + * international/uni-combining.el: + * international/uni-comment.el: + * international/uni-decimal.el: + * international/uni-decomposition.el: + * international/uni-digit.el: + * international/uni-lowercase.el: + * international/uni-mirrored.el: + * international/uni-name.el: + * international/uni-numeric.el: + * international/uni-old-name.el: + * international/uni-titlecase.el: + * international/uni-uppercase.el: Regenerate. + +2010-06-09 Juanma Barranquero + + * emacs-lisp/smie.el (comment-string-strip): Declare function. + (smie-precs-precedence-table): Fix typo in docstring. + + * vc-mtn.el (log-edit-extract-headers): Declare function. + + * vc-hg.el (log-edit-extract-headers): Remove duplicate declaration. + + * net/notifications.el (dbus-register-signal): Declare function. + (notifications-notify): Fix typos and reflow docstring. + +2010-06-09 Dan Nicolaescu + + Improve VC create/retrieve tag/branch. + * vc.el (vc-create-tag): Do not read the directory name for VCs + with repository revision granularity. Adjust the tag/branch + prompt. Reset VC properties. + (vc-retrieve-tag): Do not read the directory name for VCs + with repository revision granularity. Reset VC properties. + +2010-06-09 Julien Danjou + + * net/notifications.el: New file. + +2010-06-09 Dan Nicolaescu + + Add optional support for resetting VC properties. + * vc-dispatcher.el (vc-resynch-window): Add new optional argument, + call vc-file-clearprops when true. + (vc-resynch-buffer): Add new optional argument, pass it down. + (vc-resynch-buffers-in-directory): Likewise. + + Improve support for special markup in the VC commit message. + * vc-mtn.el (vc-mtn-checkin): Add support for Author: and Date: markup. + * vc-hg.el (vc-hg-checkin): Add support for Date:. + * vc-git.el (vc-git-checkin): + * vc-bzr.el (vc-bzr-checkin): Likewise. + +2010-06-09 Stefan Monnier + + * emacs-lisp/smie.el (smie-indent-keyword): Remove special case that + can be handled with a ((:before "fn") (:prev "=>" parent)) rule. + + 2010-06-07 Jonathan Rockway + + * net/rcirc.el: Add support for password authentication. + (rcirc-server-alist): Add :password keyword. + (rcirc): Ask for a password, or get it from the server's alist. + (rcirc-connect): Add password argument. Pass it to server. + +2010-06-07 Martin Pohlack + + * iimage.el: Remove images as soon as the underlying text is modified. + (iimage-modification-hook): New function. + (iimage-mode-buffer): Use it. + +2010-06-07 Stefan Monnier + + * emacs-lisp/smie.el (smie-indent-offset-rule): Rename from + smie-indent-offset-after. Add :prev case. Make a bit more generic. + (smie-indent-virtual): Remove `virtual' arg. Update callers. + (smie-indent-keyword): Add handling of open-paren keywords. + (smie-indent-comment-continue): Don't assume comment-continue. + +2010-06-07 Martin Rudalics + + * window.el (pop-to-buffer): Remove the conditional that + compares new-window and old-window, so it will reselect + the selected window unconditionally. + http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00078.html + +2010-06-07 Stefan Monnier + + * emacs-lisp/smie.el (smie-indent-offset-after) + (smie-indent-forward-token, smie-indent-backward-token): New functions. + (smie-indent-after-keyword): Use them. + (smie-indent-fixindent): Only applies to the indentation of the BOL. + (smie-indent-keyword): Tweak the black magic. + (smie-indent-comment-continue): Strip comment-continue before use. + (smie-indent-functions): Indent comments before keywords. + +2010-06-06 Juri Linkov + + * isearch.el (isearch-lazy-highlight-search): Fix looping + by checking for empty match. This syncs this loop with the + similar loop in `isearch-search'. (Bug#6362) + + 2010-06-05 Juanma Barranquero + + * net/dbus.el (dbus-register-method): Declare function. + (dbus-handle-event, dbus-property-handler): Fix typos in docstrings. + (dbus-introspect): Doc fix. + (dbus-event-bus-name, dbus-introspect-get-interface) + (dbus-introspect-get-argument): Reflow docstrings. + +2010-06-05 Dan Nicolaescu + + vc-log-incoming/vc-log-outgoing fixes for Git. + * vc-git.el (vc-git-log-view-mode): Fix font lock for + incoming/outgoing logs. + (vc-git-log-outgoing, vc-git-log-incoming): Use @{upstream} + instead of vc-git-compute-remote. + (vc-git-compute-remote): Remove. + + 2010-06-04 Chong Yidong + + * term/common-win.el (x-colors): Add "dark green" and "dark + turquoise" (Bug#6332). + +2010-06-04 Juri Linkov + + * simple.el (kill-new): Fix logic of kill-do-not-save-duplicates. + Instead of setting `replace' to t and replacing the same string + with itself, don't do certain actions when + kill-do-not-save-duplicates is non-nil and string is equal to car + of kill-ring: don't call menu-bar-update-yank-menu, don't push + interprogram-paste strings to kill-ring, and don't push the input + argument `string' to kill-ring. + http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00072.html + +2010-06-04 Juanma Barranquero + + * subr.el (directory-sep-char): Move from fileio.c and make a defconst. + +2010-06-04 Michael Albinus + + * net/tramp-gvfs.el (tramp-gvfs-handle-expand-file-name): Expand "~/". + (tramp-gvfs-handler-mounted-unmounted) + (tramp-gvfs-connection-mounted-p): Handle default-location. + + * net/tramp-smb.el (tramp-smb-handle-delete-directory): Don't try to + move files to trash. + +2010-06-04 Juanma Barranquero + + * international/mule-cmds.el (nonascii-insert-offset) + (nonascii-translation-table): Add obsolescence information. + + * international/mule.el (make-translation-table-from-vector): Doc fix. + + 2010-06-03 Eric Ludlam + + * cedet/semantic/lex-spp.el + (semantic-lex-spp-table-write-slot-value): Instead of erroring on + invalid values during save, just save a nil (Bug#6324). + + 2010-06-03 Glenn Morris + + * desktop.el (desktop-clear-preserve-buffers): + Add "*Warnings*" buffer. (Bug#6336) + -2010-06-02 Dan Nicolaescu +2010-06-03 Dan Nicolaescu + + vc-log-incoming/vc-log-outgoing improvements for Git. + * vc-git.el (vc-git-log-outgoing): Use the same format as the + short log. + (vc-git-log-incoming): Likewise. Run "git fetch" before the log command. + + Add bindings for vc-log-incoming and vc-log-outgoing. + * vc-hooks.el (vc-prefix-map): Add bindings for vc-log-incoming + and vc-log-outgoing. + * vc-dir.el (vc-dir-menu-map): Add menu bindings for vc-log-incoming + and vc-log-outgoing. + +2010-06-03 Chong Yidong + + * net/rcirc.el (rcirc-sort-nicknames): Remove. + (rcirc-handler-366): Always sort nicknames. + +2010-06-03 Juanma Barranquero + + * emacs-lisp/smie.el (comment-continue): Declare for byte-compiler. + +2010-06-03 Chong Yidong + + * net/rcirc.el (rcirc-nickname<, rcirc-sort-nicknames-join): Doc + fix. + +2010-06-03 Stefan Monnier + + * net/rcirc.el (rcirc-sort-nicknames): Change default. + (rcirc-sort-nicknames-join): Avoid setq. + +2010-06-03 Deniz Dogan + + * net/rcirc.el (rcirc-sort-nicknames): New custom. + (rcirc-nickname<, rcirc-sort-nicknames-join): New funs. + (rcirc-handler-366): Use them. + +2010-06-03 Stefan Monnier + + Split smie-indent-calculate into more manageable chunks. + * emacs-lisp/smie.el (smie-indent-virtual, smie-indent-fixindent) + (smie-indent-comment, smie-indent-after-keyword, smie-indent-keyword) + (smie-indent-close, smie-indent-comment-continue, smie-indent-bob) + (smie-indent-exps): Extract from smie-indent-calculate. + (smie-indent-functions): New var. + (smie-indent-functions): Use them. + +2010-06-02 Stefan Monnier + + * emacs-lisp/smie.el (smie-indent-hanging-p): Use smie-bolp. + (smie-indent-calculate): Simplify and cleanup. + +2010-06-02 Michael Albinus + + * net/tramp-gvfs.el (top): Require url-util. + (tramp-gvfs-mount-point): Remove. + (tramp-gvfs-stringify-dbus-message, tramp-gvfs-send-command): + New defuns. + (with-tramp-dbus-call-method): Format trace message. + (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. + (tramp-gvfs-handle-make-directory): Make more traces. + (tramp-gvfs-url-file-name): Hexify file name in url. + (tramp-gvfs-fuse-file-name): Take also prefix (like dav shares) + into account for the resulting file name. + (tramp-gvfs-handler-askquestion): 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. + (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 + "no" in interactive questions, for example). + +22010-06-02 Dan Nicolaescu + + * log-edit.el (log-edit-font-lock-keywords): Make group 4 match lax. + +2010-06-01 Juanma Barranquero + + * emacs-lisp/eldoc.el: Add completions for new commands left-* and + right-*. (Bug#6265) + +2010-06-01 Dan Nicolaescu + + Add support for vc-log-incoming, improve vc-log-outgoing for Git. + * vc-git.el (vc-git-compute-remote): New function. + (vc-git-log-outgoing): Use it instead of hard coding a value. + (vc-git-log-incoming): New function. + + Improve state updating for VC tag commands. + * vc.el (vc-create-tag, vc-retrieve-tag): Call vc-resynch-buffer + to update the state of all buffers in the directory. * vc-dir.el (vc-dir-update): Remove entries with a nil state (bug#5539). diff --cc lisp/net/rcirc.el index 7761bbc650,17e36855ac..60c34c879f --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@@ -99,8 -99,8 +104,9 @@@ connected to automatically. :value-type (plist :options ((:nick string) (:port integer) (:user-name string) + (:password string) (:full-name string) + (:pass string) (:channels (repeat string))))) :group 'rcirc) @@@ -426,10 -423,10 +432,11 @@@ If ARG is non-nil, instead prompt for c (port (or (plist-get (cdr c) :port) rcirc-default-port)) (user-name (or (plist-get (cdr c) :user-name) rcirc-default-user-name)) + (pass (plist-get (cdr c) :pass)) (full-name (or (plist-get (cdr c) :full-name) rcirc-default-full-name)) - (channels (plist-get (cdr c) :channels))) + (channels (plist-get (cdr c) :channels)) + (password (plist-get (cdr c) :password))) (when server (let (connected) (dolist (p (rcirc-process-list)) @@@ -437,8 -434,8 +444,8 @@@ (setq connected p))) (if (not connected) (condition-case e - (rcirc-connect server port nick user-name + (rcirc-connect server port nick user-name pass - full-name channels) + full-name channels password) (quit (message "Quit connecting to %s" server))) (with-current-buffer (process-buffer connected) (setq connected-servers diff --cc lisp/vc-dispatcher.el index 00c580c263,0c3820bc52..d5def4459d --- a/lisp/vc-dispatcher.el +++ b/lisp/vc-dispatcher.el @@@ -446,7 -454,11 +446,11 @@@ ARG and NO-CONFIRM are passed on to `re (revert-buffer arg no-confirm t)) (vc-restore-buffer-context context))) + (defvar vc-mode-line-hook nil) + (make-variable-buffer-local 'vc-mode-line-hook) + (put 'vc-mode-line-hook 'permanent-local t) + -(defun vc-resynch-window (file &optional keep noquery) +(defun vc-resynch-window (file &optional keep noquery reset-vc-info) "If FILE is in the current buffer, either revert or unvisit it. The choice between revert (to see expanded keywords) and unvisit depends on KEEP. NOQUERY if non-nil inhibits confirmation for diff --cc src/ChangeLog index 070ce4d308,35d68ae259..e089309900 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,148 -1,25 +1,170 @@@ + 2010-06-09 Stefan Monnier + + * dbusbind.c (xd_append_arg): Don't "make-unibyte" the string. + Check `object's type before accessing its guts. + +2010-06-09 Dan Nicolaescu + + * s/usg5-4.h: Fix previous change. + Suggested by Lawrence Mitchell + + 2010-06-08 Andreas Schwab + + * minibuf.c (Fall_completions): Add more checks. + + 2010-06-08 Juanma Barranquero + + * minibuf.c (Fall_completions): Check COLLECTION's size (bug#6378). + +2010-06-08 Dan Nicolaescu + + * lread.c (X_OK): Remove, unused. + + * dispnew.c: Remove obsolete comment. + + Remove INCLUDED_FCNTL. + * xterm.c (INCLUDED_FCNTL): + * callproc.c (INCLUDED_FCNTL): + * alloc.c (INCLUDED_FCNTL): + * systty.h (INCLUDED_FCNTL): Remove all uses, not needed anymore. + (emacs_get_tty, emacs_set_tty): Declare unconditionally. + +2010-06-07 Martin Rudalics + + * window.c (Fselect_window): Move `record_buffer' up to the + beginning of this function, so the buffer gets recorded + even if the selected window does not change. + http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00137.html + +2010-06-07 Juanma Barranquero + + * cmds.c (Fforward_char, Fbackward_char): Fix typos in docstrings. + (Fforward_line, Fbeginning_of_line): Reflow docstrings. + +2010-06-06 Dan Nicolaescu + + Remove BSTRING related code, all platforms define it. + * s/usg5-4.h (BSTRING): Remove definition. + * s/template.h (BSTRING): + * s/msdos.h (BSTRING): + * s/ms-w32.h (BSTRING): + * s/hpux10-20.h (BSTRING): + * s/gnu-linux.h (BSTRING): + * s/darwin.h (BSTRING): + * s/cygwin.h (BSTRING): + * s/bsd-common.h (BSTRING): + * s/aix4-2.h (BSTRING): Likewise. + * sysdep.c: Remove code depending on BSTRING not being defined. + +2010-06-05 Juanma Barranquero + + Remove obsolete macro BASE_LEADING_CODE_P. + * character.h (BASE_LEADING_CODE_P): Remove. + * regex.c [!emacs] (BASE_LEADING_CODE_P): Remove. + * buffer.c (Fset_buffer_multibyte): + * indent.c (scan_for_column, compute_motion): + * insdel.c (count_combining_before, count_combining_after): + Use LEADING_CODE_P instead of BASE_LEADING_CODE_P. + +2010-06-04 Juanma Barranquero + + Turn `directory-sep-char' into a noop. + + * lisp.h [WINDOWSNT] (Vdirectory_sep_char): Don't declare. + (DIRECTORY_SEP): Define unconditionally. + + * s/ms-w32.h (DIRECTORY_SEP): Remove. + + * emacs.c (decode_env_path): Don't check DIRECTORY_SEP, + call dostounix_filename directly. + + * fileio.c (CORRECT_DIR_SEPS): Remove. + (Ffile_name_directory, directory_file_name, Fexpand_file_name) + (Fsubstitute_in_file_name): Use dostounix_filename instead. + (file_name_as_directory): Use dostounix_filename, DIRECTORY_SEP. + (syms_of_fileio) : Move to subr.el. + + * w32proc.c (CORRECT_DIR_SEPS): Remove. + (Fw32_short_file_name, Fw32_long_file_name): Use dostounix_filename. + + 2010-06-03 Andreas Schwab + + * process.c (conv_lisp_to_sockaddr): Fix conversion of IPv4 + address. (Bug#6346) + + 2010-06-03 Juanma Barranquero + + * ccl.c (Fccl_program_p): Fix typo in docstring. + +2010-06-03 Dan Nicolaescu + + Move UNEXEC definition to autoconf. + * s/usg5-4.h (UNEXEC): Remove, move to configure.in. + * s/sol2-10.h (UNEXEC): + * s/irix6-5.h (UNEXEC): + * s/hpux10-20.h (UNEXEC): + * s/gnu-linux.h (UNEXEC): + * s/darwin.h (UNEXEC): + * s/cygwin.h (UNEXEC): + * s/bsd-common.h (UNEXEC): + * s/aix4-2.h (UNEXEC): + * m/alpha.h (UNEXEC): Likewise. + * Makefile.in (UNEXEC_OBJ): Define using @UNEXEC_OBJ@. + +2010-06-03 Juanma Barranquero + + Remove obsolete pre-unicode2 macros. + * character.h (MULTIBYTE_FORM_LENGTH, PARSE_MULTIBYTE_SEQ): Remove. + * composite.c (composition_reseat_it): + * data.c (Faset): + * fns.c (Ffillarray): + * regex.c (re_search_2): Use BYTES_BY_CHAR_HEAD. + [!emacs] (BYTES_BY_CHAR_HEAD): Define instead of MULTIBYTE_FORM_LENGTH. + +2010-06-03 Juri Linkov + + * buffer.c (Fother_buffer): Add CHECK_FRAME. + (Fswitch_to_buffer): Remove unused variable `err'. + +2010-06-03 Glenn Morris + + * m/template.h (NO_SOCK_SIGIO): Remove, no longer used. + + * m/hp800.h (alloca) [__NetBSD__ && __GNUC__]: No need to define it, + now that AH_BOTTOM does it. + + * m/hp800.h (HAVE_ALLOCA): + * m/ibms390x.h (HAVE_ALLOCA): Do not define, no longer needed. + + * m/ia64.h, s/gnu-linux.h, s/gnu.h, s/netbsd.h, s/usg5-4.h: + Remove NOT_C_CODE tests, it is always true now. + +2010-06-02 Dan Nicolaescu + + Fix config.h includes. + * xsettings.c: + * xgselect.c: + * nsterm.m: + * nsselect.m: + * nsimage.m: + * nsfont.m: + * nsfns.m: + * dbusbind.c: Use #include instead of "config.h" as all + other files do. + + * gmalloc.c: Remove BROKEN_PROTOTYPES reference, unused. + + * s/sol2-6.h: Remove obsolete comments. + + Remove unnecessary alloca.h includes. + * keymap.c: Do not include alloca.h, config.h does that. + * sysdep.c: Likewise. Do not define fwrite, not used. + +2010-06-01 Stefan Monnier + + * sysdep.c (child_setup_tty): Move the non-canonical initialization to + the HAVE_TERMIO where it belongs (bug#6149). + 2010-05-31 Stefan Monnier * keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread