------------------------------------------------------------ revno: 115053 committer: Michael Albinus branch nick: trunk timestamp: Sun 2013-11-10 09:35:04 +0100 message: * net/tramp.el (tramp-methods): * net/tramp-sh.el (tramp-compute-multi-hops): Revert change of 2013-10-29 (r114834). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-09 10:49:42 +0000 +++ lisp/ChangeLog 2013-11-10 08:35:04 +0000 @@ -1,3 +1,9 @@ +2013-11-10 Michael Albinus + + * net/tramp.el (tramp-methods): + * net/tramp-sh.el (tramp-compute-multi-hops): Revert change of + 2013-10-29 (r114834). + 2013-11-09 Andreas Schwab * progmodes/sh-script.el (sh-font-lock-keywords-var): Force === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2013-11-08 09:31:50 +0000 +++ lisp/net/tramp-sh.el 2013-11-10 08:35:04 +0000 @@ -4285,10 +4285,6 @@ (or ;; There are multi-hops. (cdr target-alist) - ;; This method explicitly has an explicit allowability check. - (let ((checker (tramp-get-method-parameter - method 'tramp-hostname-checker))) - (when checker (funcall checker v host method) t)) ;; The host name is used for the remote shell command. (member '("%h") (tramp-get-method-parameter method 'tramp-login-args)) === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2013-11-05 14:18:41 +0000 +++ lisp/net/tramp.el 2013-11-10 08:35:04 +0000 @@ -265,15 +265,6 @@ In general, the global default value shall be used, but for some methods, like \"su\" or \"sudo\", a shorter timeout might be desirable. - * `tramp-hostname-checker' - This is a function that tramp calls while setting - up a connection. It is called with three arguments: - the target, the host, and the method description. If - the hostname is unacceptable, this function should signal - using `tramp-error'. If a method does not provide - a value here, then Tramp looks at whether the method's - login program uses a \"%h\" parameter. If not, then Tramp - requires that the given hostname match `tramp-local-host-regexp'. What does all this mean? Well, you should specify `tramp-login-program' for all methods; this program is used to log in to the remote site. Then, ------------------------------------------------------------ revno: 115052 fixes bug: http://debbugs.gnu.org/15841 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2013-11-09 23:24:10 +0200 message: Fix bug #15841 with missing line numbers in linum-mode. src/search.c (find_newline): If buffer text is relocated during the "dumb loop", adjust C pointers into buffer text to follow suit. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-09 11:19:53 +0000 +++ src/ChangeLog 2013-11-09 21:24:10 +0000 @@ -1,3 +1,9 @@ +2013-11-09 Eli Zaretskii + + * search.c (find_newline): If buffer text is relocated during the + "dumb loop", adjust C pointers into buffer text to follow suit. + (Bug#15841) + 2013-11-09 Łukasz Stelmach (tiny change) * gtkutil.c (xg_check_special_colors): Use rgb: instead of rgbi: === modified file 'src/search.c' --- src/search.c 2013-08-29 07:03:18 +0000 +++ src/search.c 2013-11-09 21:24:10 +0000 @@ -752,6 +752,22 @@ *bytepos = nl + 1 - base + start_byte; return BYTE_TO_CHAR (nl + 1 - base + start_byte); } + if (newline_cache) + { + /* The call to know_region_cache could have + allocated memory and caused relocation of buffer + text. If it did, adjust pointers into buffer + text. */ + ptrdiff_t offset = BYTE_POS_ADDR (start_byte) - base; + + if (offset != 0) + { + cursor += offset; + base += offset; + ceiling_addr += offset; + nl += offset; + } + } cursor = nl + 1; } @@ -824,6 +840,18 @@ *bytepos = nl - base + start_byte; return BYTE_TO_CHAR (nl - base + start_byte); } + if (newline_cache) + { + ptrdiff_t offset = BYTE_POS_ADDR (start_byte - 1) - base; + + if (offset != 0) + { + cursor += offset; + base += offset; + ceiling_addr += offset; + nl += offset; + } + } cursor = nl - 1; } ------------------------------------------------------------ revno: 115051 fixes bug: http://debbugs.gnu.org/15837 committer: Jan D. branch nick: trunk timestamp: Sat 2013-11-09 12:19:53 +0100 message: * gtkutil.c (xg_check_special_colors): Use rgb: instead of rgbi: for conversion. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-09 11:12:33 +0000 +++ src/ChangeLog 2013-11-09 11:19:53 +0000 @@ -1,3 +1,8 @@ +2013-11-09 Łukasz Stelmach (tiny change) + + * gtkutil.c (xg_check_special_colors): Use rgb: instead of rgbi: + for conversion (Bug#15837). + 2013-11-09 Eli Zaretskii * fileio.c (Finsert_file_contents): Invalidate the newline cache === modified file 'src/gtkutil.c' --- src/gtkutil.c 2013-10-29 16:08:08 +0000 +++ src/gtkutil.c 2013-11-09 11:19:53 +0000 @@ -598,14 +598,17 @@ GtkStyleContext *gsty = gtk_widget_get_style_context (FRAME_GTK_OUTER_WIDGET (f)); GdkRGBA col; - char buf[sizeof "rgbi://" + 3 * (DBL_MAX_10_EXP + sizeof "-1.000000" - 1)]; + char buf[sizeof "rgb://rrrr/gggg/bbbb"]; int state = GTK_STATE_FLAG_SELECTED|GTK_STATE_FLAG_FOCUSED; if (get_fg) gtk_style_context_get_color (gsty, state, &col); else gtk_style_context_get_background_color (gsty, state, &col); - sprintf (buf, "rgbi:%lf/%lf/%lf", col.red, col.green, col.blue); + sprintf (buf, "rgb:%04x/%04x/%04x", + (int)(col.red * 65535), + (int)(col.green * 65535), + (int)(col.blue * 65535)); success_p = (XParseColor (FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f), buf, color) != 0); ------------------------------------------------------------ revno: 115050 fixes bug: http://debbugs.gnu.org/15841 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2013-11-09 13:12:33 +0200 message: Fix bug #15841 with cache-long-scans, linum-mode, and non-ASCII chars. src/fileio.c (Finsert_file_contents): Invalidate the newline cache for the entire range of inserted characters. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-08 17:26:03 +0000 +++ src/ChangeLog 2013-11-09 11:12:33 +0000 @@ -1,3 +1,8 @@ +2013-11-09 Eli Zaretskii + + * fileio.c (Finsert_file_contents): Invalidate the newline cache + for the entire range of inserted characters. (Bug#15841) + 2013-11-08 Jan Djärv * xfaces.c (lface_fully_specified_p): Let distant-foreground be === modified file 'src/fileio.c' --- src/fileio.c 2013-11-06 18:41:31 +0000 +++ src/fileio.c 2013-11-09 11:12:33 +0000 @@ -49,6 +49,7 @@ #include "coding.h" #include "window.h" #include "blockinput.h" +#include "region-cache.h" #include "frame.h" #include "dispextern.h" @@ -4476,6 +4477,14 @@ report_file_errno ("Opening input file", orig_filename, save_errno); } + /* We made a lot of deletions and insertions above, so invalidate + the newline cache for the entire region of the inserted + characters. */ + if (current_buffer->newline_cache) + invalidate_region_cache (current_buffer, + current_buffer->newline_cache, + PT - BEG, Z - PT - inserted); + if (read_quit) Fsignal (Qquit, Qnil); ------------------------------------------------------------ revno: 115049 committer: Andreas Schwab branch nick: emacs timestamp: Sat 2013-11-09 11:49:42 +0100 message: * progmodes/sh-script.el (sh-font-lock-keywords-var): Force highlighting text after Summary keyword in doc face for rpm. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-09 01:12:25 +0000 +++ lisp/ChangeLog 2013-11-09 10:49:42 +0000 @@ -1,3 +1,8 @@ +2013-11-09 Andreas Schwab + + * progmodes/sh-script.el (sh-font-lock-keywords-var): Force + highlighting text after Summary keyword in doc face for rpm. + 2013-11-09 Dmitry Gutov * textmodes/ispell.el (ispell-lookup-words): When `look' is not === modified file 'lisp/progmodes/sh-script.el' --- lisp/progmodes/sh-script.el 2013-11-08 04:33:32 +0000 +++ lisp/progmodes/sh-script.el 2013-11-09 10:49:42 +0000 @@ -942,6 +942,7 @@ (rpm sh-append rpm2 ("%{?\\(\\sw+\\)" 1 font-lock-keyword-face)) (rpm2 sh-append shell + ("^Summary:\\(.*\\)$" (1 font-lock-doc-face t)) ("^\\(\\sw+\\):" 1 font-lock-variable-name-face))) "Default expressions to highlight in Shell Script modes. See `sh-feature'.") ------------------------------------------------------------ revno: 115048 committer: Xue Fuqiao branch nick: trunk timestamp: Sat 2013-11-09 15:19:16 +0800 message: Add an cross-reference. * doc/lispref/os.texi (Command-Line Arguments): Add cross-reference for `dump-emacs'. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-11-09 05:38:28 +0000 +++ doc/lispref/ChangeLog 2013-11-09 07:19:16 +0000 @@ -2,6 +2,7 @@ * os.texi (Startup Summary): Add an index about startup screen. Typo fix. + (Command-Line Arguments): Add cross-reference for `dump-emacs'. 2013-11-08 Eli Zaretskii === modified file 'doc/lispref/os.texi' --- doc/lispref/os.texi 2013-11-09 05:38:28 +0000 +++ doc/lispref/os.texi 2013-11-09 07:19:16 +0000 @@ -517,9 +517,10 @@ The value of this variable is @code{t} once the command line has been processed. -If you redump Emacs by calling @code{dump-emacs}, you may wish to set -this variable to @code{nil} first in order to cause the new dumped Emacs -to process its new command-line arguments. +If you redump Emacs by calling @code{dump-emacs} (@pxref{Building +Emacs}), you may wish to set this variable to @code{nil} first in +order to cause the new dumped Emacs to process its new command-line +arguments. @end defvar @defvar command-switch-alist