------------------------------------------------------------ revno: 115765 committer: Chong Yidong branch nick: trunk timestamp: Fri 2013-12-27 11:38:26 +0800 message: More doc updates * commands.texi (Reading One Event): Mention keyboard coding. * functions.texi (Function Cells): * eval.texi (Function Indirection): Update for the fact that symbol-function no longer signals an error. * keymaps.texi (Translation Keymaps, Translation Keymaps): * nonascii.texi (Terminal I/O Encoding): Copyedits. * data.c (Fsymbol_function): Doc fix. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-12-26 03:27:45 +0000 +++ doc/lispref/ChangeLog 2013-12-27 03:38:26 +0000 @@ -1,3 +1,14 @@ +2013-12-27 Chong Yidong + + * functions.texi (Function Cells): + * eval.texi (Function Indirection): Update for the fact that + symbol-function no longer signals an error. + + * commands.texi (Reading One Event): Mention keyboard coding. + + * keymaps.texi (Translation Keymaps, Translation Keymaps): + * nonascii.texi (Terminal I/O Encoding): Copyedits. + 2013-12-26 Chong Yidong * advice.texi (Advising Functions, Defining Advice): Special forms === modified file 'doc/lispref/commands.texi' --- doc/lispref/commands.texi 2013-12-25 10:24:52 +0000 +++ doc/lispref/commands.texi 2013-12-27 03:38:26 +0000 @@ -2395,9 +2395,12 @@ @code{read-char}, and @code{read-char-exclusive}. @defun read-event &optional prompt inherit-input-method seconds -This function reads and returns the next event of command input, waiting -if necessary until an event is available. Events can come directly from -the user or from a keyboard macro. +This function reads and returns the next event of command input, +waiting if necessary until an event is available. + +The returned event may come directly from the user, or from a keyboard +macro. It is not decoded by the keyboard's input coding system +(@pxref{Terminal I/O Encoding}). If the optional argument @var{prompt} is non-@code{nil}, it should be a string to display in the echo area as a prompt. Otherwise, === modified file 'doc/lispref/eval.texi' --- doc/lispref/eval.texi 2013-12-25 03:05:11 +0000 +++ doc/lispref/eval.texi 2013-12-27 03:38:26 +0000 @@ -242,11 +242,9 @@ about symbol function indirection. One possible consequence of this process is an infinite loop, in the -event that a symbol's function cell refers to the same symbol. Or a -symbol may have a void function cell, in which case the subroutine -@code{symbol-function} signals a @code{void-function} error. But if -neither of these things happens, we eventually obtain a non-symbol, -which ought to be a function or other suitable object. +event that a symbol's function cell refers to the same symbol. +Otherwise, we eventually obtain a non-symbol, which ought to be a +function or other suitable object. @kindex invalid-function More precisely, we should now have a Lisp function (a lambda @@ -255,12 +253,12 @@ described in one of the following sections. If the object is not one of these types, Emacs signals an @code{invalid-function} error. - The following example illustrates the symbol indirection process. We -use @code{fset} to set the function cell of a symbol and + The following example illustrates the symbol indirection process. +We use @code{fset} to set the function cell of a symbol and @code{symbol-function} to get the function cell contents -(@pxref{Function Cells}). Specifically, we store the symbol @code{car} -into the function cell of @code{first}, and the symbol @code{first} into -the function cell of @code{erste}. +(@pxref{Function Cells}). Specifically, we store the symbol +@code{car} into the function cell of @code{first}, and the symbol +@code{first} into the function cell of @code{erste}. @example @group === modified file 'doc/lispref/functions.texi' --- doc/lispref/functions.texi 2013-09-12 12:22:17 +0000 +++ doc/lispref/functions.texi 2013-12-27 03:38:26 +0000 @@ -1001,12 +1001,12 @@ @defun symbol-function symbol @kindex void-function -This returns the object in the function cell of @var{symbol}. If the -symbol's function cell is void, a @code{void-function} error is -signaled. +This returns the object in the function cell of @var{symbol}. It does +not check that the returned object is a legitimate function. -This function does not check that the returned object is a legitimate -function. +If the function cell is void, the return value is @code{nil}. To +distinguish between a function cell that is void and one set to +@code{nil}, use @code{fboundp} (see below). @example @group @@ -1026,10 +1026,10 @@ @end defun @cindex void function cell - If you have never given a symbol any function definition, we say that -that symbol's function cell is @dfn{void}. In other words, the function -cell does not have any Lisp object in it. If you try to call such a symbol -as a function, it signals a @code{void-function} error. + If you have never given a symbol any function definition, we say +that that symbol's function cell is @dfn{void}. In other words, the +function cell does not have any Lisp object in it. If you try to call +the symbol as a function, Emacs signals a @code{void-function} error. Note that void is not the same as @code{nil} or the symbol @code{void}. The symbols @code{nil} and @code{void} are Lisp objects, === modified file 'doc/lispref/keymaps.texi' --- doc/lispref/keymaps.texi 2013-12-25 10:24:52 +0000 +++ doc/lispref/keymaps.texi 2013-12-27 03:38:26 +0000 @@ -1551,32 +1551,36 @@ @node Translation Keymaps @section Keymaps for Translating Sequences of Events +@cindex translation keymap @cindex keymaps for translating events - This section describes keymaps that are used during reading a key -sequence, to translate certain event sequences into others. -@code{read-key-sequence} checks every subsequence of the key sequence -being read, as it is read, against @code{input-decode-map}, then -@code{local-function-key-map}, and then against @code{key-translation-map}. - -These keymaps have the same structure as other keymaps, but they are used -differently: they specify translations to make while reading key sequences, -rather than bindings for key sequences. - -If one of these keymaps ``binds'' a key sequence @var{k} to a vector -@var{v}, then when @var{k} appears as a subsequence @emph{anywhere} in a -key sequence, it is replaced with the events in @var{v}. - -For example, VT100 terminals send @kbd{@key{ESC} O P} when the -keypad @key{PF1} key is pressed. Therefore, we want Emacs to translate -that sequence of events into the single event @code{pf1}. We accomplish -this by ``binding'' @kbd{@key{ESC} O P} to @code{[pf1]} in -@code{input-decode-map}, when using a VT100. - -Thus, typing @kbd{C-c @key{PF1}} sends the character sequence @kbd{C-c -@key{ESC} O P}; later the function @code{read-key-sequence} translates -this back into @kbd{C-c @key{PF1}}, which it returns as the vector -@code{[?\C-c pf1]}. + When the @code{read-key-sequence} function reads a key sequence +(@pxref{Key Sequence Input}), it uses @dfn{translation keymaps} to +translate certain event sequences into others. The translation +keymaps are @code{input-decode-map}, @code{local-function-key-map}, +and @code{key-translation-map} (in order of priority). + + Translation keymaps have the same structure as other keymaps, but +are used differently: they specify translations to make while reading +key sequences, rather than bindings for complete key sequences. As +each key sequence is read, it is checked against each translation +keymap. If one of the translation keymaps ``binds'' @var{k} to a +vector @var{v}, then whenever @var{k} appears as a sub-sequence +@emph{anywhere} in a key sequence, that sub-sequence is replaced with +the events in @var{v}. + + For example, VT100 terminals send @kbd{@key{ESC} O P} when the +keypad key @key{PF1} is pressed. On such terminals, Emacs must +translate that sequence of events into a single event @code{pf1}. +This is done by ``binding'' @kbd{@key{ESC} O P} to @code{[pf1]} in +@code{input-decode-map}. Thus, when you type @kbd{C-c @key{PF1}} on +the terminal, the terminal emits the character sequence @kbd{C-c +@key{ESC} O P}, and @code{read-key-sequence} translates this back into +@kbd{C-c @key{PF1}} and returns it as the vector @code{[?\C-c pf1]}. + + Translation keymaps take effect only after Emacs has decoded the +keyboard input (via the input coding system specified by +@code{keyboard-coding-system}). @xref{Terminal I/O Encoding}. @defvar input-decode-map This variable holds a keymap that describes the character sequences sent @@ -1664,10 +1668,6 @@ @end group @end example - If you have enabled keyboard character set decoding using -@code{set-keyboard-coding-system}, decoding is done before the -translations listed above. @xref{Terminal I/O Encoding}. - @subsection Interaction with normal keymaps The end of a key sequence is detected when that key sequence either is bound === modified file 'doc/lispref/nonascii.texi' --- doc/lispref/nonascii.texi 2013-12-25 10:24:52 +0000 +++ doc/lispref/nonascii.texi 2013-12-27 03:38:26 +0000 @@ -1807,24 +1807,23 @@ @node Terminal I/O Encoding @subsection Terminal I/O Encoding - Emacs can decode keyboard input using a coding system, and encode + Emacs can use coding systems to decode keyboard input and encode terminal output. This is useful for terminals that transmit or -display text using a particular encoding such as Latin-1. Emacs does -not set @code{last-coding-system-used} for encoding or decoding of +display text using a particular encoding, such as Latin-1. Emacs does +not set @code{last-coding-system-used} when encoding or decoding terminal I/O. @defun keyboard-coding-system &optional terminal -This function returns the coding system that is in use for decoding -keyboard input from @var{terminal}---or @code{nil} if no coding system -is to be used for that terminal. If @var{terminal} is omitted or -@code{nil}, it means the selected frame's terminal. @xref{Multiple -Terminals}. +This function returns the coding system used for decoding keyboard +input from @var{terminal}. A value of @code{no-conversion} means no +decoding is done. If @var{terminal} is omitted or @code{nil}, it +means the selected frame's terminal. @xref{Multiple Terminals}. @end defun @deffn Command set-keyboard-coding-system coding-system &optional terminal This command specifies @var{coding-system} as the coding system to use for decoding keyboard input from @var{terminal}. If -@var{coding-system} is @code{nil}, that means do not decode keyboard +@var{coding-system} is @code{nil}, that means not to decode keyboard input. If @var{terminal} is a frame, it means that frame's terminal; if it is @code{nil}, that means the currently selected frame's terminal. @xref{Multiple Terminals}. @@ -1832,18 +1831,19 @@ @defun terminal-coding-system &optional terminal This function returns the coding system that is in use for encoding -terminal output from @var{terminal}---or @code{nil} if the output is -not encoded. If @var{terminal} is a frame, it means that frame's -terminal; if it is @code{nil}, that means the currently selected -frame's terminal. +terminal output from @var{terminal}. A value of @code{no-conversion} +means no encoding is done. If @var{terminal} is a frame, it means +that frame's terminal; if it is @code{nil}, that means the currently +selected frame's terminal. @end defun @deffn Command set-terminal-coding-system coding-system &optional terminal This command specifies @var{coding-system} as the coding system to use for encoding terminal output from @var{terminal}. If -@var{coding-system} is @code{nil}, terminal output is not encoded. If -@var{terminal} is a frame, it means that frame's terminal; if it is -@code{nil}, that means the currently selected frame's terminal. +@var{coding-system} is @code{nil}, that means not to encode terminal +output. If @var{terminal} is a frame, it means that frame's terminal; +if it is @code{nil}, that means the currently selected frame's +terminal. @end deffn @node Input Methods === modified file 'etc/NEWS' --- etc/NEWS 2013-12-26 22:02:49 +0000 +++ etc/NEWS 2013-12-27 03:38:26 +0000 @@ -917,10 +917,12 @@ ** Default process filters and sentinels are not nil any more. Instead they default to a function which does what the nil value used to do. ++++ ** `read-event' does not return decoded chars in ttys any more. -Just as was the case in Emacs-22 and before, decoding of tty input according to -keyboard-coding-system is not performed in read-event any more. But contrary -to that past, it is still done before input-decode-map/function-key-map/... +As was the case in Emacs 22 and before, the decoding of terminal +input, according to `keyboard-coding-system', is not performed in +`read-event' any more. But unlike in Emacs 22, this decoding is still +done before input-decode-map, function-key-map, etc. --- ** Removed `inhibit-local-menu-bar-menus'. @@ -930,10 +932,12 @@ More specifically, the redisplay does not bother to check for a frame-local value when looking up variables. ++++ ** nil and "unbound" are indistinguishable in `symbol-function'. -`symbol-function' never signals `void-function' any more. -`fboundp' returns non-nil if the symbol was `fset' to nil. +`symbol-function' does not signal a `void-function' error any more. +To determine if a symbol's function definition is void, use `fboundp'. ++++ ** `defadvice' does not honor the `freeze' flag and cannot advise special-forms any more. === modified file 'src/ChangeLog' --- src/ChangeLog 2013-12-26 11:31:42 +0000 +++ src/ChangeLog 2013-12-27 03:38:26 +0000 @@ -1,3 +1,7 @@ +2013-12-27 Chong Yidong + + * data.c (Fsymbol_function): Doc fix. + 2013-12-26 Martin Rudalics Some more tinkering with Bug#16051. @@ -7649,7 +7653,7 @@ * keyboard.c: Apply keyboard decoding only to events that come directly from the tty, not from unread-command-events (bug#14368). - (read_event_from_main_queue): New function, extracted from read_char). + (read_event_from_main_queue): New function, extracted from read_char. (read_decoded_char): Remove. (read_decoded_event_from_main_queue): New function to replace it. (read_char): Use it. === modified file 'src/data.c' --- src/data.c 2013-11-25 23:25:04 +0000 +++ src/data.c 2013-12-27 03:38:26 +0000 @@ -686,7 +686,7 @@ } DEFUN ("symbol-function", Fsymbol_function, Ssymbol_function, 1, 1, 0, - doc: /* Return SYMBOL's function definition. Error if that is void. */) + doc: /* Return SYMBOL's function definition, or nil if that is void. */) (register Lisp_Object symbol) { CHECK_SYMBOL (symbol); ------------------------------------------------------------ revno: 115764 committer: Paul Eggert branch nick: trunk timestamp: Thu 2013-12-26 19:25:43 -0800 message: Sync better from sources. * CXTERM-DIC/ARRAY30.tit, CXTERM-DIC/4Corner.tit: * CXTERM-DIC/QJ.tit, CXTERM-DIC/QJ-b5.tit: Omit blank lines not present in the original. * CXTERM-DIC/CCDOSPY.tit: * CXTERM-DIC/PY-b5.tit: * CXTERM-DIC/SW.tit, CXTERM-DIC/TONEPY.tit: * MISC-DIC/pinyin.map, MISC-DIC/ziranma.cin: Clarify which header lines were added for Emacs. * CXTERM-DIC/README: Clarify what changes we made, and where the files came from. * MISC-DIC/README, MISC-DIC/pinyin.map, MISC-DIC/ziranma.cin: Update URLs. * SKK-DIC/SKK-JISYO.L: Update from upstream. diff: === modified file 'leim/CXTERM-DIC/4Corner.tit' --- leim/CXTERM-DIC/4Corner.tit 2011-06-12 10:37:40 +0000 +++ leim/CXTERM-DIC/4Corner.tit 2013-12-27 03:25:43 +0000 @@ -6,13 +6,13 @@ AUTOSELECT: NO PROMPT: ¥|¨¤¸¹½X::\040 # -COMMENT +COMMENT COMMENT Copyright (c) 2001 Christian Wittern -COMMENT +COMMENT COMMENT Permission to copy and distribute both modified and COMMENT unmodified versions is granted without royalty provided this COMMENT notice is preserved. -COMMENT +COMMENT COMMENT Authors: Dr. Urs App, Christian Wittern (Kyoto Univ, Japan) COMMENT COMMENT Input: ¥|¨¤¸¹½X (¤Î¤@ªþ¥[½X) @@ -6676,4 +6676,3 @@ 99901 æÎ 99903 ¿¢ 99904 ºa - === modified file 'leim/CXTERM-DIC/ARRAY30.tit' --- leim/CXTERM-DIC/ARRAY30.tit 2011-06-12 10:37:40 +0000 +++ leim/CXTERM-DIC/ARRAY30.tit 2013-12-27 03:25:43 +0000 @@ -9,7 +9,7 @@ PROMPT: ¤¤¤å¡i¦æ¦C¢²¢¯¡j\040 # COMMENT Copyright (c) 1997 by William Yeh -COMMENT +COMMENT COMMENT Permission to copy and distribute both modified and unmodified COMMENT versions is granted without royalty provided this notice is preserved. COMMENT @@ -13185,4 +13185,3 @@ napa ùÚ # ---> 6v1-0^1- 0 ,nr\040 ùÛ # ---> 8v6v4^ 0 weu\040 ùÜ # ---> 2^3^7^ 0 - === modified file 'leim/CXTERM-DIC/CCDOSPY.tit' --- leim/CXTERM-DIC/CCDOSPY.tit 2011-11-20 19:35:27 +0000 +++ leim/CXTERM-DIC/CCDOSPY.tit 2013-12-27 03:25:43 +0000 @@ -1,5 +1,4 @@ -# -*- coding: euc-china -*- -# Header added for Emacs +# Header added for Emacs -*- coding: euc-china -*- # # This file is included in the directory contrib/clients/cxterm of the # distribution of X11R6. As the file itself doesn't contain copyright @@ -8,7 +7,7 @@ # # X11R6 CXTERM (C) 1994 BY YONGGUANG ZHANG. # X11R5 CXTERM (C) 1991 BY YONGGUANG ZHANG AND MAN-CHI PONG. -# +# # Permission to use, copy, modify, and distribute this software and # its documentation for any purpose is hereby granted without fee, # provided that this entire copyright and permission notice appear @@ -19,7 +18,6 @@ # purpose. It is provided "as is" without express or implied warranty. # # End of header added for Emacs -# # HANZI input table for cxterm # To be used by cxterm, convert me to .cit format first # .cit version 2 @@ -564,4 +562,3 @@ zuj ×ê×ë߬çÚõò zun ×ð×ñߤé×÷® zuo ×ò×ó×ô×õ×ö×÷×ø×ùßòàÜâôëÑìñ - === modified file 'leim/CXTERM-DIC/PY-b5.tit' --- leim/CXTERM-DIC/PY-b5.tit 2011-11-20 19:35:27 +0000 +++ leim/CXTERM-DIC/PY-b5.tit 2013-12-27 03:25:43 +0000 @@ -1,5 +1,4 @@ -# -*- coding: cn-big5 -*- -# Header added for Emacs +# Header added for Emacs -*- coding: cn-big5 -*- # # This file is included in the directory contrib/clients/cxterm of the # distribution of X11R6. As the file itself doesn't contain copyright @@ -8,7 +7,7 @@ # # X11R6 CXTERM (C) 1994 BY YONGGUANG ZHANG. # X11R5 CXTERM (C) 1991 BY YONGGUANG ZHANG AND MAN-CHI PONG. -# +# # Permission to use, copy, modify, and distribute this software and # its documentation for any purpose is hereby granted without fee, # provided that this entire copyright and permission notice appear @@ -19,7 +18,6 @@ # purpose. It is provided "as is" without express or implied warranty. # # End of header added for Emacs -# # HANZI input table for cxterm # To be used by cxterm, convert me to .cit format first # .cit version 2 @@ -2299,4 +2297,3 @@ zuo3 ¥ª¦õðw zuo4 °µ§@§¤®yÜ`¯®Æw¬gÌ©Ð_ÍÚßÜÑY zuo5 - === modified file 'leim/CXTERM-DIC/QJ-b5.tit' --- leim/CXTERM-DIC/QJ-b5.tit 2011-06-12 10:37:40 +0000 +++ leim/CXTERM-DIC/QJ-b5.tit 2013-12-27 03:25:43 +0000 @@ -110,4 +110,3 @@ | ¡U } ¡b ~ ¡ã - === modified file 'leim/CXTERM-DIC/QJ.tit' --- leim/CXTERM-DIC/QJ.tit 2011-06-12 10:37:40 +0000 +++ leim/CXTERM-DIC/QJ.tit 2013-12-27 03:25:43 +0000 @@ -110,4 +110,3 @@ | £ü } £ý ~ £þ - === modified file 'leim/CXTERM-DIC/README' --- leim/CXTERM-DIC/README 2011-11-15 07:55:13 +0000 +++ leim/CXTERM-DIC/README 2013-12-27 03:25:43 +0000 @@ -5,9 +5,10 @@ (1) QJ-b5.tit (renamed from .../cxterm/dict/big5/QJ.tit) QJ.tit (copied from .../cxterm/dict/gb/QJ.tit) -They are verbatim copies of those included in the directory -contrib/clients/cxterm of the distribution of X11R6. Each file -contains a license notice. +They are copies of the files included in the directory +contrib/clients/cxterm of the distribution of X11R6, except that a +"-*- coding: " line was prepended to each file, and RCS Id lines were +removed. Each file contains a license notice. (2) CCDOSPY.tit (copied from .../cxterm/dict/gb/CCDOSPY.tit) PY-b5.tit (renamed from .../cxterm/dict/big5/PY.tit) @@ -15,9 +16,10 @@ TONEPY.tit (copied from .../cxterm/dict/gb/TONEPY.tit) They are copies of those included in the directory -contrib/clients/cxterm of the distribution of X11R6. As the original -files don't contain copyright and license notices, a proper notice is -extracted from .../cxterm/README and added at the head of each file. +contrib/clients/cxterm of the distribution of X11R6. +RCS Id lines were removed. As the original files don't contain +copyright and license notices, a proper notice was extracted from +.../cxterm/README and prepended to each file. (3) 4Corner.tit ARRAY30.tit @@ -25,8 +27,10 @@ ZOZY.tit They are versions modified by the original authors from those -distributed with X11R5 to include proper copyright notices. Each file -contains a license notice. +distributed with X11R6 in .../cxterm/dict/big5, to include proper +copyright and license notices. ETZY.tit and ZOZY.tit were further +modified from the X11R6 version. Also, a "-*- coding: " line was +prepended to each file, and RCS Id lines were removed. (4) ECDICT.tit, Punct-b5.tit, Punct.tit === modified file 'leim/CXTERM-DIC/SW.tit' --- leim/CXTERM-DIC/SW.tit 2011-11-20 19:35:27 +0000 +++ leim/CXTERM-DIC/SW.tit 2013-12-27 03:25:43 +0000 @@ -1,5 +1,4 @@ -# -*- coding: euc-china -*- -# Header added for Emacs +# Header added for Emacs -*- coding: euc-china -*- # # This file is included in the directory contrib/clients/cxterm of the # distribution of X11R6. As the file itself doesn't contain copyright @@ -19,7 +18,6 @@ # purpose. It is provided "as is" without express or implied warranty. # # End of header added for Emacs -# # HANZI input table for cxterm # To be used by cxterm, convert me to .cit format first # .cit version 2 @@ -749,4 +747,3 @@ zy °±´Ôµª¶Ì·Õ·ú¸×º¤ºÐÂÈÄÊÆóÆøÇâÇèÉÏЩÐéÑõÕ½Ö¹ÙÚÙÝÙÞê¨ zy ë­ë®ë¯ë°ë±ë²ë³ë´ëµõºö´÷ª zz ´Ó¿¨Áì­ƵÇêÈËÌ°Õ§ÕêÖÚêßì£ì¨ò¢ò¥ - === modified file 'leim/CXTERM-DIC/TONEPY.tit' --- leim/CXTERM-DIC/TONEPY.tit 2011-11-20 19:35:27 +0000 +++ leim/CXTERM-DIC/TONEPY.tit 2013-12-27 03:25:43 +0000 @@ -1,5 +1,4 @@ -# -*- coding: euc-china -*- -# Header added for Emacs +# Header added for Emacs -*- coding: euc-china -*- # # This file is included in the directory contrib/clients/cxterm of the # distribution of X11R6. As the file itself doesn't contain copyright @@ -19,7 +18,6 @@ # purpose. It is provided "as is" without express or implied warranty. # # End of header added for Emacs -# # HANZI input table for cxterm # To be used by cxterm, convert me to .cit format first # .cit version 2 @@ -2121,4 +2119,3 @@ zuo3 ´é×ó×ô zuo4 Ôä×õ×ö×÷×ø×ùÚèßòâôëÑìñõ¡ zuo5 - === modified file 'leim/ChangeLog' --- leim/ChangeLog 2013-12-16 22:35:57 +0000 +++ leim/ChangeLog 2013-12-27 03:25:43 +0000 @@ -1,3 +1,20 @@ +2013-12-27 Paul Eggert + + Sync better from sources. + * CXTERM-DIC/ARRAY30.tit, CXTERM-DIC/4Corner.tit: + * CXTERM-DIC/QJ.tit, CXTERM-DIC/QJ-b5.tit: + Omit blank lines not present in the original. + * CXTERM-DIC/CCDOSPY.tit: + * CXTERM-DIC/PY-b5.tit: + * CXTERM-DIC/SW.tit, CXTERM-DIC/TONEPY.tit: + * MISC-DIC/pinyin.map, MISC-DIC/ziranma.cin: + Clarify which header lines were added for Emacs. + * CXTERM-DIC/README: + Clarify what changes we made, and where the files came from. + * MISC-DIC/README, MISC-DIC/pinyin.map, MISC-DIC/ziranma.cin: + Update URLs. + * SKK-DIC/SKK-JISYO.L: Update from upstream. + 2013-12-16 Paul Eggert Fix problems with CANNOT_DUMP and EMACSLOADPATH. === modified file 'leim/MISC-DIC/README' --- leim/MISC-DIC/README 2011-11-15 07:55:13 +0000 +++ leim/MISC-DIC/README 2013-12-27 03:25:43 +0000 @@ -10,8 +10,8 @@ (2) CTLau.html CTLau-b5.html -They are verbatim copies of those distributed at the author's home -page . Each file contains a +They are verbatim copies of those distributed by the author; they used to +be at . Each file contains a license notice. (3) pinyin.map @@ -19,8 +19,8 @@ They are copies of those distributed with a free package called CCE at: - http://ftp.debian.org/debian/dists/potato/main - /source/utils/cce_0.36.orig.tar.gz + + http://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz As the original files don't contain copyright and license notices, a proper notice is extracted from the file Copyright and added at the === modified file 'leim/MISC-DIC/pinyin.map' --- leim/MISC-DIC/pinyin.map 2012-12-31 15:34:32 +0000 +++ leim/MISC-DIC/pinyin.map 2013-12-27 03:25:43 +0000 @@ -1,10 +1,9 @@ -% -*- coding: cn-gb-2312 -*- -% Header added for Emacs +% Header added for Emacs -*- coding: cn-gb-2312 -*- % % This file is included in the free package called CCE. It is -% available at: -% http://ftp.debian.org/debian/dists/potato/main -% /source/utils/cce_0.36.orig.tar.gz +% available in: +% +% http://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz % % As the file itself doesn't contain copyright and license notices, % the following statements of the file cce/Copyright covers it. === modified file 'leim/MISC-DIC/ziranma.cin' --- leim/MISC-DIC/ziranma.cin 2012-12-31 15:34:32 +0000 +++ leim/MISC-DIC/ziranma.cin 2013-12-27 03:25:43 +0000 @@ -1,10 +1,9 @@ -% -*- coding: cn-gb-2312 -*- -% Header added for Emacs +% Header added for Emacs -*- coding: cn-gb-2312 -*- % % This file is included in the free package called CCE. It is -% available at: -% http://ftp.debian.org/debian/dists/potato/main -% /source/utils/cce_0.36.orig.tar.gz +% available in: +% +% http://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz % % As the file itself doesn't contain copyright and license notices, % the following statements of the file cce/Copyright covers it. === modified file 'leim/SKK-DIC/SKK-JISYO.L' --- leim/SKK-DIC/SKK-JISYO.L 2013-03-18 04:30:20 +0000 +++ leim/SKK-DIC/SKK-JISYO.L 2013-12-27 03:25:43 +0000 @@ -13,9 +13,9 @@ ;; SKK Development Team ;; ;; Maintainer: SKK Development Team -;; Version: $Id: SKK-JISYO.L,v 1.1124 2013/03/16 00:10:02 czkmt Exp $ +;; Version: $Id: SKK-JISYO.L,v 1.1164 2013/12/21 00:10:02 czkmt Exp $ ;; Keywords: japanese -;; Last Modified: $Date: 2013/03/16 00:10:02 $ +;; Last Modified: $Date: 2013/12/21 00:10:02 $ ;; ;; This dictionary is free software; you can redistribute it and/or ;; modify it under the terms of the GNU General Public License as @@ -42379,7 +42379,7 @@ versace /¥ô¥§¥ë¥µ¡¼¥Á;ww.versace.com/¥Ù¥ë¥µ¡¼¥Á/ versailles /¥Ù¥ë¥µ¥¤¥æ/¥ô¥§¥ë¥µ¥¤¥æ/ verse /¥ô¥¡¡¼¥¹;²Î»ì/ -version /¥Ð¡¼¥¸¥ç¥ó/¥ô¥¡¡¼¥¸¥ç¥ó/ÈÇ/ +version /¥Ð¡¼¥¸¥ç¥ó/¥ô¥¡¡¼¥¸¥ç¥ó/ÈÇ/(skk-version)/ version-up /¥Ð¡¼¥¸¥ç¥ó¥¢¥Ã¥×/ versionup /¥Ð¡¼¥¸¥ç¥ó¥¢¥Ã¥×/¥ô¥¡¡¼¥¸¥ç¥ó¥¢¥Ã¥×/ versus /¥Ð¡¼¥µ¥¹/¥ô¥¡¡¼¥µ¥¹/ @@ -135522,6 +135522,7 @@ ¤Ê¤¤¤¬¤¤¤½¤¦ /Æâ³°Áõ/ ¤Ê¤¤¤¬¤·¤í /ÊΤí/ ¤Ê¤¤¤¬¤á¤ó /Æâ²èÌÌ/ +¤Ê¤¤¤¬¤ó /Æâ´Þ/ ¤Ê¤¤¤­ /Æ⵬/Æâµ­/ ¤Ê¤¤¤­¤¸¤å¤ó¤«¤ó /Æⵤ½Û´Ä/ ¤Ê¤¤¤­¤ç¤¦ /Æⶵ;Ê©¶µ/ @@ -145653,6 +145654,7 @@ ¤Ð /¾ì/ÇÏ/±©/ÍÕ/¿Ï/»õ/ÇÍ/ÇÌ/Äí/ÇÎ;ÇξÖ/ÔÇ;¡Ö¾ì¡×¤Î°ÛÂλú/Ñã;¡Ö¿Ï¡×¤Î°ÛÂλú/ ¤Ð¡¼¤¯¤ê¤¦¤à /Bk/Berkelium/ ¤Ð¡¼¤¸¤ã¡¼¤Ó¤ç¤¦ /¥Ð¡¼¥¸¥ã¡¼ÉÂ;[°å]Buerger's disease/ +¤Ð¡¼¤¸¤ç¤ó /(skk-version)/ ¤Ð¡¼¤¸¤ç¤ó¤Ð¤ó¤´¤¦ /¥Ð¡¼¥¸¥ç¥óÈÖ¹æ/ ¤Ð¡¼¤¹¤È¤¦ /¥Ð¡¼¥¹ÅÞ/ ¤Ð¤¢ /ÇÌ/ ------------------------------------------------------------ revno: 115763 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Fri 2013-12-27 03:58:16 +0100 message: Fix another shr infloop in the filling code (shr-find-fill-point): Off by one error in comparison with the indentation. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-27 02:21:42 +0000 +++ lisp/ChangeLog 2013-12-27 02:58:16 +0000 @@ -5,6 +5,8 @@ infloop. (shr-insert): Fill repeatedly long texts, so that Japanese is formatted correctly (bug#16263). + (shr-find-fill-point): Off by one error in comparison with the + indentation. 2013-12-26 João Távora === modified file 'lisp/net/shr.el' --- lisp/net/shr.el 2013-12-27 02:21:02 +0000 +++ lisp/net/shr.el 2013-12-27 02:58:16 +0000 @@ -478,7 +478,7 @@ (backward-char 1)) (let ((bp (point)) failed) - (while (not (or (setq failed (< (current-column) shr-indentation)) + (while (not (or (setq failed (<= (current-column) shr-indentation)) (eq (preceding-char) ? ) (eq (following-char) ? ) (shr-char-breakable-p (preceding-char)) @@ -486,7 +486,8 @@ (and (shr-char-kinsoku-bol-p (preceding-char)) (shr-char-breakable-p (following-char)) (not (shr-char-kinsoku-bol-p (following-char)))) - (shr-char-kinsoku-eol-p (following-char)))) + (shr-char-kinsoku-eol-p (following-char)) + (bolp))) (backward-char 1)) (if failed ;; There's no breakable point, so we give it up. @@ -508,7 +509,7 @@ (while (and (not (memq (preceding-char) (list ?\C-@ ?\n ? ))) (shr-char-kinsoku-eol-p (preceding-char))) (backward-char 1)) - (when (setq failed (< (current-column) shr-indentation)) + (when (setq failed (<= (current-column) shr-indentation)) ;; There's no breakable point that doesn't violate kinsoku, ;; so we look for the second best position. (while (and (progn @@ -528,7 +529,7 @@ (not (memq (preceding-char) (list ?\C-@ ?\n ? ))) (or (shr-char-kinsoku-eol-p (preceding-char)) (shr-char-kinsoku-bol-p (following-char))))))) - (when (setq failed (< (current-column) shr-indentation)) + (when (setq failed (<= (current-column) shr-indentation)) ;; There's no breakable point that doesn't violate kinsoku, ;; so we go to the second best position. (if (looking-at "\\(\\c<+\\)\\c<") ------------------------------------------------------------ revno: 115762 fixes bug: http://debbugs.gnu.org/16263 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Fri 2013-12-27 03:21:42 +0100 message: shr didn't fill Japanese text correctly any more * net/shr.el (shr-find-fill-point): Don't try to fill if the indentation level is larger than the width, because that will infloop. (shr-insert): Fill repeatedly long texts, so that Japanese is formatted correctly. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-26 22:02:49 +0000 +++ lisp/ChangeLog 2013-12-27 02:21:42 +0000 @@ -1,3 +1,11 @@ +2013-12-27 Lars Ingebrigtsen + + * net/shr.el (shr-find-fill-point): Don't try to fill if the + indentation level is larger than the width, because that will + infloop. + (shr-insert): Fill repeatedly long texts, so that Japanese is + formatted correctly (bug#16263). + 2013-12-26 João Távora * electric.el (electric-pair-mode): More flexible engine for skip- ------------------------------------------------------------ revno: 115761 fixes bug: http://debbugs.gnu.org/16263 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Fri 2013-12-27 03:21:02 +0100 message: shr didn't fill Japanese text correctly any more * net/shr.el (shr-find-fill-point): Don't try to fill if the indentation level is larger than the width, because that will infloop. (shr-insert): Fill repeatedly long texts, so that Japanese is formatted correctly. diff: === modified file 'lisp/net/shr.el' --- lisp/net/shr.el 2013-12-25 22:52:15 +0000 +++ lisp/net/shr.el 2013-12-27 02:21:02 +0000 @@ -455,10 +455,10 @@ (insert elem) (setq shr-state nil) (let (found) - (when (and (> (current-column) shr-width) - (progn - (setq found (shr-find-fill-point)) - (not (eolp)))) + (while (and (> (current-column) shr-width) + (progn + (setq found (shr-find-fill-point)) + (not (eolp)))) (when (eq (preceding-char) ? ) (delete-char -1)) (insert "\n") @@ -478,7 +478,7 @@ (backward-char 1)) (let ((bp (point)) failed) - (while (not (or (setq failed (= (current-column) shr-indentation)) + (while (not (or (setq failed (< (current-column) shr-indentation)) (eq (preceding-char) ? ) (eq (following-char) ? ) (shr-char-breakable-p (preceding-char)) @@ -496,7 +496,8 @@ (while (setq found (re-search-forward "\\(\\c>\\)\\| \\|\\c<\\|\\c|" (line-end-position) 'move))) - (if (and found (not (match-beginning 1))) + (if (and found + (not (match-beginning 1))) (goto-char (match-beginning 0))))) (or (eolp) @@ -507,7 +508,7 @@ (while (and (not (memq (preceding-char) (list ?\C-@ ?\n ? ))) (shr-char-kinsoku-eol-p (preceding-char))) (backward-char 1)) - (when (setq failed (= (current-column) shr-indentation)) + (when (setq failed (< (current-column) shr-indentation)) ;; There's no breakable point that doesn't violate kinsoku, ;; so we look for the second best position. (while (and (progn @@ -527,7 +528,7 @@ (not (memq (preceding-char) (list ?\C-@ ?\n ? ))) (or (shr-char-kinsoku-eol-p (preceding-char)) (shr-char-kinsoku-bol-p (following-char))))))) - (when (setq failed (= (current-column) shr-indentation)) + (when (setq failed (< (current-column) shr-indentation)) ;; There's no breakable point that doesn't violate kinsoku, ;; so we go to the second best position. (if (looking-at "\\(\\c<+\\)\\c<") ------------------------------------------------------------ revno: 115760 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2013-12-26 22:13:28 +0000 message: lisp/gnus/gnus-sum.el (gnus-summary-respool-query): Make split tracing work in nnimap groups, too diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-12-26 00:59:01 +0000 +++ lisp/gnus/ChangeLog 2013-12-26 22:13:28 +0000 @@ -1,3 +1,8 @@ +2013-12-26 Lars Ingebrigtsen + + * gnus-sum.el (gnus-summary-respool-query): Special-case nnimap so that + we get proper traces there, too. + 2013-12-26 Sean Connor (tiny change) * gnus-sum.el (gnus-summary-enter-digest-group): Don't discard previous === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2013-12-26 00:59:01 +0000 +++ lisp/gnus/gnus-sum.el 2013-12-26 22:13:28 +0000 @@ -10664,7 +10664,22 @@ (let (gnus-mark-article-hook) (gnus-summary-select-article) (with-current-buffer gnus-original-article-buffer - (let ((groups (nnmail-article-group 'identity trace))) + (let ((groups + (if (eq (car (gnus-find-method-for-group gnus-newsgroup-name)) + 'nnimap) + ;; nnimap has its own splitting variables. + (let ((nnmail-split-methods + (cond + ((eq nnimap-split-methods 'default) + nnmail-split-methods) + (nnimap-split-methods + nnimap-split-methods) + (nnimap-split-fancy + 'nnmail-split-fancy))) + (nnmail-split-fancy (or nnimap-split-fancy + nnmail-split-fancy))) + (nnmail-article-group 'identity trace)) + (nnmail-article-group 'identity trace)))) (unless silent (if groups (message "This message would go to %s" ------------------------------------------------------------ revno: 115759 committer: João Távora branch nick: trunk timestamp: Thu 2013-12-26 22:02:49 +0000 message: Make Electric Pair mode smarter/more useful: * lisp/electric.el: Pairing/skipping helps preserve balance. Autobackspacing behaviour. Opens extra newlines between pairs. Skip whitespace before closing delimiters. * lisp/emacs-lisp/lisp-mode.el (lisp-mode-variables): Use new features. * test/automated/electric-tests.lisp: New file. * doc/emacs/programs.texi: Describe new features. * lisp/simple.el: Pass non-nil interactive arg to newline call inside newline-and-indent. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2013-12-25 10:24:52 +0000 +++ doc/emacs/ChangeLog 2013-12-26 22:02:49 +0000 @@ -1,3 +1,7 @@ +2013-12-26 João Távora + * emacs.texi (Matching): Describe new features of Electric Pair + mode. + 2013-12-25 Chong Yidong * glossary.texi (Glossary): Define MULE in modern terms. === modified file 'doc/emacs/programs.texi' --- doc/emacs/programs.texi 2013-07-02 07:42:34 +0000 +++ doc/emacs/programs.texi 2013-12-26 22:02:49 +0000 @@ -844,8 +844,34 @@ Electric Pair mode, a global minor mode, provides a way to easily insert matching delimiters. Whenever you insert an opening delimiter, the matching closing delimiter is automatically inserted as well, -leaving point between the two. To toggle Electric Pair mode, type -@kbd{M-x electric-pair-mode}. +leaving point between the two. Conversely, when you insert a closing +delimiter over an existing one, no inserting takes places and that +position is simply skipped over. These variables control additional +features of Electric Pair mode: + +@itemize @bullet +@item +@code{electric-pair-preserve-balance}, when non-@code{nil}, makes the +default pairing logic balance out the number of opening and closing +delimiters. + +@item +@code{electric-pair-delete-adjacent-pairs}, when non-@code{nil}, makes +backspacing between two adjacent delimiters also automatically delete +the closing delimiter. + +@item +@code{electric-pair-open-newline-between-pairs}, when non-@code{nil}, +makes inserting inserting a newline between two adjacent pairs also +automatically open and extra newline after point. + +@item +@code{electric-skip-whitespace}, when non-@code{nil}, causes the minor +mode to skip whitespace forward before deciding whether to skip over +the closing delimiter. +@end itemize + +To toggle Electric Pair mode, type @kbd{M-x electric-pair-mode}. @node Comments @section Manipulating Comments === modified file 'etc/ChangeLog' --- etc/ChangeLog 2013-12-23 22:27:49 +0000 +++ etc/ChangeLog 2013-12-26 22:02:49 +0000 @@ -1,3 +1,6 @@ +2013-12-26 João Távora + * NEWS: Describe new features of Electric Pair mode. + 2013-12-23 Teodor Zlatanov * NEWS: Updated for `gnutls-verify-error', cfengine-mode, and === modified file 'etc/NEWS' --- etc/NEWS 2013-12-26 03:27:45 +0000 +++ etc/NEWS 2013-12-26 22:02:49 +0000 @@ -439,6 +439,42 @@ ** Eldoc Mode works properly in the minibuffer. +** Electric Pair mode +*** New `electric-pair-preserve-balance' enabled by default. + +Pairing/skipping only kicks in when that help the balance of +parentheses and quotes, i.e. the buffer should end up at least as +balanced as before. + +You can further control this behaviour by adjusting the predicates +stored in `electric-pair-inhibit-predicate' and +`electric-pair-skip-self'. + +*** New `electric-pair-delete-adjacent-pairs' enabled by default. + +In `electric-pair-mode', the commands `backward-delete-char' and +`backward-delete-char-untabify' are now bound to electric variants +that delete the closer when invoked between adjacent pairs. + +*** New `electric-pair-open-newline-between-pairs' enabled by default. + +In `electric-pair-mode', inserting a newline between adjacent pairs +opens an extra newline after point, which is indented if +`electric-indent-mode' is also set. + +*** New `electric-pair-skip-whitespace' enabled by default. + +Controls if skipping over closing delimiters should jump over any +whitespace slack. Setting it to `chomp' makes it delete this +whitespace. See also the variable +`electric-pair-skip-whitespace-chars'. + +*** New variables control the pairing in strings and comments. + +You can customize `electric-pair-text-pairs' and +`electric-pair-text-syntax-table' to tweak pairing behaviour inside +strings and comments. + ** EPA *** New option `epa-mail-aliases'. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-26 16:45:19 +0000 +++ lisp/ChangeLog 2013-12-26 22:02:49 +0000 @@ -1,3 +1,25 @@ +2013-12-26 João Távora + + * electric.el (electric-pair-mode): More flexible engine for skip- + and inhibit predicates, new options for pairing-related + functionality. + (electric-pair-preserve-balance): Pair/skip parentheses and quotes + if that keeps or improves their balance in buffers. + (electric-pair-delete-adjacent-pairs): Delete the pair when + backspacing over adjacent matched delimiters. + (electric-pair-open-extra-newline): Open extra newline when + inserting newlines between adjacent matched delimiters. + (electric--sort-post-self-insertion-hook): Sort + post-self-insert-hook according to priority values when + minor-modes are activated. + * simple.el (newline-and-indent): Call newline with interactive + set to t. + (blink-paren-post-self-insert-function): Set priority to 100. + * emacs-lisp/lisp-mode.el (lisp-mode-variables): Use + electric-pair-text-pairs to pair backtick-and-quote in strings and + comments. Locally set electric-pair-skip-whitespace to 'chomp and + electric-pair-open-newline-between-pairs to nil. + 2013-12-26 Fabián Ezequiel Gallina * progmodes/python.el: Use lexical-binding. === modified file 'lisp/electric.el' --- lisp/electric.el 2013-11-29 17:59:38 +0000 +++ lisp/electric.el 2013-12-26 22:02:49 +0000 @@ -187,6 +187,17 @@ (eq (char-before) last-command-event))))) pos))) +(defun electric--sort-post-self-insertion-hook () + "Ensure order of electric functions in `post-self-insertion-hook'. + +Hooks in this variable interact in non-trivial ways, so a +relative order must be maintained within it." + (setq-default post-self-insert-hook + (sort (default-value 'post-self-insert-hook) + #'(lambda (fn1 fn2) + (< (or (get fn1 'priority) 0) + (or (get fn2 'priority) 0)))))) + ;;; Electric indentation. ;; Autoloading variables is generally undesirable, but major modes @@ -267,6 +278,8 @@ (> pos (line-beginning-position))) (indent-according-to-mode))))) +(put 'electric-indent-post-self-insert-function 'priority 60) + (defun electric-indent-just-newline (arg) "Insert just a newline, without any auto-indentation." (interactive "*P") @@ -295,20 +308,9 @@ #'electric-indent-post-self-insert-function)) (when (eq (lookup-key global-map [?\C-j]) 'newline-and-indent) (define-key global-map [?\C-j] 'electric-indent-just-newline)) - ;; post-self-insert-hooks interact in non-trivial ways. - ;; It turns out that electric-indent-mode generally works better if run - ;; late, but still before blink-paren. (add-hook 'post-self-insert-hook - #'electric-indent-post-self-insert-function - 'append) - ;; FIXME: Ugly! - (let ((bp (memq #'blink-paren-post-self-insert-function - (default-value 'post-self-insert-hook)))) - (when (memq #'electric-indent-post-self-insert-function bp) - (setcar bp #'electric-indent-post-self-insert-function) - (setcdr bp (cons #'blink-paren-post-self-insert-function - (delq #'electric-indent-post-self-insert-function - (cdr bp)))))))) + #'electric-indent-post-self-insert-function) + (electric--sort-post-self-insertion-hook))) ;;;###autoload (define-minor-mode electric-indent-local-mode @@ -327,32 +329,163 @@ (defcustom electric-pair-pairs '((?\" . ?\")) - "Alist of pairs that should be used regardless of major mode." + "Alist of pairs that should be used regardless of major mode. + +Pairs of delimiters in this list are a fallback in case they have +no syntax relevant to `electric-pair-mode' in the mode's syntax +table. + +See also the variable `electric-pair-text-pairs'." :version "24.1" :type '(repeat (cons character character))) -(defcustom electric-pair-skip-self t +(defcustom electric-pair-text-pairs + '((?\" . ?\" )) + "Alist of pairs that should always be used in comments and strings. + +Pairs of delimiters in this list are a fallback in case they have +no syntax relevant to `electric-pair-mode' in the syntax table +defined in `electric-pair-text-syntax-table'" + :version "24.4" + :type '(repeat (cons character character))) + +(defcustom electric-pair-skip-self #'electric-pair-default-skip-self "If non-nil, skip char instead of inserting a second closing paren. + When inserting a closing paren character right before the same character, just skip that character instead, so that hitting ( followed by ) results in \"()\" rather than \"())\". -This can be convenient for people who find it easier to hit ) than C-f." + +This can be convenient for people who find it easier to hit ) than C-f. + +Can also be a function of one argument (the closer char just +inserted), in which case that function's return value is +considered instead." :version "24.1" - :type 'boolean) + :type '(choice + (const :tag "Never skip" nil) + (const :tag "Help balance" electric-pair-default-skip-self) + (const :tag "Always skip" t) + function)) (defcustom electric-pair-inhibit-predicate #'electric-pair-default-inhibit "Predicate to prevent insertion of a matching pair. + The function is called with a single char (the opening char just inserted). If it returns non-nil, then `electric-pair-mode' will not insert a matching closer." :version "24.4" :type '(choice - (const :tag "Default" electric-pair-default-inhibit) + (const :tag "Conservative" electric-pair-conservative-inhibit) + (const :tag "Help balance" electric-pair-default-inhibit) (const :tag "Always pair" ignore) function)) -(defun electric-pair-default-inhibit (char) +(defcustom electric-pair-preserve-balance t + "Non-nil if default pairing and skipping should help balance parentheses. + +The default values of `electric-pair-inhibit-predicate' and +`electric-pair-skip-self' check this variable before delegating to other +predicates reponsible for making decisions on whether to pair/skip some +characters based on the actual state of the buffer's parenthesis and +quotes." + :version "24.4" + :type 'boolean) + +(defcustom electric-pair-delete-adjacent-pairs t + "If non-nil, backspacing an open paren also deletes adjacent closer. + +Can also be a function of no arguments, in which case that function's +return value is considered instead." + :version "24.4" + :type '(choice + (const :tag "Yes" t) + (const :tag "No" nil) + function)) + +(defcustom electric-pair-open-newline-between-pairs t + "If non-nil, a newline between adjacent parentheses opens an extra one. + +Can also be a function of no arguments, in which case that function's +return value is considered instead." + :version "24.4" + :type '(choice + (const :tag "Yes" t) + (const :tag "No" nil) + function)) + +(defcustom electric-pair-skip-whitespace t + "If non-nil skip whitespace when skipping over closing parens. + +The specific kind of whitespace skipped is given by the variable +`electric-pair-skip-whitespace-chars'. + +The symbol `chomp' specifies that the skipped-over whitespace +should be deleted. + +Can also be a function of no arguments, in which case that function's +return value is considered instead." + :version "24.4" + :type '(choice + (const :tag "Yes, jump over whitespace" t) + (const :tag "Yes, and delete whitespace" 'chomp) + (const :tag "No, no whitespace skipping" nil) + function)) + +(defcustom electric-pair-skip-whitespace-chars (list ?\t ?\s ?\n) + "Whitespace characters considered by `electric-pair-skip-whitespace'." + :version "24.4" + :type '(choice (set (const :tag "Space" ?\s) + (const :tag "Tab" ?\t) + (const :tag "Newline" ?\n)) + (list character))) + +(defun electric-pair--skip-whitespace () + "Skip whitespace forward, not crossing comment or string boundaries." + (let ((saved (point)) + (string-or-comment (nth 8 (syntax-ppss)))) + (skip-chars-forward (apply #'string electric-pair-skip-whitespace-chars)) + (unless (eq string-or-comment (nth 8 (syntax-ppss))) + (goto-char saved)))) + +(defvar electric-pair-text-syntax-table prog-mode-syntax-table + "Syntax table used when pairing inside comments and strings. + +`electric-pair-mode' considers this syntax table only when point in inside +quotes or comments. If lookup fails here, `electric-pair-text-pairs' will +be considered.") + +(defun electric-pair-backward-delete-char (n &optional killflag untabify) + "Delete characters backward, and maybe also two adjacent paired delimiters. + +Remaining behaviour is given by `backward-delete-char' or, if UNTABIFY is +non-nil, `backward-delete-char-untabify'." + (interactive "*p\nP") + (let* ((prev (char-before)) + (next (char-after)) + (syntax-info (electric-pair-syntax-info prev)) + (syntax (car syntax-info)) + (pair (cadr syntax-info))) + (when (and (if (functionp electric-pair-delete-adjacent-pairs) + (funcall electric-pair-delete-adjacent-pairs) + electric-pair-delete-adjacent-pairs) + next + (memq syntax '(?\( ?\" ?\$)) + (eq pair next)) + (delete-char 1 killflag)) + (if untabify + (backward-delete-char-untabify n killflag) + (backward-delete-char n killflag)))) + +(defun electric-pair-backward-delete-char-untabify (n &optional killflag) + "Delete characters backward, and maybe also two adjacent paired delimiters. + +Remaining behaviour is given by `backward-delete-char-untabify'." + (interactive "*p\nP") + (electric-pair-backward-delete-char n killflag t)) + +(defun electric-pair-conservative-inhibit (char) (or ;; I find it more often preferable not to pair when the ;; same char is next. @@ -363,14 +496,40 @@ ;; I also find it often preferable not to pair next to a word. (eq (char-syntax (following-char)) ?w))) -(defun electric-pair-syntax (command-event) - (let ((x (assq command-event electric-pair-pairs))) +(defun electric-pair-syntax-info (command-event) + "Calculate a list (SYNTAX PAIR UNCONDITIONAL STRING-OR-COMMENT-START). + +SYNTAX is COMMAND-EVENT's syntax character. PAIR is +COMMAND-EVENT's pair. UNCONDITIONAL indicates the variables +`electric-pair-pairs' or `electric-pair-text-pairs' were used to +lookup syntax. STRING-OR-COMMENT-START indicates that point is +inside a comment of string." + (let* ((pre-string-or-comment (nth 8 (save-excursion + (syntax-ppss (1- (point)))))) + (post-string-or-comment (nth 8 (syntax-ppss (point)))) + (string-or-comment (and post-string-or-comment + pre-string-or-comment)) + (table (if string-or-comment + electric-pair-text-syntax-table + (syntax-table))) + (table-syntax-and-pair (with-syntax-table table + (list (char-syntax command-event) + (or (matching-paren command-event) + command-event)))) + (fallback (if string-or-comment + (append electric-pair-text-pairs + electric-pair-pairs) + electric-pair-pairs)) + (direct (assq command-event fallback)) + (reverse (rassq command-event fallback))) (cond - (x (if (eq (car x) (cdr x)) ?\" ?\()) - ((rassq command-event electric-pair-pairs) ?\)) - ((nth 8 (syntax-ppss)) - (with-syntax-table text-mode-syntax-table (char-syntax command-event))) - (t (char-syntax command-event))))) + ((memq (car table-syntax-and-pair) + '(?\" ?\( ?\) ?\$)) + (append table-syntax-and-pair (list nil string-or-comment))) + (direct (if (eq (car direct) (cdr direct)) + (list ?\" command-event t string-or-comment) + (list ?\( (cdr direct) t string-or-comment))) + (reverse (list ?\) (car reverse) t string-or-comment))))) (defun electric-pair--insert (char) (let ((last-command-event char) @@ -378,56 +537,297 @@ (electric-pair-mode nil)) (self-insert-command 1))) +(defun electric-pair--syntax-ppss (&optional pos where) + "Like `syntax-ppss', but sometimes fallback to `parse-partial-sexp'. + +WHERE is list defaulting to '(string comment) and indicates +when to fallback to `parse-partial-sexp'." + (let* ((pos (or pos (point))) + (where (or where '(string comment))) + (quick-ppss (syntax-ppss)) + (quick-ppss-at-pos (syntax-ppss pos))) + (if (or (and (nth 3 quick-ppss) (memq 'string where)) + (and (nth 4 quick-ppss) (memq 'comment where))) + (with-syntax-table electric-pair-text-syntax-table + (parse-partial-sexp (1+ (nth 8 quick-ppss)) pos)) + ;; HACK! cc-mode apparently has some `syntax-ppss' bugs + (if (memq major-mode '(c-mode c++ mode)) + (parse-partial-sexp (point-min) pos) + quick-ppss-at-pos)))) + +;; Balancing means controlling pairing and skipping of parentheses so +;; that, if possible, the buffer ends up at least as balanced as +;; before, if not more. The algorithm is slightly complex because some +;; situations like "()))" need pairing to occur at the end but not at +;; the beginning. Balancing should also happen independently for +;; different types of parentheses, so that having your {}'s unbalanced +;; doesn't keep `electric-pair-mode' from balancing your ()'s and your +;; []'s. +(defun electric-pair--balance-info (direction string-or-comment) + "Examine lists forward or backward according to DIRECTIONS's sign. + +STRING-OR-COMMENT is info suitable for running `parse-partial-sexp'. + +Return a cons of two descritions (MATCHED-P . PAIR) for the +innermost and outermost lists that enclose point. The outermost +list enclosing point is either the first top-level or first +mismatched list found by uplisting. + +If the outermost list is matched, don't rely on its PAIR. If +point is not enclosed by any lists, return ((T) (T))." + (let* (innermost + outermost + (table (if string-or-comment + electric-pair-text-syntax-table + (syntax-table))) + (at-top-level-or-equivalent-fn + ;; called when `scan-sexps' ran perfectly, when when it + ;; found a parenthesis pointing in the direction of + ;; travel. Also when travel started inside a comment and + ;; exited it + #'(lambda () + (setq outermost (list t)) + (unless innermost + (setq innermost (list t))))) + (ended-prematurely-fn + ;; called when `scan-sexps' crashed against a parenthesis + ;; pointing opposite the direction of travel. After + ;; traversing that character, the idea is to travel one sexp + ;; in the opposite direction looking for a matching + ;; delimiter. + #'(lambda () + (let* ((pos (point)) + (matched + (save-excursion + (cond ((< direction 0) + (condition-case nil + (eq (char-after pos) + (with-syntax-table table + (matching-paren + (char-before + (scan-sexps (point) 1))))) + (scan-error nil))) + (t + ;; In this case, no need to use + ;; `scan-sexps', we can use some + ;; `electric-pair--syntax-ppss' in this + ;; case (which uses the quicker + ;; `syntax-ppss' in some cases) + (let* ((ppss (electric-pair--syntax-ppss + (1- (point)))) + (start (car (last (nth 9 ppss)))) + (opener (char-after start))) + (and start + (eq (char-before pos) + (or (with-syntax-table table + (matching-paren opener)) + opener)))))))) + (actual-pair (if (> direction 0) + (char-before (point)) + (char-after (point))))) + (unless innermost + (setq innermost (cons matched actual-pair))) + (unless matched + (setq outermost (cons matched actual-pair))))))) + (save-excursion + (while (not outermost) + (condition-case err + (with-syntax-table table + (scan-sexps (point) (if (> direction 0) + (point-max) + (- (point-max)))) + (funcall at-top-level-or-equivalent-fn)) + (scan-error + (cond ((or + ;; some error happened and it is not of the "ended + ;; prematurely" kind"... + (not (string-match "ends prematurely" (nth 1 err))) + ;; ... or we were in a comment and just came out of + ;; it. + (and string-or-comment + (not (nth 8 (syntax-ppss))))) + (funcall at-top-level-or-equivalent-fn)) + (t + ;; exit the sexp + (goto-char (nth 3 err)) + (funcall ended-prematurely-fn))))))) + (cons innermost outermost))) + +(defun electric-pair--looking-at-unterminated-string-p (char) + "Say if following string starts with CHAR and is unterminated." + ;; FIXME: ugly/naive + (save-excursion + (skip-chars-forward (format "^%c" char)) + (while (not (zerop (% (save-excursion (skip-syntax-backward "\\")) 2))) + (unless (eobp) + (forward-char 1) + (skip-chars-forward (format "^%c" char)))) + (and (not (eobp)) + (condition-case err + (progn (forward-sexp) nil) + (scan-error t))))) + +(defun electric-pair--inside-string-p (char) + "Say if point is inside a string started by CHAR. + +A comments text is parsed with `electric-pair-text-syntax-table'. +Also consider strings within comments, but not strings within +strings." + ;; FIXME: could also consider strings within strings by examining + ;; delimiters. + (let* ((ppss (electric-pair--syntax-ppss (point) '(comment)))) + (memq (nth 3 ppss) (list t char)))) + +(defun electric-pair-inhibit-if-helps-balance (char) + "Return non-nil if auto-pairing of CHAR would hurt parentheses' balance. + +Works by first removing the character from the buffer, then doing +some list calculations, finally restoring the situation as if nothing +happened." + (pcase (electric-pair-syntax-info char) + (`(,syntax ,pair ,_ ,s-or-c) + (unwind-protect + (progn + (delete-char -1) + (cond ((eq ?\( syntax) + (let* ((pair-data + (electric-pair--balance-info 1 s-or-c)) + (innermost (car pair-data)) + (outermost (cdr pair-data))) + (cond ((car outermost) + nil) + (t + (eq (cdr outermost) pair))))) + ((eq syntax ?\") + (electric-pair--looking-at-unterminated-string-p char)))) + (insert-char char))))) + +(defun electric-pair-skip-if-helps-balance (char) + "Return non-nil if skipping CHAR would benefit parentheses' balance. + +Works by first removing the character from the buffer, then doing +some list calculations, finally restoring the situation as if nothing +happened." + (pcase (electric-pair-syntax-info char) + (`(,syntax ,pair ,_ ,s-or-c) + (unwind-protect + (progn + (delete-char -1) + (cond ((eq syntax ?\)) + (let* ((pair-data + (electric-pair--balance-info + -1 s-or-c)) + (innermost (car pair-data)) + (outermost (cdr pair-data))) + (and + (cond ((car outermost) + (car innermost)) + ((car innermost) + (not (eq (cdr outermost) pair))))))) + ((eq syntax ?\") + (electric-pair--inside-string-p char)))) + (insert-char char))))) + +(defun electric-pair-default-skip-self (char) + (if electric-pair-preserve-balance + (electric-pair-skip-if-helps-balance char) + t)) + +(defun electric-pair-default-inhibit (char) + (if electric-pair-preserve-balance + (electric-pair-inhibit-if-helps-balance char) + (electric-pair-conservative-inhibit char))) + (defun electric-pair-post-self-insert-function () (let* ((pos (and electric-pair-mode (electric--after-char-pos))) - (syntax (and pos (electric-pair-syntax last-command-event))) - (closer (if (eq syntax ?\() - (cdr (or (assq last-command-event electric-pair-pairs) - (aref (syntax-table) last-command-event))) - last-command-event))) - (cond - ((null pos) nil) - ;; Wrap a pair around the active region. - ((and (memq syntax '(?\( ?\" ?\$)) (use-region-p)) - ;; FIXME: To do this right, we'd need a post-self-insert-function - ;; so we could add-function around it and insert the closer after - ;; all the rest of the hook has run. - (if (>= (mark) (point)) - (goto-char (mark)) - ;; We already inserted the open-paren but at the end of the - ;; region, so we have to remove it and start over. - (delete-region (1- pos) (point)) - (save-excursion - (goto-char (mark)) - (electric-pair--insert last-command-event))) - ;; Since we're right after the closer now, we could tell the rest of - ;; post-self-insert-hook that we inserted `closer', but then we'd get - ;; blink-paren to kick in, which is annoying. - ;;(setq last-command-event closer) - (insert closer)) - ;; Backslash-escaped: no pairing, no skipping. - ((save-excursion - (goto-char (1- pos)) - (not (zerop (% (skip-syntax-backward "\\") 2)))) - nil) - ;; Skip self. - ((and (memq syntax '(?\) ?\" ?\$)) - electric-pair-skip-self - (eq (char-after pos) last-command-event)) - ;; This is too late: rather than insert&delete we'd want to only skip (or - ;; insert in overwrite mode). The difference is in what goes in the - ;; undo-log and in the intermediate state which might be visible to other - ;; post-self-insert-hook. We'll just have to live with it for now. - (delete-char 1)) - ;; Insert matching pair. - ((not (or (not (memq syntax `(?\( ?\" ?\$))) - overwrite-mode - (funcall electric-pair-inhibit-predicate last-command-event))) - (save-excursion (electric-pair--insert closer)))))) + (skip-whitespace-info)) + (pcase (electric-pair-syntax-info last-command-event) + (`(,syntax ,pair ,unconditional ,_) + (cond + ((null pos) nil) + ;; Wrap a pair around the active region. + ;; + ((and (memq syntax '(?\( ?\) ?\" ?\$)) (use-region-p)) + ;; FIXME: To do this right, we'd need a post-self-insert-function + ;; so we could add-function around it and insert the closer after + ;; all the rest of the hook has run. + (if (or (eq syntax ?\") + (and (eq syntax ?\)) + (>= (point) (mark))) + (and (not (eq syntax ?\))) + (>= (mark) (point)))) + (save-excursion + (goto-char (mark)) + (electric-pair--insert pair)) + (delete-region pos (1- pos)) + (electric-pair--insert pair) + (goto-char (mark)) + (electric-pair--insert last-command-event))) + ;; Backslash-escaped: no pairing, no skipping. + ((save-excursion + (goto-char (1- pos)) + (not (zerop (% (skip-syntax-backward "\\") 2)))) + nil) + ;; Skip self. + ((and (memq syntax '(?\) ?\" ?\$)) + (and (or unconditional + (if (functionp electric-pair-skip-self) + (funcall electric-pair-skip-self last-command-event) + electric-pair-skip-self)) + (save-excursion + (when (setq skip-whitespace-info + (if (functionp electric-pair-skip-whitespace) + (funcall electric-pair-skip-whitespace) + electric-pair-skip-whitespace)) + (electric-pair--skip-whitespace)) + (eq (char-after) last-command-event)))) + ;; This is too late: rather than insert&delete we'd want to only + ;; skip (or insert in overwrite mode). The difference is in what + ;; goes in the undo-log and in the intermediate state which might + ;; be visible to other post-self-insert-hook. We'll just have to + ;; live with it for now. + (when skip-whitespace-info + (electric-pair--skip-whitespace)) + (delete-region (1- pos) (if (eq skip-whitespace-info 'chomp) + (point) + pos)) + (forward-char)) + ;; Insert matching pair. + ((and (memq syntax `(?\( ?\" ?\$)) + (not overwrite-mode) + (or unconditional + (not (funcall electric-pair-inhibit-predicate + last-command-event)))) + (save-excursion (electric-pair--insert pair))))) + (t + (when (and (if (functionp electric-pair-open-newline-between-pairs) + (funcall electric-pair-open-newline-between-pairs) + electric-pair-open-newline-between-pairs) + (eq last-command-event ?\n) + (not (eobp)) + (eq (save-excursion + (skip-chars-backward "\t\s") + (char-before (1- (point)))) + (matching-paren (char-after)))) + (save-excursion (newline 1 t))))))) + +(put 'electric-pair-post-self-insert-function 'priority 20) (defun electric-pair-will-use-region () (and (use-region-p) - (memq (electric-pair-syntax last-command-event) '(?\( ?\" ?\$)))) + (memq (car (electric-pair-syntax-info last-command-event)) + '(?\( ?\) ?\" ?\$)))) + +(defvar electric-pair-mode-map + (let ((map (make-sparse-keymap))) + (define-key map [remap backward-delete-char-untabify] + 'electric-pair-backward-delete-char-untabify) + (define-key map [remap backward-delete-char] + 'electric-pair-backward-delete-char) + (define-key map [remap delete-backward-char] + 'electric-pair-backward-delete-char) + map) + "Keymap used by `electric-pair-mode'.") ;;;###autoload (define-minor-mode electric-pair-mode @@ -438,29 +838,33 @@ Electric Pair mode is a global minor mode. When enabled, typing an open parenthesis automatically inserts the corresponding -closing parenthesis. \(Likewise for brackets, etc.) - -See options `electric-pair-pairs' and `electric-pair-skip-self'." +closing parenthesis. \(Likewise for brackets, etc.)." :global t :group 'electricity (if electric-pair-mode (progn (add-hook 'post-self-insert-hook #'electric-pair-post-self-insert-function) + (electric--sort-post-self-insertion-hook) (add-hook 'self-insert-uses-region-functions #'electric-pair-will-use-region)) (remove-hook 'post-self-insert-hook #'electric-pair-post-self-insert-function) (remove-hook 'self-insert-uses-region-functions - #'electric-pair-will-use-region))) + #'electric-pair-will-use-region))) ;;; Electric newlines after/before/around some chars. -(defvar electric-layout-rules '() +(defvar electric-layout-rules nil "List of rules saying where to automatically insert newlines. -Each rule has the form (CHAR . WHERE) where CHAR is the char -that was just inserted and WHERE specifies where to insert newlines -and can be: nil, `before', `after', `around', or a function of no -arguments that returns one of those symbols.") + +Each rule has the form (CHAR . WHERE) where CHAR is the char that +was just inserted and WHERE specifies where to insert newlines +and can be: nil, `before', `after', `around', `after-stay', or a +function of no arguments that returns one of those symbols. + +The symbols specify where in relation to CHAR the newline +character(s) should be inserted. `after-stay' means insert a +newline after CHAR but stay in the same place.") (defun electric-layout-post-self-insert-function () (let* ((rule (cdr (assq last-command-event electric-layout-rules))) @@ -469,23 +873,32 @@ (setq pos (electric--after-char-pos)) ;; Not in a string or comment. (not (nth 8 (save-excursion (syntax-ppss pos))))) - (let ((end (copy-marker (point) t))) + (let ((end (copy-marker (point))) + (sym (if (functionp rule) (funcall rule) rule))) + (set-marker-insertion-type end (not (eq sym 'after-stay))) (goto-char pos) - (pcase (if (functionp rule) (funcall rule) rule) + (pcase sym ;; FIXME: we used `newline' down here which called ;; self-insert-command and ran post-self-insert-hook recursively. ;; It happened to make electric-indent-mode work automatically with ;; electric-layout-mode (at the cost of re-indenting lines ;; multiple times), but I'm not sure it's what we want. + ;; + ;; FIXME: check eolp before inserting \n? (`before (goto-char (1- pos)) (skip-chars-backward " \t") - (unless (bolp) (insert "\n"))) - (`after (insert "\n")) ; FIXME: check eolp before inserting \n? + (unless (bolp) (insert "\n"))) + (`after (insert "\n")) + (`after-stay (save-excursion + (let ((electric-layout-rules nil)) + (newline 1 t)))) (`around (save-excursion - (goto-char (1- pos)) (skip-chars-backward " \t") - (unless (bolp) (insert "\n"))) - (insert "\n"))) ; FIXME: check eolp before inserting \n? + (goto-char (1- pos)) (skip-chars-backward " \t") + (unless (bolp) (insert "\n"))) + (insert "\n"))) ; FIXME: check eolp before inserting \n? (goto-char end))))) +(put 'electric-layout-post-self-insert-function 'priority 40) + ;;;###autoload (define-minor-mode electric-layout-mode "Automatically insert newlines around some chars. @@ -494,11 +907,13 @@ the mode if ARG is omitted or nil. The variable `electric-layout-rules' says when and how to insert newlines." :global t :group 'electricity - (if electric-layout-mode - (add-hook 'post-self-insert-hook - #'electric-layout-post-self-insert-function) - (remove-hook 'post-self-insert-hook - #'electric-layout-post-self-insert-function))) + (cond (electric-layout-mode + (add-hook 'post-self-insert-hook + #'electric-layout-post-self-insert-function) + (electric--sort-post-self-insertion-hook)) + (t + (remove-hook 'post-self-insert-hook + #'electric-layout-post-self-insert-function)))) (provide 'electric) === modified file 'lisp/emacs-lisp/lisp-mode.el' --- lisp/emacs-lisp/lisp-mode.el 2013-12-19 21:02:46 +0000 +++ lisp/emacs-lisp/lisp-mode.el 2013-12-26 22:02:49 +0000 @@ -472,7 +472,13 @@ (font-lock-mark-block-function . mark-defun) (font-lock-syntactic-face-function . lisp-font-lock-syntactic-face-function))) - (setq-local prettify-symbols-alist lisp--prettify-symbols-alist)) + (setq-local prettify-symbols-alist lisp--prettify-symbols-alist) + ;; electric + (when elisp + (setq-local electric-pair-text-pairs + (cons '(?\` . ?\') electric-pair-text-pairs))) + (setq-local electric-pair-skip-whitespace 'chomp) + (setq-local electric-pair-open-newline-between-pairs nil)) (defun lisp-outline-level () "Lisp mode `outline-level' function." === modified file 'lisp/simple.el' --- lisp/simple.el 2013-12-23 03:59:10 +0000 +++ lisp/simple.el 2013-12-26 22:02:49 +0000 @@ -610,7 +610,7 @@ column specified by the function `current-left-margin'." (interactive "*") (delete-horizontal-space t) - (newline) + (newline 1 t) (indent-according-to-mode)) (defun reindent-then-newline-and-indent () @@ -6448,10 +6448,14 @@ (point)))))) (funcall blink-paren-function))) +(put 'blink-paren-post-self-insert-function 'priority 100) + (add-hook 'post-self-insert-hook #'blink-paren-post-self-insert-function ;; Most likely, this hook is nil, so this arg doesn't matter, ;; but I use it as a reminder that this function usually - ;; likes to be run after others since it does `sit-for'. + ;; likes to be run after others since it does + ;; `sit-for'. That's also the reason it get a `priority' prop + ;; of 100. 'append) ;; This executes C-g typed while Emacs is waiting for a command. === modified file 'test/ChangeLog' --- test/ChangeLog 2013-12-25 18:07:31 +0000 +++ test/ChangeLog 2013-12-26 22:02:49 +0000 @@ -1,3 +1,6 @@ +2013-12-26 João Távora + * automated/electric-tests.el: Add tests for Electric Pair mode. + 2013-12-25 Fabián Ezequiel Gallina * automated/python-tests.el === added file 'test/automated/electric-tests.el' --- test/automated/electric-tests.el 1970-01-01 00:00:00 +0000 +++ test/automated/electric-tests.el 2013-12-26 22:02:49 +0000 @@ -0,0 +1,510 @@ +;;; electric-tests.el --- tests for electric.el + +;; Copyright (C) 2013 João Távora + +;; Author: João Távora +;; Keywords: + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . + +;;; Commentary: Tests for Electric Pair mode. +;;; TODO: Add tests for other Electric-* functionality + +;; + +;;; Code: +(require 'ert) +(require 'ert-x) +(require 'electric) +(require 'cl-lib) + +(defun call-with-saved-electric-modes (fn) + (let ((saved-electric (if electric-pair-mode 1 -1)) + (saved-layout (if electric-layout-mode 1 -1)) + (saved-indent (if electric-indent-mode 1 -1))) + (electric-pair-mode -1) + (electric-layout-mode -1) + (electric-indent-mode -1) + (unwind-protect + (funcall fn) + (electric-pair-mode saved-electric) + (electric-indent-mode saved-indent) + (electric-layout-mode saved-layout)))) + +(defmacro save-electric-modes (&rest body) + (declare (indent defun) (debug t)) + `(call-with-saved-electric-modes #'(lambda () ,@body))) + +(defun electric-pair-test-for (fixture where char expected-string + expected-point mode bindings fixture-fn) + (with-temp-buffer + (funcall mode) + (insert fixture) + (save-electric-modes + (let ((last-command-event char)) + (goto-char where) + (funcall fixture-fn) + (cl-progv + (mapcar #'car bindings) + (mapcar #'cdr bindings) + (self-insert-command 1)))) + (should (equal (buffer-substring-no-properties (point-min) (point-max)) + expected-string)) + (should (equal (point) + expected-point)))) + +(eval-when-compile + (defun electric-pair-define-test-form (name fixture + char + pos + expected-string + expected-point + skip-pair-string + prefix + suffix + extra-desc + mode + bindings + fixture-fn) + (let* ((expected-string-and-point + (if skip-pair-string + (with-temp-buffer + (cl-progv + ;; FIXME: avoid `eval' + (mapcar #'car (eval bindings)) + (mapcar #'cdr (eval bindings)) + (funcall mode) + (insert fixture) + (goto-char (1+ pos)) + (insert char) + (cond ((eq (aref skip-pair-string pos) + ?p) + (insert (cadr (electric-pair-syntax-info char))) + (backward-char 1)) + ((eq (aref skip-pair-string pos) + ?s) + (delete-char -1) + (forward-char 1))) + (list + (buffer-substring-no-properties (point-min) (point-max)) + (point)))) + (list expected-string expected-point))) + (expected-string (car expected-string-and-point)) + (expected-point (cadr expected-string-and-point)) + (fixture (format "%s%s%s" prefix fixture suffix)) + (expected-string (format "%s%s%s" prefix expected-string suffix)) + (expected-point (+ (length prefix) expected-point)) + (pos (+ (length prefix) pos))) + `(ert-deftest ,(intern (format "electric-pair-%s-at-point-%s-in-%s%s" + name + (1+ pos) + mode + extra-desc)) + () + ,(format "With \"%s\", try input %c at point %d. \ +Should %s \"%s\" and point at %d" + fixture + char + (1+ pos) + (if (string= fixture expected-string) + "stay" + "become") + (replace-regexp-in-string "\n" "\\\\n" expected-string) + expected-point) + (electric-pair-test-for ,fixture + ,(1+ pos) + ,char + ,expected-string + ,expected-point + ',mode + ,bindings + ,fixture-fn))))) + +(cl-defmacro define-electric-pair-test + (name fixture + input + &key + skip-pair-string + expected-string + expected-point + bindings + (modes '(quote (emacs-lisp-mode ruby-mode c++-mode))) + (test-in-comments t) + (test-in-strings t) + (test-in-code t) + (fixture-fn #'(lambda () + (electric-pair-mode 1)))) + `(progn + ,@(cl-loop + for mode in (eval modes) ;FIXME: avoid `eval' + append + (cl-loop + for (prefix suffix extra-desc) in + (append (if test-in-comments + `((,(with-temp-buffer + (funcall mode) + (insert "z") + (comment-region (point-min) (point-max)) + (buffer-substring-no-properties (point-min) + (1- (point-max)))) + "" + "-in-comments"))) + (if test-in-strings + `(("\"" "\"" "-in-strings"))) + (if test-in-code + `(("" "" "")))) + append + (cl-loop + for char across input + for pos from 0 + unless (eq char ?-) + collect (electric-pair-define-test-form + name + fixture + (aref input pos) + pos + expected-string + expected-point + skip-pair-string + prefix + suffix + extra-desc + mode + bindings + fixture-fn)))))) + +;;; Basic pairings and skippings +;;; +(define-electric-pair-test balanced-situation + " (()) " "(((((((" :skip-pair-string "ppppppp" + :modes '(ruby-mode)) + +(define-electric-pair-test too-many-openings + " ((()) " "(((((((" :skip-pair-string "ppppppp") + +(define-electric-pair-test too-many-closings + " (())) " "(((((((" :skip-pair-string "------p") + +(define-electric-pair-test too-many-closings-2 + "() ) " "---(---" :skip-pair-string "-------") + +(define-electric-pair-test too-many-closings-3 + ")() " "(------" :skip-pair-string "-------") + +(define-electric-pair-test balanced-autoskipping + " (()) " "---))--" :skip-pair-string "---ss--") + +(define-electric-pair-test too-many-openings-autoskipping + " ((()) " "----))-" :skip-pair-string "-------") + +(define-electric-pair-test too-many-closings-autoskipping + " (())) " "---)))-" :skip-pair-string "---sss-") + + +;;; Mixed parens +;;; +(define-electric-pair-test mixed-paren-1 + " ()] " "-(-(---" :skip-pair-string "-p-p---") + +(define-electric-pair-test mixed-paren-2 + " [() " "-(-()--" :skip-pair-string "-p-ps--") + +(define-electric-pair-test mixed-paren-3 + " (]) " "-(-()--" :skip-pair-string "---ps--") + +(define-electric-pair-test mixed-paren-4 + " ()] " "---)]--" :skip-pair-string "---ss--") + +(define-electric-pair-test mixed-paren-5 + " [() " "----(--" :skip-pair-string "----p--") + +(define-electric-pair-test find-matching-different-paren-type + " ()] " "-[-----" :skip-pair-string "-------") + +(define-electric-pair-test find-matching-different-paren-type-inside-list + "( ()]) " "-[-----" :skip-pair-string "-------") + +(define-electric-pair-test ignore-different-unmatching-paren-type + "( ()]) " "-(-----" :skip-pair-string "-p-----") + +(define-electric-pair-test autopair-keep-least-amount-of-mixed-unbalance + "( ()] " "-(-----" :skip-pair-string "-p-----") + +(define-electric-pair-test dont-autopair-to-resolve-mixed-unbalance + "( ()] " "-[-----" :skip-pair-string "-------") + +(define-electric-pair-test autopair-so-as-not-to-worsen-unbalance-situation + "( (]) " "-[-----" :skip-pair-string "-p-----") + +(define-electric-pair-test skip-over-partially-balanced + " [([]) " "-----)---" :skip-pair-string "-----s---") + +(define-electric-pair-test only-skip-over-at-least-partially-balanced-stuff + " [([()) " "-----))--" :skip-pair-string "-----s---") + + + + +;;; Quotes +;;; +(define-electric-pair-test pair-some-quotes-skip-others + " \"\" " "-\"\"-----" :skip-pair-string "-ps------" + :test-in-strings nil + :bindings `((electric-pair-text-syntax-table + . ,prog-mode-syntax-table))) + +(define-electric-pair-test skip-single-quotes-in-ruby-mode + " '' " "--'-" :skip-pair-string "--s-" + :modes '(ruby-mode) + :test-in-comments nil + :test-in-strings nil + :bindings `((electric-pair-text-syntax-table + . ,prog-mode-syntax-table))) + +(define-electric-pair-test leave-unbalanced-quotes-alone + " \"' " "-\"'-" :skip-pair-string "----" + :modes '(ruby-mode) + :test-in-strings nil + :bindings `((electric-pair-text-syntax-table + . ,prog-mode-syntax-table))) + +(define-electric-pair-test leave-unbalanced-quotes-alone-2 + " \"\\\"' " "-\"--'-" :skip-pair-string "------" + :modes '(ruby-mode) + :test-in-strings nil + :bindings `((electric-pair-text-syntax-table + . ,prog-mode-syntax-table))) + +(define-electric-pair-test leave-unbalanced-quotes-alone-3 + " foo\\''" "'------" :skip-pair-string "-------" + :modes '(ruby-mode) + :test-in-strings nil + :bindings `((electric-pair-text-syntax-table + . ,prog-mode-syntax-table))) + +(define-electric-pair-test inhibit-only-if-next-is-mismatched + "\"foo\"\"bar" "\"" + :expected-string "\"\"\"foo\"\"bar" + :expected-point 2 + :test-in-strings nil + :bindings `((electric-pair-text-syntax-table + . ,prog-mode-syntax-table))) + + +;;; More quotes, but now don't bind `electric-pair-text-syntax-table' +;;; to `prog-mode-syntax-table'. Use the defaults for +;;; `electric-pair-pairs' and `electric-pair-text-pairs'. +;;; +(define-electric-pair-test pairing-skipping-quotes-in-code + " \"\" " "-\"\"-----" :skip-pair-string "-ps------" + :test-in-strings nil + :test-in-comments nil) + +(define-electric-pair-test skipping-quotes-in-comments + " \"\" " "--\"-----" :skip-pair-string "--s------" + :test-in-strings nil) + + +;;; Skipping over whitespace +;;; +(define-electric-pair-test whitespace-jumping + " ( ) " "--))))---" :expected-string " ( ) " :expected-point 8 + :bindings '((electric-pair-skip-whitespace . t))) + +(define-electric-pair-test whitespace-chomping + " ( ) " "--)------" :expected-string " () " :expected-point 4 + :bindings '((electric-pair-skip-whitespace . chomp))) + +(define-electric-pair-test whitespace-chomping-2 + " ( \n\t\t\n ) " "--)------" :expected-string " () " :expected-point 4 + :bindings '((electric-pair-skip-whitespace . chomp)) + :test-in-comments nil) + +(define-electric-pair-test whitespace-chomping-dont-cross-comments + " ( \n\t\t\n ) " "--)------" :expected-string " () \n\t\t\n ) " + :expected-point 4 + :bindings '((electric-pair-skip-whitespace . chomp)) + :test-in-strings nil + :test-in-code nil + :test-in-comments t) + + +;;; Pairing arbitrary characters +;;; +(define-electric-pair-test angle-brackets-everywhere + "<>" "<>" :skip-pair-string "ps" + :bindings '((electric-pair-pairs . ((?\< . ?\>))))) + +(define-electric-pair-test angle-brackets-everywhere-2 + "(<>" "-<>" :skip-pair-string "-ps" + :bindings '((electric-pair-pairs . ((?\< . ?\>))))) + +(defvar electric-pair-test-angle-brackets-table + (let ((table (make-syntax-table prog-mode-syntax-table))) + (modify-syntax-entry ?\< "(>" table) + (modify-syntax-entry ?\> ")<`" table) + table)) + +(define-electric-pair-test angle-brackets-pair + "<>" "<" :expected-string "<><>" :expected-point 2 + :test-in-code nil + :bindings `((electric-pair-text-syntax-table + . ,electric-pair-test-angle-brackets-table))) + +(define-electric-pair-test angle-brackets-skip + "<>" "->" :expected-string "<>" :expected-point 3 + :test-in-code nil + :bindings `((electric-pair-text-syntax-table + . ,electric-pair-test-angle-brackets-table))) + +(define-electric-pair-test pair-backtick-and-quote-in-comments + ";; " "---`" :expected-string ";; `'" :expected-point 5 + :test-in-comments nil + :test-in-strings nil + :modes '(emacs-lisp-mode) + :bindings '((electric-pair-text-pairs . ((?\` . ?\'))))) + +(define-electric-pair-test skip-backtick-and-quote-in-comments + ";; `foo'" "-------'" :expected-string ";; `foo'" :expected-point 9 + :test-in-comments nil + :test-in-strings nil + :modes '(emacs-lisp-mode) + :bindings '((electric-pair-text-pairs . ((?\` . ?\'))))) + +(define-electric-pair-test pair-backtick-and-quote-in-strings + "\"\"" "-`" :expected-string "\"`'\"" :expected-point 3 + :test-in-comments nil + :test-in-strings nil + :modes '(emacs-lisp-mode) + :bindings '((electric-pair-text-pairs . ((?\` . ?\'))))) + +(define-electric-pair-test skip-backtick-and-quote-in-strings + "\"`'\"" "--'" :expected-string "\"`'\"" :expected-point 4 + :test-in-comments nil + :test-in-strings nil + :modes '(emacs-lisp-mode) + :bindings '((electric-pair-text-pairs . ((?\` . ?\'))))) + +(define-electric-pair-test skip-backtick-and-quote-in-strings-2 + " \"`'\"" "----'" :expected-string " \"`'\"" :expected-point 6 + :test-in-comments nil + :test-in-strings nil + :modes '(emacs-lisp-mode) + :bindings '((electric-pair-text-pairs . ((?\` . ?\'))))) + + +;;; `js-mode' has `electric-layout-rules' for '{ and '} +;;; +(define-electric-pair-test js-mode-braces + "" "{" :expected-string "{}" :expected-point 2 + :modes '(js-mode) + :fixture-fn #'(lambda () + (electric-pair-mode 1))) + +(define-electric-pair-test js-mode-braces-with-layout + "" "{" :expected-string "{\n\n}" :expected-point 3 + :modes '(js-mode) + :test-in-comments nil + :test-in-strings nil + :fixture-fn #'(lambda () + (electric-layout-mode 1) + (electric-pair-mode 1))) + +(define-electric-pair-test js-mode-braces-with-layout-and-indent + "" "{" :expected-string "{\n \n}" :expected-point 7 + :modes '(js-mode) + :test-in-comments nil + :test-in-strings nil + :fixture-fn #'(lambda () + (electric-pair-mode 1) + (electric-indent-mode 1) + (electric-layout-mode 1))) + + +;;; Backspacing +;;; TODO: better tests +;;; +(ert-deftest electric-pair-backspace-1 () + (save-electric-modes + (with-temp-buffer + (insert "()") + (goto-char 2) + (electric-pair-backward-delete-char 1) + (should (equal "" (buffer-string)))))) + + +;;; Electric newlines between pairs +;;; TODO: better tests +(ert-deftest electric-pair-open-extra-newline () + (save-electric-modes + (with-temp-buffer + (c-mode) + (electric-pair-mode 1) + (electric-indent-mode 1) + (insert "int main {}") + (backward-char 1) + (let ((c-basic-offset 4)) + (newline 1 t) + (should (equal "int main {\n \n}" + (buffer-string))) + (should (equal (point) (- (point-max) 2))))))) + + + +;;; Autowrapping +;;; +(define-electric-pair-test autowrapping-1 + "foo" "(" :expected-string "(foo)" :expected-point 2 + :fixture-fn #'(lambda () + (electric-pair-mode 1) + (mark-sexp 1))) + +(define-electric-pair-test autowrapping-2 + "foo" ")" :expected-string "(foo)" :expected-point 6 + :fixture-fn #'(lambda () + (electric-pair-mode 1) + (mark-sexp 1))) + +(define-electric-pair-test autowrapping-3 + "foo" ")" :expected-string "(foo)" :expected-point 6 + :fixture-fn #'(lambda () + (electric-pair-mode 1) + (goto-char (point-max)) + (skip-chars-backward "\"") + (mark-sexp -1))) + +(define-electric-pair-test autowrapping-4 + "foo" "(" :expected-string "(foo)" :expected-point 2 + :fixture-fn #'(lambda () + (electric-pair-mode 1) + (goto-char (point-max)) + (skip-chars-backward "\"") + (mark-sexp -1))) + +(define-electric-pair-test autowrapping-5 + "foo" "\"" :expected-string "\"foo\"" :expected-point 2 + :fixture-fn #'(lambda () + (electric-pair-mode 1) + (mark-sexp 1))) + +(define-electric-pair-test autowrapping-6 + "foo" "\"" :expected-string "\"foo\"" :expected-point 6 + :fixture-fn #'(lambda () + (electric-pair-mode 1) + (goto-char (point-max)) + (skip-chars-backward "\"") + (mark-sexp -1))) + +(provide 'electric-tests) +;;; electric-tests.el ends here ------------------------------------------------------------ revno: 115758 committer: Fabián Ezequiel Gallina branch nick: trunk timestamp: Thu 2013-12-26 13:45:19 -0300 message: * lisp/progmodes/python.el: Use lexical-binding. (python-nav-beginning-of-defun): Stop searching ASAP. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-25 22:52:15 +0000 +++ lisp/ChangeLog 2013-12-26 16:45:19 +0000 @@ -1,3 +1,8 @@ +2013-12-26 Fabián Ezequiel Gallina + + * progmodes/python.el: Use lexical-binding. + (python-nav-beginning-of-defun): Stop searching ASAP. + 2013-12-25 Xue Fuqiao * vc/vc.el (vc-ignore): Use `vc-responsible-backend'. === modified file 'lisp/progmodes/python.el' --- lisp/progmodes/python.el 2013-12-25 18:07:31 +0000 +++ lisp/progmodes/python.el 2013-12-26 16:45:19 +0000 @@ -1,4 +1,4 @@ -;;; python.el --- Python's flying circus support for Emacs +;;; python.el --- Python's flying circus support for Emacs -*- lexical-binding: t -*- ;; Copyright (C) 2003-2013 Free Software Foundation, Inc. @@ -180,7 +180,7 @@ ;; Imenu: There are two index building functions to be used as ;; `imenu-create-index-function': `python-imenu-create-index' (the ;; default one, builds the alist in form of a tree) and -;; `python-imenu-create-flat-index'. See also +;; `python-imenu-create-flat-index'. See also ;; `python-imenu-format-item-label-function', ;; `python-imenu-format-parent-item-label-function', ;; `python-imenu-format-parent-item-jump-label-function' variables for @@ -1183,13 +1183,13 @@ `beginning-of-defun'." (when (or (null arg) (= arg 0)) (setq arg 1)) (let ((found)) - (cond ((and (eq this-command 'mark-defun) - (python-info-looking-at-beginning-of-defun))) - (t - (dotimes (i (if (> arg 0) arg (- arg))) - (when (and (python-nav--beginning-of-defun arg) - (not found)) - (setq found t))))) + (while (and (not (= arg 0)) + (let ((keep-searching-p + (python-nav--beginning-of-defun arg))) + (when (and keep-searching-p (null found)) + (setq found t)) + keep-searching-p)) + (setq arg (if (> arg 0) (1- arg) (1+ arg)))) found)) (defun python-nav-end-of-defun () ------------------------------------------------------------ revno: 115757 committer: martin rudalics branch nick: trunk timestamp: Thu 2013-12-26 12:31:42 +0100 message: Some more tinkering with Bug#16051. * window.c (resize_frame_windows): Don't let the size of the root window drop below the frame's default character size. Never ever delete any subwindows - let the window manager do the clipping. * w32fns.c (x_set_tool_bar_lines): Rewrite calculation of number of toolbar lines needed when they exceed the height of the root window. (unwind_create_frame_1): New function. (Fx_create_frame): Generally inhibit calling the window configuration change hook here. Remove extra call to change_frame_size - it's not needed when we don't run the configuration change hook. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-12-26 08:57:28 +0000 +++ src/ChangeLog 2013-12-26 11:31:42 +0000 @@ -1,3 +1,20 @@ +2013-12-26 Martin Rudalics + + Some more tinkering with Bug#16051. + * window.c (resize_frame_windows): Don't let the size of the + root window drop below the frame's default character size. + Never ever delete any subwindows - let the window manager do the + clipping. + + * w32fns.c (x_set_tool_bar_lines): Rewrite calculation of number + of toolbar lines needed when they exceed the height of the root + window. + (unwind_create_frame_1): New function. + (Fx_create_frame): Generally inhibit calling the window + configuration change hook here. Remove extra call to + change_frame_size - it's not needed when we don't run the + configuration change hook. + 2013-12-26 Paul Eggert Fix core dumps with gcc -fsanitize=address and GNU/Linux. === modified file 'src/w32fns.c' --- src/w32fns.c 2013-12-25 17:30:24 +0000 +++ src/w32fns.c 2013-12-26 11:31:42 +0000 @@ -1683,15 +1683,19 @@ /* DELTA is in pixels now. */ delta = (nlines - FRAME_TOOL_BAR_LINES (f)) * unit; - /* Don't resize the tool-bar to more than we have room for. FIXME: - This must use window_sizable eventually !!!!!!!!!!!! */ + /* Don't resize the tool-bar to more than we have room for. Note: The + calculations below and the subsequent call to resize_frame_windows + are inherently flawed because they can make the toolbar higher than + the containing frame. */ if (delta > 0) { root_height = WINDOW_PIXEL_HEIGHT (XWINDOW (FRAME_ROOT_WINDOW (f))); if (root_height - delta < unit) { delta = root_height - unit; - nlines = (root_height / unit) + min (1, (root_height % unit)); + /* When creating a new frame and toolbar mode is enabled, we + need at least one toolbar line. */ + nlines = max (FRAME_TOOL_BAR_LINES (f) + delta / unit, 1); } } @@ -4271,6 +4275,12 @@ } static void +unwind_create_frame_1 (Lisp_Object val) +{ + inhibit_lisp_code = val; +} + +static void x_default_font_parameter (struct frame *f, Lisp_Object parms) { struct w32_display_info *dpyinfo = FRAME_DISPLAY_INFO (f); @@ -4377,7 +4387,7 @@ frame = Qnil; GCPRO4 (parameters, parent, name, frame); tem = x_get_arg (dpyinfo, parameters, Qminibuffer, "minibuffer", "Minibuffer", - RES_TYPE_SYMBOL); + RES_TYPE_SYMBOL); if (EQ (tem, Qnone) || NILP (tem)) f = make_frame_without_minibuffer (Qnil, kb, display); else if (EQ (tem, Qonly)) @@ -4407,10 +4417,17 @@ if (! STRINGP (f->icon_name)) fset_icon_name (f, Qnil); -/* FRAME_DISPLAY_INFO (f) = dpyinfo; */ + /* FRAME_DISPLAY_INFO (f) = dpyinfo; */ /* With FRAME_DISPLAY_INFO set up, this unwind-protect is safe. */ record_unwind_protect (do_unwind_create_frame, frame); + + /* Avoid calling window-configuration-change-hook; otherwise we could + get into all kinds of nasty things like an infloop in next_frame or + violating a (height >= 0) assertion in window_box_height. */ + record_unwind_protect (unwind_create_frame_1, inhibit_lisp_code); + inhibit_lisp_code = Qt; + #ifdef GLYPH_DEBUG image_cache_refcount = FRAME_IMAGE_CACHE (f) ? FRAME_IMAGE_CACHE (f)->refcount : 0; @@ -4464,7 +4481,7 @@ Lisp_Object value; value = x_get_arg (dpyinfo, parameters, Qinternal_border_width, - "internalBorder", "InternalBorder", RES_TYPE_NUMBER); + "internalBorder", "InternalBorder", RES_TYPE_NUMBER); if (! EQ (value, Qunbound)) parameters = Fcons (Fcons (Qinternal_border_width, value), parameters); @@ -4505,20 +4522,6 @@ happen. */ init_frame_faces (f); - /* PXW: This is a duplicate from below. We have to do it here since - otherwise x_set_tool_bar_lines will work with the character sizes - installed by init_frame_faces while the frame's pixel size is still - calculated from a character size of 1 and we subsequently hit the - eassert (height >= 0) assertion in window_box_height. The - non-pixelwise code apparently worked around this because it had one - frame line vs one toolbar line which left us with a zero root - window height which was obviously wrong as well ... */ - width = FRAME_TEXT_WIDTH (f); - height = FRAME_TEXT_HEIGHT (f); - FRAME_TEXT_HEIGHT (f) = 0; - SET_FRAME_WIDTH (f, 0); - change_frame_size (f, width, height, 1, 0, 0, 1); - /* The X resources controlling the menu-bar and tool-bar are processed specially at startup, and reflected in the mode variables; ignore them here. */ === modified file 'src/window.c' --- src/window.c 2013-12-22 15:19:09 +0000 +++ src/window.c 2013-12-26 11:31:42 +0000 @@ -4040,31 +4040,34 @@ int old_pixel_size = horflag ? r->pixel_width : r->pixel_height; /* new_size is the new size of the frame's root window. */ int new_size, new_pixel_size; + int unit = horflag ? FRAME_COLUMN_WIDTH (f) : FRAME_LINE_HEIGHT (f); + /* Don't let the size drop below one unit. This is more comforting + when we are called from x_set_tool_bar_lines since the latter may + have implicitly given us a zero or negative height. */ if (pixelwise) { - new_pixel_size - = (horflag - ? size - : (size - - FRAME_TOP_MARGIN_HEIGHT (f) - - ((FRAME_HAS_MINIBUF_P (f) && !FRAME_MINIBUF_ONLY_P (f)) - ? FRAME_LINE_HEIGHT (f) : 0))); - new_size = new_pixel_size / (horflag - ? FRAME_COLUMN_WIDTH (f) - : FRAME_LINE_HEIGHT (f)); + new_pixel_size = max (horflag + ? size + : (size + - FRAME_TOP_MARGIN_HEIGHT (f) + - ((FRAME_HAS_MINIBUF_P (f) + && !FRAME_MINIBUF_ONLY_P (f)) + ? FRAME_LINE_HEIGHT (f) : 0)), + unit); + new_size = new_pixel_size / unit; } else { - new_size= (horflag - ? size - : (size - - FRAME_TOP_MARGIN (f) - - ((FRAME_HAS_MINIBUF_P (f) && !FRAME_MINIBUF_ONLY_P (f)) - ? 1 : 0))); - new_pixel_size = new_size * (horflag - ? FRAME_COLUMN_WIDTH (f) - : FRAME_LINE_HEIGHT (f)); + new_size = max (horflag + ? size + : (size + - FRAME_TOP_MARGIN (f) + - ((FRAME_HAS_MINIBUF_P (f) + && !FRAME_MINIBUF_ONLY_P (f)) + ? 1 : 0)), + 1); + new_pixel_size = new_size * unit; } r->top_line = FRAME_TOP_MARGIN (f); @@ -4124,6 +4127,7 @@ window_resize_apply (r, horflag); window_pixel_to_total (r->frame, horflag ? Qt : Qnil); } +#if 0 /* Let's try without killing other windows. */ else { /* We lost. Delete all windows but the frame's @@ -4141,6 +4145,7 @@ XWINDOW (root)->pixel_height = new_pixel_size; } } +#endif /* 0 */ } } } ------------------------------------------------------------ revno: 115756 committer: Paul Eggert branch nick: trunk timestamp: Thu 2013-12-26 00:57:28 -0800 message: Fix core dumps with gcc -fsanitize=address and GNU/Linux. On my Fedora 19 platform the core dumps were so big that my desktop became nearly catatonic. * configure.ac: Check whether addresses are sanitized. (CANNOT_DUMP): Warn if addresses are sanitized and not CANNOT_DUMP. (DOUG_LEA_MALLOC): Do not define if addresses are sanitized. (SYSTEM_MALLOC): Define if addresses are sanitized. * src/alloc.c (no_sanitize_memcpy) [MAX_SAVE_STACK > 0]: New function. (Fgarbage_collect) [MAX_SAVE_STACK > 0]: Use it. (USE_ALIGNED_MALLOC): Do not define if addresses are sanitized. (mark_memory): Use ATTRIBUTE_NO_SANITIZE_ADDRESS rather than a clang-only syntax. * src/conf_post.h (__has_feature): New macro, if not already defined. (ADDRESS_SANITIZER, ADDRESS_SANITIZER_WORKAROUND) (ATTRIBUTE_NO_SANITIZE_ADDRESS): New macros. diff: === modified file 'ChangeLog' --- ChangeLog 2013-12-24 18:27:53 +0000 +++ ChangeLog 2013-12-26 08:57:28 +0000 @@ -1,3 +1,11 @@ +2013-12-26 Paul Eggert + + Fix core dumps with gcc -fsanitize=address and GNU/Linux. + * configure.ac: Check whether addresses are sanitized. + (CANNOT_DUMP): Warn if addresses are sanitized and not CANNOT_DUMP. + (DOUG_LEA_MALLOC): Do not define if addresses are sanitized. + (SYSTEM_MALLOC): Define if addresses are sanitized. + 2013-12-24 Paul Eggert Automate the procedure for updating copyright year. === modified file 'configure.ac' --- configure.ac 2013-12-23 15:13:14 +0000 +++ configure.ac 2013-12-26 08:57:28 +0000 @@ -1048,6 +1048,21 @@ LDFLAGS="$late_LDFLAGS" +AC_CACHE_CHECK([whether addresses are sanitized], + [emacs_cv_sanitize_address], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#ifndef __has_feature + #define __has_feature(f) 0 + #endif + #if defined __SANITIZE_ADDRESS__ || __has_feature (address_sanitizer) + #else + #error "Addresses are not sanitized." + #endif + ]])], + [emacs_cv_sanitize_address=yes], + [emacs_cv_sanitize_address=no])]) + dnl The function dump-emacs will not be defined and temacs will do dnl (load "loadup") automatically unless told otherwise. test "x$CANNOT_DUMP" = "x" && CANNOT_DUMP=no @@ -1055,8 +1070,11 @@ your-opsys-here) CANNOT_DUMP=yes ;; esac -test "$CANNOT_DUMP" = "yes" && \ +if test "$CANNOT_DUMP" = "yes"; then AC_DEFINE(CANNOT_DUMP, 1, [Define if Emacs cannot be dumped on your system.]) +elif test "$emacs_cv_sanitize_address" = yes; then + AC_MSG_WARN([[Addresses are sanitized; suggest CANNOT_DUMP=yes]]) +fi AC_SUBST(CANNOT_DUMP) @@ -1888,20 +1906,21 @@ AC_CACHE_CHECK( [whether malloc is Doug Lea style], [emacs_cv_var_doug_lea_malloc], - [AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include - static void hook (void) {}]], - [[malloc_set_state (malloc_get_state ()); - __after_morecore_hook = hook; - __malloc_initialize_hook = hook;]])], - [emacs_cv_var_doug_lea_malloc=yes], - [emacs_cv_var_doug_lea_malloc=no])]) + [emacs_cv_var_doug_lea_malloc=no + dnl Hooks do not work with address sanitization. + if test "$emacs_cv_sanitize_address" != yes; then + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include + static void hook (void) {}]], + [[malloc_set_state (malloc_get_state ()); + __after_morecore_hook = hook; + __malloc_initialize_hook = hook;]])], + [emacs_cv_var_doug_lea_malloc=yes])]) + fi doug_lea_malloc=$emacs_cv_var_doug_lea_malloc - -dnl See comments in aix4-2.h about maybe using system malloc there. -system_malloc=no +system_malloc=$emacs_cv_sanitize_address case "$opsys" in ## darwin ld insists on the use of malloc routines in the System framework. darwin|sol2-10) system_malloc=yes ;; === modified file 'src/ChangeLog' --- src/ChangeLog 2013-12-25 17:30:24 +0000 +++ src/ChangeLog 2013-12-26 08:57:28 +0000 @@ -1,3 +1,17 @@ +2013-12-26 Paul Eggert + + Fix core dumps with gcc -fsanitize=address and GNU/Linux. + On my Fedora 19 platform the core dumps were so big that + my desktop became nearly catatonic. + * alloc.c (no_sanitize_memcpy) [MAX_SAVE_STACK > 0]: New function. + (Fgarbage_collect) [MAX_SAVE_STACK > 0]: Use it. + (USE_ALIGNED_MALLOC): Do not define if addresses are sanitized. + (mark_memory): Use ATTRIBUTE_NO_SANITIZE_ADDRESS rather than + a clang-only syntax. + * conf_post.h (__has_feature): New macro, if not already defined. + (ADDRESS_SANITIZER, ADDRESS_SANITIZER_WORKAROUND) + (ATTRIBUTE_NO_SANITIZE_ADDRESS): New macros. + 2013-12-25 Eli Zaretskii * w32fns.c (Fw32_shell_execute): Make DOCUMENT absolute only if it === modified file 'src/alloc.c' --- src/alloc.c 2013-12-16 07:45:33 +0000 +++ src/alloc.c 2013-12-26 08:57:28 +0000 @@ -203,7 +203,27 @@ #if MAX_SAVE_STACK > 0 static char *stack_copy; static ptrdiff_t stack_copy_size; -#endif + +/* Copy to DEST a block of memory from SRC of size SIZE bytes, + avoiding any address sanitization. */ + +static void * ATTRIBUTE_NO_SANITIZE_ADDRESS +no_sanitize_memcpy (void *dest, void const *src, size_t size) +{ + if (! ADDRESS_SANITIZER) + return memcpy (dest, src, size); + else + { + size_t i; + char *d = dest; + char const *s = src; + for (i = 0; i < size; i++) + d[i] = s[i]; + return dest; + } +} + +#endif /* MAX_SAVE_STACK > 0 */ static Lisp_Object Qconses; static Lisp_Object Qsymbols; @@ -920,20 +940,26 @@ /* The entry point is lisp_align_malloc which returns blocks of at most BLOCK_BYTES and guarantees they are aligned on a BLOCK_ALIGN boundary. */ -#if !defined SYSTEM_MALLOC && !defined DOUG_LEA_MALLOC -# define USE_ALIGNED_ALLOC 1 +/* Use aligned_alloc if it or a simple substitute is available. + Address sanitization breaks aligned allocation, as of gcc 4.8.2 and + clang 3.3 anyway. */ + +#if ! ADDRESS_SANITIZER +# if !defined SYSTEM_MALLOC && !defined DOUG_LEA_MALLOC +# define USE_ALIGNED_ALLOC 1 /* Defined in gmalloc.c. */ void *aligned_alloc (size_t, size_t); -#elif defined HAVE_ALIGNED_ALLOC -# define USE_ALIGNED_ALLOC 1 -#elif defined HAVE_POSIX_MEMALIGN -# define USE_ALIGNED_ALLOC 1 +# elif defined HAVE_ALIGNED_ALLOC +# define USE_ALIGNED_ALLOC 1 +# elif defined HAVE_POSIX_MEMALIGN +# define USE_ALIGNED_ALLOC 1 static void * aligned_alloc (size_t alignment, size_t size) { void *p; return posix_memalign (&p, alignment, size) == 0 ? p : 0; } +# endif #endif /* BLOCK_ALIGN has to be a power of 2. */ @@ -4553,16 +4579,8 @@ /* Mark Lisp objects referenced from the address range START+OFFSET..END or END+OFFSET..START. */ -static void +static void ATTRIBUTE_NO_SANITIZE_ADDRESS mark_memory (void *start, void *end) -#if defined (__clang__) && defined (__has_feature) -#if __has_feature(address_sanitizer) - /* Do not allow -faddress-sanitizer to check this function, since it - crosses the function stack boundary, and thus would yield many - false positives. */ - __attribute__((no_address_safety_analysis)) -#endif -#endif { void **pp; int i; @@ -5477,7 +5495,7 @@ stack_copy = xrealloc (stack_copy, stack_size); stack_copy_size = stack_size; } - memcpy (stack_copy, stack, stack_size); + no_sanitize_memcpy (stack_copy, stack, stack_size); } } #endif /* MAX_SAVE_STACK > 0 */ === modified file 'src/conf_post.h' --- src/conf_post.h 2013-12-23 12:07:46 +0000 +++ src/conf_post.h 2013-12-26 08:57:28 +0000 @@ -50,8 +50,19 @@ #endif #endif +/* When not using Clang, assume its attributes and features are absent. */ #ifndef __has_attribute -# define __has_attribute(a) false /* non-clang */ +# define __has_attribute(a) false +#endif +#ifndef __has_feature +# define __has_feature(a) false +#endif + +/* True if addresses are being sanitized. */ +#if defined __SANITIZE_ADDRESS__ || __has_feature (address_sanitizer) +# define ADDRESS_SANITIZER true +#else +# define ADDRESS_SANITIZER false #endif #ifdef DARWIN_OS @@ -204,6 +215,32 @@ #define ATTRIBUTE_CONST _GL_ATTRIBUTE_CONST +/* Work around GCC bug 59600: when a function is inlined, the inlined + code may have its addresses sanitized even if the function has the + no_sanitize_address attribute. This bug is present in GCC 4.8.2 + and clang 3.3, the latest releases as of December 2013, and the + only platforms known to support address sanitization. When the bug + is fixed the #if can be updated accordingly. */ +#if ADDRESS_SANITIZER +# define ADDRESS_SANITIZER_WORKAROUND NO_INLINE +#else +# define ADDRESS_SANITIZER_WORKAROUND +#endif + +/* Attribute of functions whose code should not have addresses + sanitized. */ + +#if (__has_attribute (no_sanitize_address) \ + || 4 < __GNUC__ + (8 <= __GNUC_MINOR__)) +# define ATTRIBUTE_NO_SANITIZE_ADDRESS \ + __attribute__ ((no_sanitize_address)) ADDRESS_SANITIZER_WORKAROUND +#elif __has_attribute (no_address_safety_analysis) +# define ATTRIBUTE_NO_SANITIZE_ADDRESS \ + __attribute__ ((no_address_safety_analysis)) ADDRESS_SANITIZER_WORKAROUND +#else +# define ATTRIBUTE_NO_SANITIZE_ADDRESS +#endif + /* Some versions of GNU/Linux define noinline in their headers. */ #ifdef noinline #undef noinline