------------------------------------------------------------ revno: 116153 fixes bug: http://debbugs.gnu.org/16479 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2014-01-25 10:25:51 +0200 message: Fix bug #16479 with client connections while TTY menu is open. src/term.c (read_menu_input): If the selected frame changes, exit the menu. (tty_menu_show): If the selected frame changes while we displayed a menu, throw to top level. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-25 03:48:29 +0000 +++ src/ChangeLog 2014-01-25 08:25:51 +0000 @@ -1,3 +1,10 @@ +2014-01-25 Eli Zaretskii + + * term.c (read_menu_input): If the selected frame changes, exit + the menu. + (tty_menu_show): If the selected frame changes while we displayed + a menu, throw to top level. (Bug#16479) + 2014-01-25 Stefan Monnier * eval.c (Fsignal): Fix `debug' handling to match 2013-10-03 change. === modified file 'src/term.c' --- src/term.c 2014-01-01 07:43:34 +0000 +++ src/term.c 2014-01-25 08:25:51 +0000 @@ -3124,7 +3124,11 @@ tty->showing_menu = 0; do_mouse_tracking = saved_mouse_tracking; - if (EQ (cmd, Qt) || EQ (cmd, Qtty_menu_exit)) + if (EQ (cmd, Qt) || EQ (cmd, Qtty_menu_exit) + /* If some input switched frames under our feet, exit the + menu, since the menu faces are no longer valid, and the + menu is no longer relevant anyway. */ + || sf != SELECTED_FRAME ()) return MI_QUIT_MENU; if (EQ (cmd, Qtty_menu_mouse_movement)) mouse_get_xy (x, y); @@ -3791,6 +3795,11 @@ case TTYM_IA_SELECT: break; case TTYM_NO_SELECT: + /* If the selected frame was changed while we displayed a menu, + throw to top level in order to undo any temporary settings + made by TTY menu code. */ + if (f != SELECTED_FRAME ()) + Ftop_level (); /* Make "Cancel" equivalent to C-g unless FOR_CLICK (which means the menu was invoked with a mouse event as POSITION). */ if (! for_click) ------------------------------------------------------------ revno: 116152 committer: Xue Fuqiao branch nick: trunk timestamp: Sat 2014-01-25 12:53:33 +0800 message: * doc/misc/cc-mode.texi (Minor Modes): Minor fix. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-01-24 22:15:29 +0000 +++ doc/misc/ChangeLog 2014-01-25 04:53:33 +0000 @@ -1,3 +1,7 @@ +2014-01-25 Xue Fuqiao + + * cc-mode.texi (Minor Modes): Minor fix. + 2014-01-24 David Engster * eieio.texi (Introduction): Fix references. === modified file 'doc/misc/cc-mode.texi' --- doc/misc/cc-mode.texi 2014-01-06 05:25:46 +0000 +++ doc/misc/cc-mode.texi 2014-01-25 04:53:33 +0000 @@ -1173,7 +1173,7 @@ configure @ccmode{} so that it starts up with your favorite combination of them (@pxref{Sample Init File}). By default, when you initialize a buffer, electric mode and syntactic-indentation mode -are enabled but the other two modes are disabled. +are enabled but the other three modes are disabled. @ccmode{} displays the current state of the first four of these minor modes on the modeline by appending letters to the major mode's name, ------------------------------------------------------------ revno: 116151 committer: Stefan Monnier branch nick: trunk timestamp: Fri 2014-01-24 22:48:29 -0500 message: * src/eval.c (Fsignal): Fix `debug' handling to match 2013-10-03 change. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-24 20:55:22 +0000 +++ src/ChangeLog 2014-01-25 03:48:29 +0000 @@ -1,3 +1,7 @@ +2014-01-25 Stefan Monnier + + * eval.c (Fsignal): Fix `debug' handling to match 2013-10-03 change. + 2014-01-24 Paul Eggert Fix bool-vector-count-population bug on MinGW64 (Bug#16535). === modified file 'src/eval.c' --- src/eval.c 2014-01-01 07:43:34 +0000 +++ src/eval.c 2014-01-25 03:48:29 +0000 @@ -1533,8 +1533,8 @@ || NILP (clause) /* A `debug' symbol in the handler list disables the normal suppression of the debugger. */ - || (CONSP (clause) && CONSP (XCAR (clause)) - && !NILP (Fmemq (Qdebug, XCAR (clause)))) + || (CONSP (clause) && CONSP (clause) + && !NILP (Fmemq (Qdebug, clause))) /* Special handler that means "print a message and run debugger if requested". */ || EQ (h->tag_or_ch, Qerror))) === modified file 'src/xdisp.c' --- src/xdisp.c 2014-01-24 03:53:16 +0000 +++ src/xdisp.c 2014-01-25 03:48:29 +0000 @@ -2804,8 +2804,9 @@ it->redisplay_end_trigger_charpos = marker_position (w->redisplay_end_trigger); else if (INTEGERP (w->redisplay_end_trigger)) - it->redisplay_end_trigger_charpos = - clip_to_bounds (PTRDIFF_MIN, XINT (w->redisplay_end_trigger), PTRDIFF_MAX); + it->redisplay_end_trigger_charpos + = clip_to_bounds (PTRDIFF_MIN, XINT (w->redisplay_end_trigger), + PTRDIFF_MAX); it->tab_width = SANE_TAB_WIDTH (current_buffer); ------------------------------------------------------------ revno: 116150 committer: Xue Fuqiao branch nick: trunk timestamp: Sat 2014-01-25 11:00:52 +0800 message: Typo fix. diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-01-24 07:45:40 +0000 +++ etc/NEWS 2014-01-25 03:00:52 +0000 @@ -219,7 +219,7 @@ and `eval-print-last-sexp' (`C-j' in Lisp Interaction mode) can take a zero prefix argument. This disables truncation of lists in the output, equivalent to setting `(eval-expression-)print-length' and -`(eval-expression-)print-limit' to nil. Additionally, it causes integers +`(eval-expression-)print-level' to nil. Additionally, it causes integers to be printed in other formats (octal, hexadecimal, and character). --- ------------------------------------------------------------ revno: 116149 fixes bug: http://debbugs.gnu.org/16537 author: Adam Sjogren committer: Lars Ingebrigtsen branch nick: trunk timestamp: Fri 2014-01-24 17:52:16 -0700 message: * net/shr.el (shr-tag-img): Prefer the title over the alt text. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-24 07:29:39 +0000 +++ lisp/ChangeLog 2014-01-25 00:52:16 +0000 @@ -1,3 +1,8 @@ +2014-01-25 Adam Sjøgren + + * net/shr.el (shr-tag-img): Prefer the title over the alt text + (bug#16537). + 2014-01-24 Juanma Barranquero * net/eww.el (eww-download-callback): === modified file 'lisp/net/shr.el' --- lisp/net/shr.el 2014-01-12 23:34:33 +0000 +++ lisp/net/shr.el 2014-01-25 00:52:16 +0000 @@ -1228,7 +1228,9 @@ (put-text-property start (point) 'image-url url) (put-text-property start (point) 'image-displayer (shr-image-displayer shr-content-function)) - (put-text-property start (point) 'help-echo alt)) + (put-text-property start (point) 'help-echo + (or (cdr (assq :title cont)) + alt))) (setq shr-state 'image))))) (defun shr-tag-pre (cont) ------------------------------------------------------------ revno: 116148 committer: David Engster branch nick: trunk timestamp: Fri 2014-01-24 23:15:29 +0100 message: Fix references in EIEIO documentation. * eieio.texi (Introduction): Fix references. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-01-24 07:36:34 +0000 +++ doc/misc/ChangeLog 2014-01-24 22:15:29 +0000 @@ -1,3 +1,7 @@ +2014-01-24 David Engster + + * eieio.texi (Introduction): Fix references. + 2014-01-24 Glenn Morris * efaq.texi (Termcap/Terminfo entries for Emacs): === modified file 'doc/misc/eieio.texi' --- doc/misc/eieio.texi 2014-01-24 18:32:25 +0000 +++ doc/misc/eieio.texi 2014-01-24 22:15:29 +0000 @@ -185,8 +185,8 @@ especially if you only know OOP from languages like C++ or Java. If on the other hand you are already familiar with CLOS, you should be aware that @eieio{} does not implement the full CLOS specification and -also differs in some other aspects (@xref{Introduction}, and @ref{CLOS -compatibility}). +also differs in some other aspects which are mentioned below (also +@pxref{CLOS compatibility}). @eieio{} supports the following features: ------------------------------------------------------------ revno: 116147 fixes bug: http://debbugs.gnu.org/16535 committer: Paul Eggert branch nick: trunk timestamp: Fri 2014-01-24 12:55:22 -0800 message: Fix bool-vector-count-population bug on MinGW64. * data.c (count_one_bits_word): Fix bug (negated comparison) when BITS_PER_ULL < BITS_PER_BITS_WORD. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-24 03:53:16 +0000 +++ src/ChangeLog 2014-01-24 20:55:22 +0000 @@ -1,3 +1,9 @@ +2014-01-24 Paul Eggert + + Fix bool-vector-count-population bug on MinGW64 (Bug#16535). + * data.c (count_one_bits_word): Fix bug (negated comparison) + when BITS_PER_ULL < BITS_PER_BITS_WORD. + 2014-01-24 Dmitry Antipov * xdisp.c (reseat_1, Fcurrent_bidi_paragraph_direction): Avoid === modified file 'src/data.c' --- src/data.c 2014-01-03 06:47:27 +0000 +++ src/data.c 2014-01-24 20:55:22 +0000 @@ -3012,7 +3012,7 @@ { int i = 0, count = 0; while (count += count_one_bits_ll (w), - BITS_PER_BITS_WORD <= (i += BITS_PER_ULL)) + (i += BITS_PER_ULL) < BITS_PER_BITS_WORD) w = shift_right_ull (w); return count; } ------------------------------------------------------------ revno: 116146 committer: Paul Eggert branch nick: trunk timestamp: Fri 2014-01-24 10:36:44 -0800 message: Remove stray ".". diff: === modified file 'doc/emacs/ack.texi' --- doc/emacs/ack.texi 2014-01-24 07:36:34 +0000 +++ doc/emacs/ack.texi 2014-01-24 18:36:44 +0000 @@ -823,7 +823,7 @@ @ignore @c Obsolete since 24.4 ; and @file{terminal.el}, a terminal emulator for Emacs subprocesses. -@end ignore. +@end ignore @item Gerd Möllmann was the Emacs maintainer from the beginning of Emacs 21 ------------------------------------------------------------ revno: 116145 committer: Paul Eggert branch nick: trunk timestamp: Fri 2014-01-24 10:32:25 -0800 message: Spelling fix. diff: === modified file 'doc/misc/eieio.texi' --- doc/misc/eieio.texi 2014-01-22 21:50:47 +0000 +++ doc/misc/eieio.texi 2014-01-24 18:32:25 +0000 @@ -1555,7 +1555,7 @@ information about a class. If you call it on a constructor function, it will also display the class information. If you call it on a generic function, all implementations of that generic function will be -listet, together with links through which you can directly jump to the +listed, together with links through which you can directly jump to the source. @node Default Superclass ------------------------------------------------------------ revno: 116144 committer: Bastien Guerry branch nick: trunk timestamp: Fri 2014-01-24 17:05:12 +0100 message: * editfns.c (Fconstrain_to_field): Fix typo in docstring. diff: === modified file 'src/editfns.c' --- src/editfns.c 2014-01-01 07:43:34 +0000 +++ src/editfns.c 2014-01-24 16:05:12 +0000 @@ -646,7 +646,7 @@ If the optional argument ONLY-IN-LINE is non-nil and constraining NEW-POS would move it to a different line, NEW-POS is returned -unconstrained. This useful for commands that move by line, like +unconstrained. This is useful for commands that move by line, like \\[next-line] or \\[beginning-of-line], which should generally respect field boundaries only in the case where they can still move to the right line. ------------------------------------------------------------ revno: 116143 committer: Glenn Morris branch nick: trunk timestamp: Thu 2014-01-23 23:45:40 -0800 message: * etc/NEWS: Fix typos diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-01-24 07:41:42 +0000 +++ etc/NEWS 2014-01-24 07:45:40 +0000 @@ -135,7 +135,7 @@ *** The functions `display-pixel-width' and `display-pixel-height' now behave consistently among the platforms: they return the pixel width or height for all physical monitors associated with the given display -as just they were on X11. To get information for each physical +as if they were on X11. To get information for each physical monitor, use the new functions above. Similar notes also apply to `x-display-pixel-width', `x-display-pixel-height', `display-mm-width', `display-mm-height', `x-display-mm-width', and `x-display-mm-height'. @@ -251,7 +251,7 @@ at point. +++ -*** `load-prefer-newer', affects how the `load' function chooses the +*** `load-prefer-newer' affects how the `load' function chooses the file to load. If this is non-nil, then when both .el and .elc versions of a file exist, and the caller did not explicitly specify which one to load, then the newer file is loaded. The default, nil,