------------------------------------------------------------ revno: 116773 committer: Juanma Barranquero branch nick: trunk timestamp: Sun 2014-03-16 04:48:56 +0100 message: lisp/textmodes/css-mode.el: Fix typo in comment. diff: === modified file 'lisp/textmodes/css-mode.el' --- lisp/textmodes/css-mode.el 2014-01-01 07:43:34 +0000 +++ lisp/textmodes/css-mode.el 2014-03-16 03:48:56 +0000 @@ -237,7 +237,7 @@ ;; FIXME: attribute selectors don't work well because they may contain ;; strings which have already been highlighted as f-l-string-face and ;; thus prevent this highlighting from being applied (actually now that - ;; I use `append' this should work better). But really the part of hte + ;; I use `append' this should work better). But really the part of the ;; selector between [...] should simply not be highlighted. (,(concat "^\\([ \t]*[^@:{}\n][^:{}]+\\(?::" (regexp-opt css-pseudo-ids t) "\\(?:([^)]+)\\)?[^:{\n]*\\)*\\)\\(?:\n[ \t]*\\)*{") ------------------------------------------------------------ revno: 116772 committer: Juanma Barranquero branch nick: trunk timestamp: Sun 2014-03-16 04:47:31 +0100 message: lisp/textmodes/rst.el: Implement missing but documented functionality. (rst-arabic-to-roman, rst-roman-to-arabic): Implement inserting into current buffer, documented in their docstrings. (rst-define-key, rst-compare-adornments, rst-insert-list-new-item) (rst-section-tree-point, rst-forward-section, rst-indent) (rst-compute-tabs, rst-font-lock-find-unindented-line-end) (rst-font-lock-find-unindented-line-limit, rst-adornment-level) (rst-font-lock-handle-adornment-pre-match-form) (rst-repeat-last-character): Reflow docstrings. (rst-preferred-adornments, rst-update-section, rst-find-title-line) (rst-adjust-adornment-work, rst-initial-items, rst-insert-list) (rst-toc-insert-style, rst-toc-insert-node, rst-goto-section) (rst-compile, rst-imenu-convert-cell, rst-imenu-create-index): Fix docstring typos. (rst-all-sections, rst-section-hierarchy, rst-adjust): Doc fixes. (rst-uncomment-region, rst-font-lock-find-unindented-line-match) (rst-font-lock-handle-adornment-matcher): Mark unused arguments. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-15 18:12:54 +0000 +++ lisp/ChangeLog 2014-03-16 03:47:31 +0000 @@ -1,3 +1,22 @@ +2014-03-16 Juanma Barranquero + + * textmodes/rst.el (rst-arabic-to-roman, rst-roman-to-arabic): + Implement inserting into current buffer, documented in their docstrings. + (rst-define-key, rst-compare-adornments, rst-insert-list-new-item) + (rst-section-tree-point, rst-forward-section, rst-indent) + (rst-compute-tabs, rst-font-lock-find-unindented-line-end) + (rst-font-lock-find-unindented-line-limit, rst-adornment-level) + (rst-font-lock-handle-adornment-pre-match-form) + (rst-repeat-last-character): Reflow docstrings. + (rst-preferred-adornments, rst-update-section, rst-find-title-line) + (rst-adjust-adornment-work, rst-initial-items, rst-insert-list) + (rst-toc-insert-style, rst-toc-insert-node, rst-goto-section) + (rst-compile, rst-imenu-convert-cell, rst-imenu-create-index): + Fix docstring typos. + (rst-all-sections, rst-section-hierarchy, rst-adjust): Doc fixes. + (rst-uncomment-region, rst-font-lock-find-unindented-line-match) + (rst-font-lock-handle-adornment-matcher): Mark unused arguments. + 2014-03-15 Juanma Barranquero * term/ns-win.el (x-command-line-resources): Rename from ns-... version, === modified file 'lisp/textmodes/rst.el' --- lisp/textmodes/rst.el 2014-01-13 23:50:20 +0000 +++ lisp/textmodes/rst.el 2014-03-16 03:47:31 +0000 @@ -608,8 +608,8 @@ (defun rst-define-key (keymap key def &rest deprecated) "Bind like `define-key' but add deprecated key definitions. KEYMAP, KEY, and DEF are as in `define-key'. DEPRECATED key -definitions should be in vector notation. These are defined as -well but give an additional message." +definitions should be in vector notation. These are defined +as well but give an additional message." (define-key keymap key def) (when deprecated (let* ((command-name (symbol-name def)) @@ -994,10 +994,10 @@ A list consisting of lists of the form (CHARACTER STYLE INDENT). CHARACTER is the character used. STYLE is one of the symbols -OVER-AND-UNDER or SIMPLE. INDENT is an integer giving the wanted -indentation for STYLE OVER-AND-UNDER. CHARACTER and STYLE are -always used when a section adornment is described. In other -places t instead of a list stands for a transition. +`over-and-under' or `simple'. INDENT is an integer giving the +wanted indentation for STYLE `over-and-under'. CHARACTER and +STYLE are always used when a section adornment is described. +In other places, t instead of a list stands for a transition. This sequence is consulted to offer a new adornment suggestion when we rotate the underlines at the end of the existing @@ -1034,8 +1034,8 @@ (defun rst-compare-adornments (ado1 ado2) "Compare adornments. Return true if both ADO1 and ADO2 adornments are equal, -according to restructured text semantics (only the character and -the style are compared, the indentation does not matter)." +according to restructured text semantics (only the character +and the style are compared, the indentation does not matter)." (and (eq (car ado1) (car ado2)) (eq (cadr ado1) (cadr ado2)))) @@ -1091,9 +1091,9 @@ (defun rst-update-section (char style &optional indent) "Unconditionally update the style of a section adornment. -Do this using the given character CHAR, with STYLE 'simple -or 'over-and-under, and with indent INDENT. If the STYLE -is 'simple, whitespace before the title is removed (indent +Do this using the given character CHAR, with STYLE `simple' +or `over-and-under', and with indent INDENT. If the STYLE +is `simple', whitespace before the title is removed (indent is always assumed to be 0). If there are existing overline and/or underline from the @@ -1270,8 +1270,8 @@ If no title line is found return nil. Otherwise return as `rst-classify-adornment' does. However, if -the title line has no syntactically valid adornment STYLE is nil -in the first element. If there is no adornment around the title +the title line has no syntactically valid adornment, STYLE is nil +in the first element. If there is no adornment around the title, CHARACTER is also nil and match groups for overline and underline are nil." (save-excursion @@ -1325,15 +1325,15 @@ (defvar rst-all-sections nil "All section adornments in the buffer as found by `rst-find-all-adornments'. -t when no section adornments were found.") +Set to t when no section adornments were found.") (make-variable-buffer-local 'rst-all-sections) ;; FIXME: If this variable is set to a different value font-locking of section ;; headers is wrong. (defvar rst-section-hierarchy nil "Section hierarchy in the buffer as determined by `rst-get-hierarchy'. -t when no section adornments were found. Value depends on -`rst-all-sections'.") +Set to t when no section adornments were found. +Value depends on `rst-all-sections'.") (make-variable-buffer-local 'rst-section-hierarchy) (rst-testcover-add-1value 'rst-reset-section-caches) @@ -1502,8 +1502,8 @@ Adjust/rotate the section adornment for the section title around point or promote/demote the adornments inside the region, -depending on if the region is active. This function is meant to -be invoked possibly multiple times, and can vary its behavior +depending on whether the region is active. This function is meant +to be invoked possibly multiple times, and can vary its behavior with a positive PFXARG (toggle style), or with a negative PFXARG (alternate behavior). @@ -1609,7 +1609,7 @@ 1. a CHARACTER -2. a STYLE which can be either of 'simple' or 'over-and-under'. +2. a STYLE which can be either `simple' or `over-and-under'. 3. an INDENT (meaningful for the over-and-under style only) which determines how many characters and over-and-under @@ -1652,8 +1652,8 @@ If the current line does have an existing adornment, but the adornment is incomplete, that is, the underline/overline does -not extend to exactly the end of the title line (it is either too -short or too long), we simply extend the length of the +not extend to exactly the end of the title line (it is either +too short or too long), we simply extend the length of the underlines/overlines to fit exactly the section title. If TOGGLE-STYLE we toggle the style of the adornment as well. @@ -1922,7 +1922,7 @@ Obviously, NUM must be greater than zero. Don't blame me, blame the Romans, I mean \"what have the Romans ever _done_ for /us/?\" (with apologies to Monty Python). -If optional prefix ARG is non-nil, insert in current buffer." +If optional ARG is non-nil, insert in current buffer." (let ((map rst-arabic-to-roman) res) (while (and map (> num 0)) @@ -1931,13 +1931,13 @@ (setq res (concat res (cdar map)) num (- num (caar map))) (setq map (cdr map)))) - res)) + (if arg (insert (or res "")) res))) (defun rst-roman-to-arabic (string &optional arg) "Convert STRING of Roman numerals to an Arabic number. -If STRING contains a letter which isn't a valid Roman numeral, the rest -of the string from that point onwards is ignored. +If STRING contains a letter which isn't a valid Roman numeral, +the rest of the string from that point onwards is ignored. Hence: MMD == 2500 @@ -1951,7 +1951,7 @@ (setq res (+ res (caar map)) string (replace-match "" nil t string)) (setq map (cdr map)))) - res)) + (if arg (insert res) res))) ;================================================= (defun rst-find-pfx-in-region (beg end pfx-re) @@ -2020,20 +2020,20 @@ ;; FIXME: Isn't this a `defconst'? (defvar rst-initial-items (append (mapcar 'char-to-string rst-bullets) rst-initial-enums) - "List of initial items. It's collection of bullets and enumerations.") + "List of initial items. It's a collection of bullets and enumerations.") (defun rst-insert-list-new-item () "Insert a new list item. -User is asked to select the item style first, for example (a), i), +. Use TAB -for completion and choices. +User is asked to select the item style first, for example (a), i), +. +Use TAB for completion and choices. If user selects bullets or #, it's just added with position arranged by `rst-insert-list-pos'. -If user selects enumerations, a further prompt is given. User need to input a -starting item, for example 'e' for 'A)' style. The position is also arranged by -`rst-insert-list-pos'." +If user selects enumerations, a further prompt is given. User need to +input a starting item, for example 'e' for 'A)' style. The position is +also arranged by `rst-insert-list-pos'." (interactive) ;; FIXME: Make this comply to `interactive' standards. (let* ((itemstyle (completing-read @@ -2140,7 +2140,7 @@ The position of the new list is arranged according to whether or not the current line and the previous line are blank lines. -2. When continuing a list, one thing need to be noticed: +2. When continuing a list, one thing needs to be noticed: List style alphabetical list, such as 'a.', and roman numerical list, such as 'i.', have some overlapping items, for example 'v.' The function can deal with @@ -2271,13 +2271,11 @@ "Return section containing POINT by returning the closest node in TREE. TREE is a section tree as returned by `rst-section-tree' consisting of (NODE CHILD...) entries. POINT defaults to the -current point. A NODE must have the structure (IGNORED MARKER -...). +current point. A NODE must have the structure (IGNORED MARKER...). Return (PATH NODE CHILD...). NODE is the node where POINT is in if any. PATH is a list of nodes from the top of the tree down to -and including NODE. List of CHILD are the children of NODE if -any." +and including NODE. List of CHILD are the children of NODE if any." (setq point (or point (point))) (let ((cur (car tree)) (children (cdr tree))) @@ -2318,10 +2316,10 @@ "Insertion style for table-of-contents. Set this to one of the following values to determine numbering and indentation style: -- plain: no numbering (fixed indentation) -- fixed: numbering, but fixed indentation -- aligned: numbering, titles aligned under each other -- listed: numbering, with dashes like list items (EXPERIMENTAL)" +- `plain': no numbering (fixed indentation) +- `fixed': numbering, but fixed indentation +- `aligned': numbering, titles aligned under each other +- `listed': numbering, with dashes like list items (EXPERIMENTAL)" :type '(choice (const plain) (const fixed) (const aligned) @@ -2384,7 +2382,7 @@ (defun rst-toc-insert-node (node level indent pfx) "Insert tree node NODE in table-of-contents. -Recursive function that does printing of the inserted toc. +Recursive function that does printing of the inserted TOC. LEVEL is the depth level of the sections in the tree. INDENT is the indentation string. PFX is the prefix numbering, that includes the alignment necessary for all the children of @@ -2611,7 +2609,7 @@ ;; paragraph. (defun rst-goto-section (&optional kill) "Go to the section the current line describes. -If KILL a toc buffer is destroyed." +If KILL a TOC buffer is destroyed." (interactive) (let ((pos (rst-toc-mode-find-section))) (when kill @@ -2682,8 +2680,8 @@ (defun rst-forward-section (&optional offset) "Skip to the next reStructuredText section title. -OFFSET specifies how many titles to skip. Use a negative OFFSET to move -backwards in the file (default is to use 1)." +OFFSET specifies how many titles to skip. Use a negative OFFSET +to move backwards in the file (default is to use 1)." (interactive) (rst-reset-section-caches) (let* (;; Default value for offset. @@ -2848,10 +2846,9 @@ (defgroup rst-indent nil "Settings for indentation in reStructuredText. In reStructuredText indentation points are usually determined by -preceding lines. Sometimes the syntax allows arbitrary -indentation points such as where to start the first line -following a directive. These indentation widths can be customized -here." +preceding lines. Sometimes the syntax allows arbitrary indentation +points such as where to start the first line following a directive. +These indentation widths can be customized here." :group 'rst :package-version '(rst . "1.1.0")) @@ -2957,11 +2954,11 @@ (defun rst-compute-tabs (pt) "Build the list of possible tabs for all lines above. -Search backwards from point PT to build the list of possible -tabs. Return a list of tabs sorted by likeliness to continue -writing like `rst-line-tabs'. Nearer lines have generally a -higher likeliness than farther lines. Return nil if no tab is found -in the text above." +Search backwards from point PT to build the list of possible tabs. +Return a list of tabs sorted by likeliness to continue writing +like `rst-line-tabs'. Nearer lines have generally a higher +likeliness than farther lines. Return nil if no tab is found in +the text above." (save-excursion (goto-char pt) (let (leftmost ; Leftmost column found so far. @@ -3136,7 +3133,7 @@ (indent-line-to ind) (insert (comment-string-strip comment-start t t)))))) -(defun rst-uncomment-region (beg end &optional arg) +(defun rst-uncomment-region (beg end &optional _arg) "Uncomment the current region. Region is from BEG to END. ARG is ignored" (save-excursion @@ -3774,8 +3771,7 @@ (defvar rst-font-lock-find-unindented-line-end nil "End of the match as determined by `rst-font-lock-find-unindented-line-limit'. -Also used as a trigger for -`rst-font-lock-find-unindented-line-match'.") +Also used as a trigger for `rst-font-lock-find-unindented-line-match'.") (defun rst-font-lock-find-unindented-line-limit (ind-pnt) "Find the next unindented line relative to indentation at IND-PNT. @@ -3783,8 +3779,7 @@ If IND-PNT is `next' take the indentation from the next line if this is not empty and indented more than the current one. If IND-PNT is non-nil but not a number take the indentation from the -next non-empty line if this is indented more than the current -one." +next non-empty line if this is indented more than the current one." (setq rst-font-lock-find-unindented-line-begin ind-pnt) (setq rst-font-lock-find-unindented-line-end (save-excursion @@ -3824,12 +3819,11 @@ (or (rst-forward-indented-block nil (point-max)) (point-max)))))) -(defun rst-font-lock-find-unindented-line-match (limit) +(defun rst-font-lock-find-unindented-line-match (_limit) "Set the match found earlier if match were found. -Match has been found by -`rst-font-lock-find-unindented-line-limit' the first time called -or no match is found. Return non-nil if match was found. LIMIT -is not used but mandated by the caller." +Match has been found by `rst-font-lock-find-unindented-line-limit' +the first time called or no match is found. Return non-nil if +match was found. LIMIT is not used but mandated by the caller." (when rst-font-lock-find-unindented-line-end (set-match-data (list rst-font-lock-find-unindented-line-begin @@ -3850,10 +3844,9 @@ (defun rst-adornment-level (key) "Return section level for adornment KEY. -KEY is the first element of the return list of -`rst-classify-adornment'. If KEY is not a cons return it. If KEY is found -in the hierarchy return its level. Otherwise return a level one -beyond the existing hierarchy." +KEY is the first element of the return list of `rst-classify-adornment'. +If KEY is not a cons return it. If KEY is found in the hierarchy return +its level. Otherwise return a level one beyond the existing hierarchy." (if (not (consp key)) key (let* ((hier (rst-get-hierarchy)) @@ -3875,9 +3868,8 @@ (defun rst-font-lock-handle-adornment-pre-match-form (ado ado-end) "Determine limit for adornments. Determine all things necessary for font-locking section titles -and transitions and put the result to -`rst-font-lock-adornment-match' and -`rst-font-lock-adornment-level'. ADO is the complete adornment +and transitions and put the result to `rst-font-lock-adornment-match' +and `rst-font-lock-adornment-level'. ADO is the complete adornment matched. ADO-END is the point where ADO ends. Return the point where the whole adorned construct ends. @@ -3892,7 +3884,7 @@ (goto-char (nth 1 ado-data)) ; Beginning of construct. (nth 2 ado-data)))) ; End of construct. -(defun rst-font-lock-handle-adornment-matcher (limit) +(defun rst-font-lock-handle-adornment-matcher (_limit) "Set the match found earlier if match were found. Match has been found by `rst-font-lock-handle-adornment-pre-match-form' the first time @@ -3989,7 +3981,7 @@ (defun rst-compile (&optional use-alt) "Compile command to convert reST document into some output file. Attempts to find configuration file, if it can, overrides the -options. There are two commands to choose from, with USE-ALT, +options. There are two commands to choose from; with USE-ALT, select the alternative tool-set." (interactive "P") ;; Note: maybe we want to check if there is a Makefile too and not do anything @@ -4094,7 +4086,7 @@ a)) (defun rst-imenu-convert-cell (elt adornments) - "Convert a cell ELT in a tree returned from `rst-section-tree' to imenu index. + "Convert a cell ELT in a tree returned from `rst-section-tree' to Imenu index. ADORNMENTS is used as hint information for conversion." (let* ((kar (car elt)) (kdr (cdr elt)) @@ -4128,7 +4120,7 @@ ;; FIXME: Document title and subtitle need to be handled properly. They should ;; get an own "Document" top level entry. (defun rst-imenu-create-index () - "Create index for imenu. + "Create index for Imenu. Return as described for `imenu--index-alist'." (rst-reset-section-caches) (let ((tree (rst-section-tree)) @@ -4190,8 +4182,8 @@ ;; be useful for creating separators. (defun rst-repeat-last-character (use-next) "Fill the current line using the last character on the current line. -Fill up to the length of the preceding line or up to -`fill-column' if preceding line is empty. +Fill up to the length of the preceding line or up to `fill-column' if preceding +line is empty. If USE-NEXT, use the next line rather than the preceding line. ------------------------------------------------------------ revno: 116771 fixes bug: http://debbugs.gnu.org/17008 committer: Dmitry Gutov branch nick: trunk timestamp: Sun 2014-03-16 04:42:15 +0200 message: Update the missed spot * doc/emacs/programs.texi (Matching): Update the missed spot. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-03-15 03:07:06 +0000 +++ doc/emacs/ChangeLog 2014-03-16 02:42:15 +0000 @@ -1,3 +1,7 @@ +2014-03-16 Dmitry Gutov + + * programs.texi (Matching): Update the missed spot. (Bug#17008) + 2014-03-15 Dmitry Gutov * programs.texi (Matching): Update WRT to the new === modified file 'doc/emacs/programs.texi' --- doc/emacs/programs.texi 2014-03-15 23:53:22 +0000 +++ doc/emacs/programs.texi 2014-03-16 02:42:15 +0000 @@ -798,12 +798,12 @@ match up. Whenever you type a self-inserting character that is a closing -delimiter, the cursor moves momentarily to the location of the -matching opening delimiter, provided that is on the screen. If it is -not on the screen, Emacs displays some of the text near it in the echo -area. Either way, you can tell which grouping you are closing off. -If the opening delimiter and closing delimiter are mismatched---such -as in @samp{[x)}---a warning message is displayed in the echo area. +delimiter, Emacs briefly indicates the location of the matching +opening delimiter, provided that is on the screen. If it is not on +the screen, Emacs displays some of the text near it in the echo area. +Either way, you can tell which grouping you are closing off. If the +opening delimiter and closing delimiter are mismatched---such as in +@samp{[x)}---a warning message is displayed in the echo area. @vindex blink-matching-paren @vindex blink-matching-paren-distance ------------------------------------------------------------ revno: 116770 committer: Dmitry Gutov branch nick: trunk timestamp: Sun 2014-03-16 01:53:22 +0200 message: * programs.texi (Matching): Use slightly more detailed description. diff: === modified file 'doc/emacs/programs.texi' --- doc/emacs/programs.texi 2014-03-15 03:07:06 +0000 +++ doc/emacs/programs.texi 2014-03-15 23:53:22 +0000 @@ -814,7 +814,8 @@ @item @code{blink-matching-paren} turns the feature on or off: @code{nil} disables it, but the default is @code{t} to enable it. Set it to -@code{jump} to make indication work through cursor movement. +@code{jump} to make indication work by momentarily moving the cursor +to the matching opening delimiter. @item @code{blink-matching-delay} says how many seconds to keep indicating ------------------------------------------------------------ revno: 116769 committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2014-03-15 19:12:54 +0100 message: lisp/term/ns-win.el (x-command-line-resources): Rename from ns-... version. (ns-initialize-window-system): Use it. It is set in term/common-win.el from the -xrm command line argument, but in the Nextstep port its value is irrelevant because nsfns.m:Fx_open_connection ignores it for now. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-15 17:37:58 +0000 +++ lisp/ChangeLog 2014-03-15 18:12:54 +0000 @@ -1,5 +1,11 @@ 2014-03-15 Juanma Barranquero + * term/ns-win.el (x-command-line-resources): Rename from ns-... version, + for compatibility with other ports. + (ns-initialize-window-system): Use it. It is set in term/common-win.el + from the -xrm command line argument, but in the Nextstep port its value + is irrelevant because nsfns.m:Fx_open_connection ignores it for now. + * progmodes/python.el (defconst, python-syntax-count-quotes) (python-indent-region, python-indent-shift-right) (python-indent-dedent-line-backspace, python-nav-backward-sexp) === modified file 'lisp/term/ns-win.el' --- lisp/term/ns-win.el 2014-02-02 14:10:50 +0000 +++ lisp/term/ns-win.el 2014-03-15 18:12:54 +0000 @@ -59,7 +59,8 @@ ;;;; Command line argument handling. (defvar x-invocation-args) -(defvar ns-command-line-resources nil) ; FIXME unused? +;; Set in term/common-win.el; currently unused by Nextstep's x-open-connection. +(defvar x-command-line-resources) ;; nsterm.m. (defvar ns-input-file) @@ -902,7 +903,7 @@ (format "Creation of the standard fontset failed: %s" err) :error))) - (x-open-connection (system-name) nil t) + (x-open-connection (system-name) x-command-line-resources t) ;; Add GNUstep menu items Services, Hide and Quit. Rename Help to Info ;; and put it first (i.e. omit from menu-bar-final-items. ------------------------------------------------------------ revno: 116768 committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2014-03-15 18:37:58 +0100 message: lisp/progmodes/python.el: Fix docstring typos. (defconst, python-syntax-count-quotes) (python-indent-region, python-indent-shift-right) (python-indent-dedent-line-backspace, python-nav-backward-sexp) (python-nav-backward-sexp-safe, python-nav-backward-up-list) (python-shell-prompt-block-regexp, python-shell-prompt-output-regexp) (python-shell-prompt-pdb-regexp, python-shell-enable-font-lock) (inferior-python-mode, python-shell-make-comint, run-python-internal) (python-shell-buffer-substring, python-shell-send-buffer) (python-pdbtrack-activate, python-pdbtrack-stacktrace-info-regexp) (python-completion-complete-at-point, python-fill-docstring-style) (python-eldoc-function, python-imenu-format-item-label) (python-imenu-format-parent-item-label) (python-imenu-format-parent-item-jump-label) (python-imenu--build-tree, python-imenu-create-index) (python-imenu-create-flat-index): Fix docstring typos. (python-indent-context, python-shell-prompt-regexp, run-python): Remove superfluous backslashes. (python-indent-line, python-nav-beginning-of-defun) (python-shell-get-buffer, python-shell-get-process) (python-info-current-defun, python-info-current-line-comment-p) (python-info-current-line-empty-p, python-util-popn): Doc fixes. (python-indent-post-self-insert-function, python-shell-send-file) (python-shell-completion-get-completions) (python-shell-completion-complete-or-indent) (python-eldoc--get-doc-at-point): Reflow docstrings. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-14 20:55:40 +0000 +++ lisp/ChangeLog 2014-03-15 17:37:58 +0000 @@ -1,3 +1,31 @@ +2014-03-15 Juanma Barranquero + + * progmodes/python.el (defconst, python-syntax-count-quotes) + (python-indent-region, python-indent-shift-right) + (python-indent-dedent-line-backspace, python-nav-backward-sexp) + (python-nav-backward-sexp-safe, python-nav-backward-up-list) + (python-shell-prompt-block-regexp, python-shell-prompt-output-regexp) + (python-shell-prompt-pdb-regexp, python-shell-enable-font-lock) + (inferior-python-mode, python-shell-make-comint, run-python-internal) + (python-shell-buffer-substring, python-shell-send-buffer) + (python-pdbtrack-activate, python-pdbtrack-stacktrace-info-regexp) + (python-completion-complete-at-point, python-fill-docstring-style) + (python-eldoc-function, python-imenu-format-item-label) + (python-imenu-format-parent-item-label) + (python-imenu-format-parent-item-jump-label) + (python-imenu--build-tree, python-imenu-create-index) + (python-imenu-create-flat-index): Fix docstring typos. + (python-indent-context, python-shell-prompt-regexp, run-python): + Remove superfluous backslashes. + (python-indent-line, python-nav-beginning-of-defun) + (python-shell-get-buffer, python-shell-get-process) + (python-info-current-defun, python-info-current-line-comment-p) + (python-info-current-line-empty-p, python-util-popn): Doc fixes. + (python-indent-post-self-insert-function, python-shell-send-file) + (python-shell-completion-get-completions) + (python-shell-completion-complete-or-indent) + (python-eldoc--get-doc-at-point): Reflow docstrings. + 2014-03-14 Glenn Morris * emacs-lisp/package.el (package-menu-mode-map): @@ -35,7 +63,7 @@ 2014-03-14 Juanma Barranquero * net/socks.el (socks, socks-override-functions) - (socks-find-services-entry): FT + (socks-find-services-entry): * progmodes/hideif.el (hif-set-var, hif-nexttoken, hif-comma) (hif-find-ifdef-block): * progmodes/modula2.el (m2-indent): Fix docstring typos. === modified file 'lisp/progmodes/python.el' --- lisp/progmodes/python.el 2014-02-10 01:34:22 +0000 +++ lisp/progmodes/python.el 2014-03-15 17:37:58 +0000 @@ -357,7 +357,7 @@ (defmacro python-rx (&rest regexps) "Python mode specialized rx macro. -This variant of `rx' supports common python named REGEXPS." +This variant of `rx' supports common Python named REGEXPS." (let ((rx-constituents (append python-rx-constituents rx-constituents))) (cond ((null regexps) (error "No regexp")) @@ -528,7 +528,7 @@ (defsubst python-syntax-count-quotes (quote-char &optional point limit) "Count number of quotes around point (max is 3). QUOTE-CHAR is the quote char to count. Optional argument POINT is -the point where scan starts (defaults to current point) and LIMIT +the point where scan starts (defaults to current point), and LIMIT is used to limit the scan." (let ((i 0)) (while (and (< i 3) @@ -683,7 +683,7 @@ (defun python-indent-context () "Get information on indentation context. Context information is returned with a cons with the form: - \(STATUS . START) + (STATUS . START) Where status can be any of the following symbols: @@ -963,11 +963,11 @@ When the variable `last-command' is not equal to one of the symbols inside `python-indent-trigger-commands' and FORCE-TOGGLE -is nil it calculates possible indentation levels and saves it in -the variable `python-indent-levels'. Afterwards it sets the +is nil it calculates possible indentation levels and saves them +in the variable `python-indent-levels'. Afterwards it sets the variable `python-indent-current-level' correctly so offset is -equal to (`nth' `python-indent-current-level' -`python-indent-levels')" +equal to + (nth python-indent-current-level python-indent-levels)" (or (and (or (and (memq this-command python-indent-trigger-commands) (eq last-command this-command)) @@ -1010,14 +1010,14 @@ (defun python-indent-dedent-line-backspace (arg) "De-indent current line. Argument ARG is passed to `backward-delete-char-untabify' when -point is not in between the indentation." +point is not in between the indentation." (interactive "*p") (when (not (python-indent-dedent-line)) (backward-delete-char-untabify arg))) (put 'python-indent-dedent-line-backspace 'delete-selection 'supersede) (defun python-indent-region (start end) - "Indent a python region automagically. + "Indent a Python region automagically. Called from a program, START and END specify the region to indent." (let ((deactivate-mark nil)) @@ -1076,7 +1076,7 @@ (add-to-list 'debug-ignored-errors "^Can't shift all lines enough") (defun python-indent-shift-right (start end &optional count) - "Shift lines contained in region START END by COUNT columns to the left. + "Shift lines contained in region START END by COUNT columns to the right. COUNT defaults to `python-indent-offset'. If region isn't active, the current line is shifted. The shifted region includes the lines in which START and END lie." @@ -1091,10 +1091,9 @@ (defun python-indent-post-self-insert-function () "Adjust indentation after insertion of some characters. -This function is intended to be added to the -`post-self-insert-hook.' If a line renders a paren alone, after -adding a char before it, the line will be re-indented -automatically if needed." +This function is intended to be added to `post-self-insert-hook.' +If a line renders a paren alone, after adding a char before it, +the line will be re-indented automatically if needed." (when (and electric-indent-mode (eq (char-before) last-command-event)) (cond @@ -1176,10 +1175,10 @@ (defun python-nav-beginning-of-defun (&optional arg) "Move point to `beginning-of-defun'. -With positive ARG search backwards else search forward. When ARG -is nil or 0 defaults to 1. When searching backwards nested -defuns are handled with care depending on current point -position. Return non-nil if point is moved to +With positive ARG search backwards else search forward. +ARG nil or 0 defaults to 1. When searching backwards, +nested defuns are handled with care depending on current +point position. Return non-nil if point is moved to `beginning-of-defun'." (when (or (null arg) (= arg 0)) (setq arg 1)) (let ((found)) @@ -1559,7 +1558,7 @@ (defun python-nav-backward-sexp (&optional arg) "Move backward across expressions. With ARG, do it that many times. Negative arg -N means move -backward N times." +forward N times." (interactive "^p") (or arg (setq arg 1)) (python-nav-forward-sexp (- arg))) @@ -1580,7 +1579,7 @@ (defun python-nav-backward-sexp-safe (&optional arg) "Move backward safely across expressions. With ARG, do it that many times. Negative arg -N means move -backward N times." +forward N times." (interactive "^p") (or arg (setq arg 1)) (python-nav-forward-sexp-safe (- arg))) @@ -1640,7 +1639,7 @@ (defun python-nav-backward-up-list (&optional arg) "Move backward out of one level of parentheses (or blocks). With ARG, do this that many times. -A negative argument means move backward but still to a less deep spot. +A negative argument means move forward but still to a less deep spot. This command assumes point is not in a string or comment." (interactive "^p") (or arg (setq arg 1)) @@ -1695,36 +1694,36 @@ :group 'python) (defcustom python-shell-prompt-regexp ">>> " - "Regular Expression matching top\-level input prompt of python shell. + "Regular expression matching top-level input prompt of Python shell. It should not contain a caret (^) at the beginning." :type 'string :group 'python :safe 'stringp) (defcustom python-shell-prompt-block-regexp "[.][.][.] " - "Regular Expression matching block input prompt of python shell. + "Regular expression matching block input prompt of Python shell. It should not contain a caret (^) at the beginning." :type 'string :group 'python :safe 'stringp) (defcustom python-shell-prompt-output-regexp "" - "Regular Expression matching output prompt of python shell. + "Regular expression matching output prompt of Python shell. It should not contain a caret (^) at the beginning." :type 'string :group 'python :safe 'stringp) (defcustom python-shell-prompt-pdb-regexp "[(<]*[Ii]?[Pp]db[>)]+ " - "Regular Expression matching pdb input prompt of python shell. + "Regular expression matching pdb input prompt of Python shell. It should not contain a caret (^) at the beginning." :type 'string :group 'python :safe 'stringp) (defcustom python-shell-enable-font-lock t - "Should syntax highlighting be enabled in the python shell buffer? -Restart the python shell after changing this variable for it to take effect." + "Should syntax highlighting be enabled in the Python shell buffer? +Restart the Python shell after changing this variable for it to take effect." :type 'boolean :group 'python :safe 'booleanp) @@ -1890,9 +1889,9 @@ (define-derived-mode inferior-python-mode comint-mode "Inferior Python" "Major mode for Python inferior process. Runs a Python interpreter as a subprocess of Emacs, with Python -I/O through an Emacs buffer. Variables -`python-shell-interpreter' and `python-shell-interpreter-args' -controls which Python interpreter is run. Variables +I/O through an Emacs buffer. Variables `python-shell-interpreter' +and `python-shell-interpreter-args' control which Python +interpreter is run. Variables `python-shell-prompt-regexp', `python-shell-prompt-output-regexp', `python-shell-prompt-block-regexp', @@ -1960,8 +1959,8 @@ (compilation-shell-minor-mode 1)) (defun python-shell-make-comint (cmd proc-name &optional pop internal) - "Create a python shell comint buffer. -CMD is the python command to be executed and PROC-NAME is the + "Create a Python shell comint buffer. +CMD is the Python command to be executed and PROC-NAME is the process name the comint buffer will get. After the comint buffer is created the `inferior-python-mode' is activated. When optional argument POP is non-nil the buffer is shown. When @@ -2000,8 +1999,8 @@ dedicated process for the current buffer is open. When numeric prefix arg is other than 0 or 4 do not SHOW. -Runs the hook `inferior-python-mode-hook' (after the -`comint-mode-hook' is run). \(Type \\[describe-mode] in the +Runs the hook `inferior-python-mode-hook' after +`comint-mode-hook' is run. (Type \\[describe-mode] in the process buffer for a list of commands.)" (interactive (if current-prefix-arg @@ -2021,7 +2020,7 @@ `python-shell-internal-get-process-name' returns. This new kind of shell is intended to be used for generic -communication related to defined configurations, the main +communication related to defined configurations; the main difference with global or dedicated shells is that these ones are attached to a configuration, not a buffer. This means that can be used for example to retrieve the sys.path and other stuff, @@ -2037,7 +2036,7 @@ (python-shell-internal-get-process-name) nil t)))) (defun python-shell-get-buffer () - "Get inferior Python buffer for current buffer and return it." + "Return inferior Python buffer for current buffer." (let* ((dedicated-proc-name (python-shell-get-process-name t)) (dedicated-proc-buffer-name (format "*%s*" dedicated-proc-name)) (global-proc-name (python-shell-get-process-name nil)) @@ -2049,7 +2048,7 @@ (and global-running global-proc-buffer-name)))) (defun python-shell-get-process () - "Get inferior Python process for current buffer and return it." + "Return inferior Python process for current buffer." (get-buffer-process (python-shell-get-buffer))) (defun python-shell-get-or-create-process () @@ -2216,7 +2215,7 @@ This is a wrapper over `buffer-substring' that takes care of different transformations for the code sent to be evaluated in the python shell: - 1. When Optional Argument NOMAIN is non-nil everything under an + 1. When optional argument NOMAIN is non-nil everything under an \"if __name__ == '__main__'\" block will be removed. 2. When a subregion of the buffer is sent, it takes care of appending extra empty lines so tracebacks are correct. @@ -2288,7 +2287,7 @@ (defun python-shell-send-buffer (&optional arg) "Send the entire buffer to inferior Python process. With prefix ARG allow execution of code inside blocks delimited -by \"if __name__== '__main__':\"" +by \"if __name__== '__main__':\"." (interactive "P") (save-restriction (widen) @@ -2319,8 +2318,8 @@ delete) "Send FILE-NAME to inferior Python PROCESS. If TEMP-FILE-NAME is passed then that file is used for processing -instead, while internally the shell will continue to use -FILE-NAME. If DELETE is non-nil, delete the file afterwards." +instead, while internally the shell will continue to use FILE-NAME. +If DELETE is non-nil, delete the file afterwards." (interactive "fFile to send: ") (let* ((process (or process (python-shell-get-or-create-process))) (temp-file-name (when temp-file-name @@ -2420,8 +2419,7 @@ (defun python-shell-completion-get-completions (process line input) "Do completion at point for PROCESS. -LINE is used to detect the context on how to complete given -INPUT." +LINE is used to detect the context on how to complete given INPUT." (let* ((prompt ;; Get last prompt of the inferior process buffer (this ;; intentionally avoids using `comint-last-prompt' because @@ -2507,8 +2505,8 @@ (defun python-shell-completion-complete-or-indent () "Complete or indent depending on the context. -If content before pointer is all whitespace indent. If not try -to complete." +If content before pointer is all whitespace, indent. +If not try to complete." (interactive) (if (string-match "^[[:space:]]*$" (buffer-substring (comint-line-beginning-position) @@ -2520,14 +2518,14 @@ ;;; PDB Track integration (defcustom python-pdbtrack-activate t - "Non-nil makes python shell enable pdbtracking." + "Non-nil makes Python shell enable pdbtracking." :type 'boolean :group 'python :safe 'booleanp) (defcustom python-pdbtrack-stacktrace-info-regexp "> \\([^\"(<]+\\)(\\([0-9]+\\))\\([?a-zA-Z0-9_<>]+\\)()" - "Regular Expression matching stacktrace information. + "Regular expression matching stacktrace information. Used to extract the current line and module being inspected." :type 'string :group 'python @@ -2613,9 +2611,9 @@ (defun python-completion-complete-at-point () "Complete current symbol at point. -For this to work the best as possible you should call +For this to work as best as possible you should call `python-shell-send-buffer' from time to time so context in -inferior python process is updated properly." +inferior Python process is updated properly." (let ((process (python-shell-get-process))) (if (not process) (error "Completion needs an inferior Python process running") @@ -2660,54 +2658,54 @@ This affects `python-fill-string' behavior with regards to triple quotes positioning. -Possible values are DJANGO, ONETWO, PEP-257, PEP-257-NN, -SYMMETRIC, and NIL. A value of NIL won't care about quotes +Possible values are `django', `onetwo', `pep-257', `pep-257-nn', +`symmetric', and nil. A value of nil won't care about quotes position and will treat docstrings a normal string, any other value may result in one of the following docstring styles: -DJANGO: - - \"\"\" - Process foo, return bar. - \"\"\" - - \"\"\" - Process foo, return bar. - - If processing fails throw ProcessingError. - \"\"\" - -ONETWO: - - \"\"\"Process foo, return bar.\"\"\" - - \"\"\" - Process foo, return bar. - - If processing fails throw ProcessingError. - - \"\"\" - -PEP-257: - - \"\"\"Process foo, return bar.\"\"\" - - \"\"\"Process foo, return bar. - - If processing fails throw ProcessingError. - - \"\"\" - -PEP-257-NN: - - \"\"\"Process foo, return bar.\"\"\" - - \"\"\"Process foo, return bar. - - If processing fails throw ProcessingError. - \"\"\" - -SYMMETRIC: +`django': + + \"\"\" + Process foo, return bar. + \"\"\" + + \"\"\" + Process foo, return bar. + + If processing fails throw ProcessingError. + \"\"\" + +`onetwo': + + \"\"\"Process foo, return bar.\"\"\" + + \"\"\" + Process foo, return bar. + + If processing fails throw ProcessingError. + + \"\"\" + +`pep-257': + + \"\"\"Process foo, return bar.\"\"\" + + \"\"\"Process foo, return bar. + + If processing fails throw ProcessingError. + + \"\"\" + +`pep-257-nn': + + \"\"\"Process foo, return bar.\"\"\" + + \"\"\"Process foo, return bar. + + If processing fails throw ProcessingError. + \"\"\" + +`symmetric': \"\"\"Process foo, return bar.\"\"\" @@ -3064,8 +3062,8 @@ (defun python-check (command) "Check a Python file (default current buffer's file). -Runs COMMAND, a shell command, as if by `compile'. See -`python-check-command' for the default." +Runs COMMAND, a shell command, as if by `compile'. +See `python-check-command' for the default." (interactive (list (read-string "Check command: " (or python-check-custom-command @@ -3130,10 +3128,9 @@ (defun python-eldoc--get-doc-at-point (&optional force-input force-process) "Internal implementation to get documentation at point. -If not FORCE-INPUT is passed then what -`python-info-current-symbol' returns will be used. If not -FORCE-PROCESS is passed what `python-shell-get-process' returns -is used." +If not FORCE-INPUT is passed then what `python-info-current-symbol' +returns will be used. If not FORCE-PROCESS is passed what +`python-shell-get-process' returns is used." (let ((process (or force-process (python-shell-get-process)))) (if (not process) (error "Eldoc needs an inferior Python process running") @@ -3146,9 +3143,9 @@ (defun python-eldoc-function () "`eldoc-documentation-function' for Python. -For this to work the best as possible you should call +For this to work as best as possible you should call `python-shell-send-buffer' from time to time so context in -inferior python process is updated properly." +inferior Python process is updated properly." (python-eldoc--get-doc-at-point)) (defun python-eldoc-at-point (symbol) @@ -3185,15 +3182,15 @@ It must be a function with two arguments: TYPE and NAME.") (defun python-imenu-format-item-label (type name) - "Return imenu label for single node using TYPE and NAME." + "Return Imenu label for single node using TYPE and NAME." (format "%s (%s)" name type)) (defun python-imenu-format-parent-item-label (type name) - "Return imenu label for parent node using TYPE and NAME." + "Return Imenu label for parent node using TYPE and NAME." (format "%s..." (python-imenu-format-item-label type name))) (defun python-imenu-format-parent-item-jump-label (type _name) - "Return imenu label for parent node jump using TYPE and NAME." + "Return Imenu label for parent node jump using TYPE and NAME." (if (string= type "class") "*class definition*" "*function definition*")) @@ -3210,7 +3207,7 @@ (defun python-imenu--build-tree (&optional min-indent prev-indent tree) "Recursively build the tree of nested definitions of a node. -Arguments MIN-INDENT PREV-INDENT and TREE are internal and should +Arguments MIN-INDENT, PREV-INDENT and TREE are internal and should not be passed explicitly unless you know what you are doing." (setq min-indent (or min-indent 0) prev-indent (or prev-indent python-indent-offset)) @@ -3251,7 +3248,7 @@ tree))))))) (defun python-imenu-create-index () - "Return tree Imenu alist for the current python buffer. + "Return tree Imenu alist for the current Python buffer. Change `python-imenu-format-item-label-function', `python-imenu-format-parent-item-label-function', `python-imenu-format-parent-item-jump-label-function' to @@ -3264,18 +3261,19 @@ index)) (defun python-imenu-create-flat-index (&optional alist prefix) - "Return flat outline of the current python buffer for Imenu. -Optional Argument ALIST is the tree to be flattened, when nil + "Return flat outline of the current Python buffer for Imenu. +Optional argument ALIST is the tree to be flattened; when nil `python-imenu-build-index' is used with `python-imenu-format-parent-item-jump-label-function' `python-imenu-format-parent-item-label-function' -`python-imenu-format-item-label-function' set to (lambda (type -name) name). Optional Argument PREFIX is used in recursive calls -and should not be passed explicitly. +`python-imenu-format-item-label-function' set to + (lambda (type name) name) +Optional argument PREFIX is used in recursive calls and should +not be passed explicitly. Converts this: - \((\"Foo\" . 103) + ((\"Foo\" . 103) (\"Bar\" . 138) (\"decorator\" (\"decorator\" . 173) @@ -3285,7 +3283,7 @@ To this: - \((\"Foo\" . 103) + ((\"Foo\" . 103) (\"Bar\" . 138) (\"decorator\" . 173) (\"decorator.wrap\" . 353) @@ -3318,9 +3316,8 @@ (defun python-info-current-defun (&optional include-type) "Return name of surrounding function with Python compatible dotty syntax. Optional argument INCLUDE-TYPE indicates to include the type of the defun. -This function is compatible to be used as -`add-log-current-defun-function' since it returns nil if point is -not inside a defun." +This function can be used as the value of `add-log-current-defun-function' +since it returns nil if point is not inside a defun." (save-restriction (widen) (save-excursion @@ -3583,13 +3580,13 @@ (looking-at python-nav-beginning-of-defun-regexp)))) (defun python-info-current-line-comment-p () - "Check if current line is a comment line." + "Return non-nil if current line is a comment line." (char-equal (or (char-after (+ (line-beginning-position) (current-indentation))) ?_) ?#)) (defun python-info-current-line-empty-p () - "Check if current line is empty, ignoring whitespace." + "Return non-nil if current line is empty, ignoring whitespace." (save-excursion (beginning-of-line 1) (looking-at @@ -3633,9 +3630,9 @@ (defun python-util-popn (lst n) "Return LST first N elements. -N should be an integer, when it's a natural negative number its -opposite is used. When N is bigger than the length of LST, the -list is returned as is." +N should be an integer, when negative its opposite is used. +When N is bigger than the length of LST, the list is +returned as is." (let* ((n (min (abs n))) (len (length lst)) (acc)) ------------------------------------------------------------ revno: 116767 fixes bug: http://debbugs.gnu.org/17015 committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2014-03-15 12:16:12 +0100 message: src/buffer.c (Fset_buffer): Document return value (bug#17015). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-03-14 10:38:46 +0000 +++ src/ChangeLog 2014-03-15 11:16:12 +0000 @@ -1,3 +1,7 @@ +2014-03-15 Juanma Barranquero + + * buffer.c (Fset_buffer): Document return value (bug#17015). + 2014-03-14 Martin Rudalics * w32term.c (x_set_window_size): When frame-resize-pixelwise is === modified file 'src/buffer.c' --- src/buffer.c 2014-03-07 15:11:12 +0000 +++ src/buffer.c 2014-03-15 11:16:12 +0000 @@ -2187,11 +2187,12 @@ DEFUN ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0, doc: /* Make buffer BUFFER-OR-NAME current for editing operations. -BUFFER-OR-NAME may be a buffer or the name of an existing buffer. See -also `with-current-buffer' when you want to make a buffer current +BUFFER-OR-NAME may be a buffer or the name of an existing buffer. +See also `with-current-buffer' when you want to make a buffer current temporarily. This function does not display the buffer, so its effect ends when the current command terminates. Use `switch-to-buffer' or -`pop-to-buffer' to switch buffers permanently. */) +`pop-to-buffer' to switch buffers permanently. +The return value is the buffer made current. */) (register Lisp_Object buffer_or_name) { register Lisp_Object buffer; ------------------------------------------------------------ revno: 116766 committer: Dmitry Gutov branch nick: trunk timestamp: Sat 2014-03-15 05:07:06 +0200 message: Update `blink-matching-paren' in the manual * doc/emacs/programs.texi (Matching): Update WRT to the new `blink-matchin-paren' behavior. * doc/lispref/display.texi (Blinking): Update WRT to the new `blink-matchin-paren' behavior. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-03-13 05:27:28 +0000 +++ doc/emacs/ChangeLog 2014-03-15 03:07:06 +0000 @@ -1,3 +1,8 @@ +2014-03-15 Dmitry Gutov + + * programs.texi (Matching): Update WRT to the new + `blink-matchin-paren' behavior. + 2014-03-13 Paul Eggert * mule.texi (International, Language Environments): Update === modified file 'doc/emacs/programs.texi' --- doc/emacs/programs.texi 2014-02-28 03:02:50 +0000 +++ doc/emacs/programs.texi 2014-03-15 03:07:06 +0000 @@ -813,13 +813,13 @@ @itemize @bullet @item @code{blink-matching-paren} turns the feature on or off: @code{nil} -disables it, but the default is @code{t} to enable it. +disables it, but the default is @code{t} to enable it. Set it to +@code{jump} to make indication work through cursor movement. @item -@code{blink-matching-delay} says how many seconds to leave the cursor -on the matching opening delimiter, before bringing it back to the real -location of point. This may be an integer or floating-point number; -the default is 1. +@code{blink-matching-delay} says how many seconds to keep indicating +the matching opening delimiter. This may be an integer or +floating-point number; the default is 1. @item @code{blink-matching-paren-distance} specifies how many characters === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-03-14 10:38:46 +0000 +++ doc/lispref/ChangeLog 2014-03-15 03:07:06 +0000 @@ -1,3 +1,8 @@ +2014-03-15 Dmitry Gutov + + * display.texi (Blinking): Update WRT to the new + `blink-matchin-paren' behavior. + 2014-03-14 Martin Rudalics * display.texi (Temporary Displays): Say that === modified file 'doc/lispref/display.texi' --- doc/lispref/display.texi 2014-03-14 10:38:46 +0000 +++ doc/lispref/display.texi 2014-03-15 03:07:06 +0000 @@ -5957,18 +5957,19 @@ @end defopt @defopt blink-matching-delay -This variable specifies the number of seconds for the cursor to remain -at the matching parenthesis. A fraction of a second often gives -good results, but the default is 1, which works on all systems. +This variable specifies the number of seconds to keep indicating the +matching parenthesis. A fraction of a second often gives good +results, but the default is 1, which works on all systems. @end defopt @deffn Command blink-matching-open This function is the default value of @code{blink-paren-function}. It -assumes that point follows a character with close parenthesis syntax and -moves the cursor momentarily to the matching opening character. If that -character is not already on the screen, it displays the character's -context in the echo area. To avoid long delays, this function does not -search farther than @code{blink-matching-paren-distance} characters. +assumes that point follows a character with close parenthesis syntax +and applies the appropriate effect momentarily to the matching opening +character. If that character is not already on the screen, it +displays the character's context in the echo area. To avoid long +delays, this function does not search farther than +@code{blink-matching-paren-distance} characters. Here is an example of calling this function explicitly. === modified file 'etc/NEWS' --- etc/NEWS 2014-03-14 18:29:43 +0000 +++ etc/NEWS 2014-03-15 03:07:06 +0000 @@ -423,6 +423,7 @@ This searches the region for identical lines, and removes all but one copy of each repeated line. The lines need not be sorted. ++++ ** `blink-matching-paren' now only highlights the matching open-paren by default, instead of moving cursor. Set this variable to `jump' to enable the old behavior.