------------------------------------------------------------ revno: 116455 committer: Michael Albinus branch nick: trunk timestamp: Mon 2014-02-17 08:05:44 +0100 message: * automated/tramp-tests.el (tramp-test28-shell-command): Perform an initial `sit-for' prior the while loop. diff: === modified file 'test/ChangeLog' --- test/ChangeLog 2014-02-16 17:23:00 +0000 +++ test/ChangeLog 2014-02-17 07:05:44 +0000 @@ -1,3 +1,8 @@ +2014-02-17 Michael Albinus + + * automated/tramp-tests.el (tramp-test28-shell-command): Perform + an initial `sit-for' prior the while loop. + 2014-02-16 Michael Albinus Sync with Tramp 2.2.9. === modified file 'test/automated/tramp-tests.el' --- test/automated/tramp-tests.el 2014-02-16 17:23:00 +0000 +++ test/automated/tramp-tests.el 2014-02-17 07:05:44 +0000 @@ -1176,6 +1176,7 @@ (should (file-exists-p tmp-name)) (async-shell-command (format "ls %s" (file-name-nondirectory tmp-name)) (current-buffer)) + (sit-for 1 'nodisplay) (while (ignore-errors (memq (process-status (get-buffer-process (current-buffer))) '(run open))) @@ -1193,6 +1194,7 @@ (process-send-string (get-buffer-process (current-buffer)) (format "%s\n" (file-name-nondirectory tmp-name))) + (sit-for 1 'nodisplay) (while (ignore-errors (memq (process-status (get-buffer-process (current-buffer))) '(run open))) ------------------------------------------------------------ revno: 116454 committer: Glenn Morris branch nick: trunk timestamp: Sun 2014-02-16 18:12:50 -0800 message: Some doc for read-regexp * doc/lispref/minibuf.texi (Text from Minibuffer): Update read-regexp details. Mention read-regexp-defaults-function. * etc/NEWS: Related markup. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-02-13 08:26:01 +0000 +++ doc/lispref/ChangeLog 2014-02-17 02:12:50 +0000 @@ -1,3 +1,8 @@ +2014-02-17 Glenn Morris + + * minibuf.texi (Text from Minibuffer): Update read-regexp details. + Mention read-regexp-defaults-function. + 2014-02-13 Glenn Morris * debugging.texi (Debugger Commands): Tiny edits. === modified file 'doc/lispref/minibuf.texi' --- doc/lispref/minibuf.texi 2014-02-06 01:22:38 +0000 +++ doc/lispref/minibuf.texi 2014-02-17 02:12:50 +0000 @@ -211,40 +211,81 @@ @end smallexample @end defun -@defun read-regexp prompt &optional default history +@defun read-regexp prompt &optional defaults history This function reads a regular expression as a string from the -minibuffer and returns it. The argument @var{prompt} is used as in -@code{read-from-minibuffer}. - -The optional argument @var{default} specifies a default value to -return if the user enters null input; it should be a string, or -@code{nil}, which is equivalent to an empty string. +minibuffer and returns it. If the minibuffer prompt string +@var{prompt} does not end in @samp{:} (followed by optional +whitespace), the function adds @samp{: } to the end, preceded by the +default return value (see below), if that is non-empty. + +The optional argument @var{defaults} controls the default value to +return if the user enters null input, and should be one of: a string; +@code{nil}, which is equivalent to an empty string; a list of strings; +or a symbol. + +If @var{defaults} is a symbol, @code{read-regexp} consults the value +of the variable @code{read-regexp-defaults-function} (see below), and +if that is non-@code{nil} uses it in preference to @var{defaults}. +The value in this case should be either: + +@itemize @minus +@item +@code{regexp-history-last}, which means to use the first element of +the appropriate minibuffer history list (see below). + +@item +A function of no arguments, whose return value (which should be +@code{nil}, a string, or a list of strings) becomes the value of +@var{defaults}. +@end itemize + +@code{read-regexp} now ensures that the result of processing +@var{defaults} is a list (i.e., if the value is @code{nil} or a +string, it converts it to a list of one element). To this list, +@code{read-regexp} then appends a few potentially useful candidates for +input. These are: + +@itemize @minus +@item +The word or symbol at point. +@item +The last regexp used in an incremental search. +@item +The last string used in an incremental search. +@item +The last string or pattern used in query-replace commands. +@end itemize + +The function now has a list of regular expressions that it passes to +@code{read-from-minibuffer} to obtain the user's input. The first +element of the list is the default result in case of empty input. All +elements of the list are available to the user as the ``future +minibuffer history list'' (@pxref{Minibuffer History, future list,, +emacs, The GNU Emacs Manual}). The optional argument @var{history}, if non-@code{nil}, is a symbol specifying a minibuffer history list to use (@pxref{Minibuffer History}). If it is omitted or @code{nil}, the history list defaults to @code{regexp-history}. +@end defun -@code{read-regexp} also collects a few useful candidates for input and -passes them to @code{read-from-minibuffer}, to make them available to -the user as the ``future minibuffer history list'' (@pxref{Minibuffer -History, future list,, emacs, The GNU Emacs Manual}). These -candidates are: +@defvar read-regexp-defaults-function +The function @code{read-regexp} may use the value of this variable to +determine its list of default regular expressions. If non-@code{nil}, +the value of this variable should be either: @itemize @minus @item -The word or symbol at point. -@item -The last regexp used in an incremental search. -@item -The last string used in an incremental search. -@item -The last string or pattern used in query-replace commands. +The symbol @code{regexp-history-last}. + +@item +A function of no arguments that returns either @code{nil}, a string, +or a list of strings. @end itemize -This function works by calling the @code{read-from-minibuffer} -function, after computing the list of defaults as described above. -@end defun +@noindent +See @code{read-regexp} above for details of how these values are used. +@end defvar @defvar minibuffer-allow-text-properties If this variable is @code{nil}, then @code{read-from-minibuffer} === modified file 'etc/NEWS' --- etc/NEWS 2014-02-15 22:50:45 +0000 +++ etc/NEWS 2014-02-17 02:12:50 +0000 @@ -1097,6 +1097,7 @@ +++ ** New function `get-pos-property'. ++++ ** `read-regexp' now uses the new variable `read-regexp-defaults-function' as a function to call to provide default values. ------------------------------------------------------------ revno: 116453 committer: Michael Albinus branch nick: trunk timestamp: Sun 2014-02-16 18:23:00 +0100 message: Sync with Tramp 2.2.9. * doc/misc/trampver.texi: Update release number. * lisp/net/trampver.el: Update release number. * test/automated/tramp-tests.el (password-cache-expiry): Set to nil. (tramp-test28-shell-command): Make a while loop when waiting for process exit. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-02-16 14:52:43 +0000 +++ doc/misc/ChangeLog 2014-02-16 17:23:00 +0000 @@ -1,5 +1,9 @@ 2014-02-16 Michael Albinus + Sync with Tramp 2.2.9. + + * trampver.texi: Update release number. + * efaq-w32.texi (Tramp ssh): Remove also pscp1 and pscp2. 2014-02-14 Jay Belanger === modified file 'doc/misc/trampver.texi' --- doc/misc/trampver.texi 2014-01-01 07:43:34 +0000 +++ doc/misc/trampver.texi 2014-02-16 17:23:00 +0000 @@ -8,7 +8,7 @@ @c In the Tramp CVS, the version number is auto-frobbed from @c configure.ac, so you should edit that file and run @c "autoconf && ./configure" to change the version number. -@set trampver 2.2.9-pre +@set trampver 2.2.9 @c Other flags from configuration @set instprefix /usr/local === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-16 04:15:47 +0000 +++ lisp/ChangeLog 2014-02-16 17:23:00 +0000 @@ -1,3 +1,9 @@ +2013-10-02 Michael Albinus + + Sync with Tramp 2.2.9. + + * net/trampver.el: Update release number. + 2014-02-16 Dmitry Gutov * ido.el (ido-file-internal): Don't add the name of an existing === modified file 'lisp/net/trampver.el' --- lisp/net/trampver.el 2014-01-01 07:43:34 +0000 +++ lisp/net/trampver.el 2014-02-16 17:23:00 +0000 @@ -31,7 +31,7 @@ ;; should be changed only there. ;;;###tramp-autoload -(defconst tramp-version "2.2.9-pre" +(defconst tramp-version "2.2.9" "This version of Tramp.") ;;;###tramp-autoload @@ -44,7 +44,7 @@ (= emacs-major-version 21) (>= emacs-minor-version 4))) "ok" - (format "Tramp 2.2.9-pre is not fit for %s" + (format "Tramp 2.2.9 is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version))))))) (unless (string-match "\\`ok\\'" x) (error "%s" x))) === modified file 'test/ChangeLog' --- test/ChangeLog 2014-02-13 02:19:48 +0000 +++ test/ChangeLog 2014-02-16 17:23:00 +0000 @@ -1,3 +1,11 @@ +2014-02-16 Michael Albinus + + Sync with Tramp 2.2.9. + + * automated/tramp-tests.el (password-cache-expiry): Set to nil. + (tramp-test28-shell-command): Make a while loop when waiting for + process exit. + 2014-02-11 Michael Albinus * automated/tramp-tests.el (top): Require `vc', `vc-bzr', `vc-git' === modified file 'test/automated/tramp-tests.el' --- test/automated/tramp-tests.el 2014-02-11 08:31:39 +0000 +++ test/automated/tramp-tests.el 2014-02-16 17:23:00 +0000 @@ -53,7 +53,8 @@ (t (format "/ssh::%s" temporary-file-directory))) "Temporary directory for Tramp tests.") -(setq tramp-verbose 0 +(setq password-cache-expiry nil + tramp-verbose 0 tramp-message-show-message nil) ;; Disable interactive passwords in batch mode. @@ -1175,7 +1176,10 @@ (should (file-exists-p tmp-name)) (async-shell-command (format "ls %s" (file-name-nondirectory tmp-name)) (current-buffer)) - (sit-for 1 'nodisplay) + (while (ignore-errors + (memq (process-status (get-buffer-process (current-buffer))) + '(run open))) + (sit-for 1 'nodisplay)) (should (string-equal (format "%s\n" (file-name-nondirectory tmp-name)) (buffer-string)))) @@ -1189,7 +1193,10 @@ (process-send-string (get-buffer-process (current-buffer)) (format "%s\n" (file-name-nondirectory tmp-name))) - (sit-for 1 'nodisplay) + (while (ignore-errors + (memq (process-status (get-buffer-process (current-buffer))) + '(run open))) + (sit-for 1 'nodisplay)) (should (string-equal (format "%s\n" (file-name-nondirectory tmp-name)) (buffer-string)))) ------------------------------------------------------------ revno: 116452 committer: Michael Albinus branch nick: trunk timestamp: Sun 2014-02-16 15:52:43 +0100 message: * efaq-w32.texi (Tramp ssh): Remove also pscp1 and pscp2. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-02-14 02:35:59 +0000 +++ doc/misc/ChangeLog 2014-02-16 14:52:43 +0000 @@ -1,3 +1,7 @@ +2014-02-16 Michael Albinus + + * efaq-w32.texi (Tramp ssh): Remove also pscp1 and pscp2. + 2014-02-14 Jay Belanger * calc.texi (Single-Variable Statistics): Remove mention of === modified file 'doc/misc/efaq-w32.texi' --- doc/misc/efaq-w32.texi 2014-02-02 01:16:18 +0000 +++ doc/misc/efaq-w32.texi 2014-02-16 14:52:43 +0000 @@ -1781,8 +1781,6 @@ PuTTY @itemize @item @code{pscp} Uses pscp for copying, plink for shell operations. -@item @code{pscp1} pscp, with forced SSH protocol version 1 -@item @code{pscp2} pscp, with forced SSH protocol version 2 @item @code{plink} Uses plink with encoding on stdin/stdout for file transfer. @end itemize @end itemize ------------------------------------------------------------ revno: 116451 fixes bug: http://debbugs.gnu.org/16505 author: Anders Lindgern committer: Jan Djärv branch nick: trunk timestamp: Sun 2014-02-16 10:51:41 +0100 message: * nsterm.m (keyDown:): Check for normal key even if NSNumericPadKeyMask is set. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-02-16 05:43:44 +0000 +++ src/ChangeLog 2014-02-16 09:51:41 +0000 @@ -1,3 +1,8 @@ +2014-02-16 Anders Lindgern + + * nsterm.m (keyDown:): Check for normal key even if NSNumericPadKeyMask + is set (Bug#16505). + 2014-02-16 Daniel Colascione * dbusbind.c (xd_lisp_dbus_to_dbus): New function. === modified file 'src/nsterm.m' --- src/nsterm.m 2014-02-10 22:15:54 +0000 +++ src/nsterm.m 2014-02-16 09:51:41 +0000 @@ -5119,9 +5119,17 @@ /* (Carbon way: [theEvent keyCode]) */ /* is it a "function key"? */ - fnKeysym = (code < 0x00ff && (flags&NSNumericPadKeyMask)) - ? ns_convert_key ([theEvent keyCode] | NSNumericPadKeyMask) - : ns_convert_key (code); + /* Note: Sometimes a plain key will have the NSNumericPadKeyMask + flag set (this is probably a bug in the OS). + */ + if (code < 0x00ff && (flags&NSNumericPadKeyMask)) + { + fnKeysym = ns_convert_key ([theEvent keyCode] | NSNumericPadKeyMask); + } + if (fnKeysym == 0) + { + fnKeysym = ns_convert_key (code); + } if (fnKeysym) { ------------------------------------------------------------ revno: 116450 [merge] committer: Daniel Colascione branch nick: trunk timestamp: Sat 2014-02-15 21:46:05 -0800 message: Make closing dbus buses actually work diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-02-13 20:54:07 +0000 +++ src/ChangeLog 2014-02-16 05:43:44 +0000 @@ -1,3 +1,11 @@ +2014-02-16 Daniel Colascione + + * dbusbind.c (xd_lisp_dbus_to_dbus): New function. + (xd_get_connection_address): Use it. + (xd_close_bus): Use xd_lisp_dbus_to_dbus to instead of + xd_get_connection_address because the latter signals if the bus + we're trying to close is already disconnected. + 2014-02-13 Eli Zaretskii * w32proc.c (start_timer_thread): Pass a non-NULL pointer as last === modified file 'src/dbusbind.c' --- src/dbusbind.c 2014-01-01 07:43:34 +0000 +++ src/dbusbind.c 2014-02-16 05:43:44 +0000 @@ -973,6 +973,13 @@ return *refcount; } +/* Convert a Lisp dbus object to a pointer */ +static DBusConnection* +xd_lisp_dbus_to_dbus (Lisp_Object bus) +{ + return (DBusConnection *) (intptr_t) XFASTINT (bus); +} + /* Return D-Bus connection address. BUS is either a Lisp symbol, :system or :session, or a string denoting the bus address. */ static DBusConnection * @@ -985,7 +992,7 @@ if (NILP (val)) XD_SIGNAL2 (build_string ("No connection to bus"), bus); else - connection = (DBusConnection *) (intptr_t) XFASTINT (val); + connection = xd_lisp_dbus_to_dbus (val); if (!dbus_connection_get_is_connected (connection)) XD_SIGNAL2 (build_string ("No connection to bus"), bus); @@ -1080,14 +1087,21 @@ { DBusConnection *connection; Lisp_Object val; + Lisp_Object busobj; /* Check whether we are connected. */ val = Fassoc (bus, xd_registered_buses); if (NILP (val)) return; + busobj = CDR_SAFE(val); + if (NILP (val)) { + xd_registered_buses = Fdelete (val, xd_registered_buses); + return; + } + /* Retrieve bus address. */ - connection = xd_get_connection_address (bus); + connection = xd_lisp_dbus_to_dbus (busobj); if (xd_get_connection_references (connection) == 1) { ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.