------------------------------------------------------------ revno: 116667 committer: Glenn Morris branch nick: trunk timestamp: Tue 2014-03-04 23:41:48 -0800 message: Try to document some smie changes * doc/lispref/modes.texi (SMIE Customization): New section. * doc/lispref/elisp.texi (Top): Update detailed menu. * etc/NEWS: Related edits. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-03-04 10:44:46 +0000 +++ doc/lispref/ChangeLog 2014-03-05 07:41:48 +0000 @@ -1,3 +1,8 @@ +2014-03-05 Glenn Morris + + * modes.texi (SMIE Customization): New section. + * elisp.texi (Top): Update detailed menu. + 2014-03-04 Martin Rudalics * windows.texi (Windows and Frames): Add some missing &optional === modified file 'doc/lispref/elisp.texi' --- doc/lispref/elisp.texi 2014-03-02 03:34:36 +0000 +++ doc/lispref/elisp.texi 2014-03-05 07:41:48 +0000 @@ -903,6 +903,7 @@ * SMIE Indentation:: Specifying indentation rules. * SMIE Indentation Helpers:: Helper functions for indentation rules. * SMIE Indentation Example:: Sample indentation rules. +* SMIE Customization:: Customizing indentation. Documentation === modified file 'doc/lispref/modes.texi' --- doc/lispref/modes.texi 2014-02-27 14:09:26 +0000 +++ doc/lispref/modes.texi 2014-03-05 07:41:48 +0000 @@ -3383,6 +3383,7 @@ * SMIE Indentation:: Specifying indentation rules. * SMIE Indentation Helpers:: Helper functions for indentation rules. * SMIE Indentation Example:: Sample indentation rules. +* SMIE Customization:: Customizing indentation. @end menu @node SMIE setup @@ -3961,6 +3962,52 @@ first @code{"if"} of the sequence. @end itemize +@c In some sense this belongs more in the Emacs manual. +@node SMIE Customization +@subsubsection Customizing Indentation + +If you are using a mode whose indentation is provided by SMIE, you can +customize the indentation to suit your preferences. You can do this +on a per-mode basis (using the option @code{smie-config}), or a +per-file basis (using the function @code{smie-config-local} in a +file-local variable specification). + +@defopt smie-config +This option lets you customize indentation on a per-mode basis. +It is an alist with elements of the form @code{(@var{mode} . @var{rules})}. +For the precise form of rules, see the variable's documentation; but +you may find it easier to use the command @code{smie-config-guess}. +@end defopt + +@deffn Command smie-config-guess +This command tries to work out appropriate settings to produce +your preferred style of indentation. Simply call the command while +visiting a file that is indented with your style. +@end deffn + +@deffn Command smie-config-save +Call this command after using @code{smie-config-guess}, to save your +settings for future sessions. +@end deffn + +@deffn Command smie-config-show-indent &optional move +This command displays the rules that are used to indent the current +line. +@end deffn + +@deffn Command smie-config-set-indent +This command adds a local rule to adjust the indentation of the current line. +@end deffn + +@defun smie-config-local rules +This function adds @var{rules} as indentation rules for the current buffer. +These add to any mode-specific rules defined by the @code{smie-config} option. +To specify custom indentation rules for a specific file, add an entry +to the file's local variables of the form: +@code{eval: (smie-config-local '(@var{rules}))}. +@end defun + + @node Desktop Save Mode @section Desktop Save Mode @cindex desktop save mode === modified file 'etc/NEWS' --- etc/NEWS 2014-03-04 10:44:46 +0000 +++ etc/NEWS 2014-03-05 07:41:48 +0000 @@ -904,11 +904,17 @@ ** SMIE -*** You can customize the indentation of modes that use SMIE via `smie-config'. ++++ +*** You can customize the SMIE indentation of a mode via `smie-config'. The command `smie-config-guess' can help you derive the appropriate indentation settings, if you provide it with an indented sample file. Use `smie-config-save' to save the result. ++++ +*** You can customize the SMIE indentation of a file by adding an entry to +the file's local variables of the form: `eval: (smie-config-local '(RULES)'. + ++++ *** New commands `smie-config-show-indent' and `smie-config-set-indent'. --- ------------------------------------------------------------ revno: 116666 committer: Bastien Guerry branch nick: trunk timestamp: Wed 2014-03-05 08:04:01 +0100 message: Revert revno 116657. Thanks to Leo for reporting this. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-04 17:01:37 +0000 +++ lisp/ChangeLog 2014-03-05 07:04:01 +0000 @@ -16,11 +16,6 @@ * net/tramp-sh.el (tramp-sh-handle-vc-registered): Do not call `tramp-send-command-and-check'. -2014-03-04 Bastien Guerry - - * minibuffer.el (minibuffer-completion-help): Use 0 as the - fallback value for `base-size'. (Bug#16933) - 2014-03-04 Juanma Barranquero * hexl.el (hexl-address-region, hexl-ascii-region) === modified file 'lisp/minibuffer.el' --- lisp/minibuffer.el 2014-03-04 17:01:37 +0000 +++ lisp/minibuffer.el 2014-03-05 07:04:01 +0000 @@ -1751,7 +1751,7 @@ (if completions "Sole completion" "No completions"))) (let* ((last (last completions)) - (base-size (or (cdr last) 0)) + (base-size (cdr last)) (prefix (unless (zerop base-size) (substring string 0 base-size))) (all-md (completion--metadata (buffer-substring-no-properties start (point)) ------------------------------------------------------------ revno: 116665 fixes bug: http://debbugs.gnu.org/16925 committer: Paul Eggert branch nick: trunk timestamp: Tue 2014-03-04 22:31:57 -0800 message: Fix "resource temporarily unavailable" with xgselect. * xgselect.c: Include . (xg_select) [!USE_GTK]: Don't lose track of errno. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-03-05 06:28:20 +0000 +++ src/ChangeLog 2014-03-05 06:31:57 +0000 @@ -1,5 +1,9 @@ 2014-03-05 Paul Eggert + Fix "resource temporarily unavailable" with xgselect (Bug#16925). + * xgselect.c: Include . + (xg_select) [!USE_GTK]: Don't lose track of errno. + Fix minor --enable-gcc-warnings issues. * widget.c (update_various_frame_slots, EmacsFrameResize): Avoid unused locals. Prefer 'if' to '#if' when either will do. === modified file 'src/xgselect.c' --- src/xgselect.c 2014-02-04 11:40:31 +0000 +++ src/xgselect.c 2014-03-05 06:31:57 +0000 @@ -25,6 +25,7 @@ #include #include +#include #include #include "frame.h" @@ -43,6 +44,7 @@ int gfds_size = sizeof gfds_buf / sizeof *gfds_buf; int n_gfds, retval = 0, our_fds = 0, max_fds = fds_lim - 1; int i, nfds, tmo_in_millisec; + bool need_to_dispatch; USE_SAFE_ALLOCA; /* Do not try to optimize with an initial check with g_main_context_pending @@ -127,10 +129,17 @@ /* If Gtk+ is in use eventually gtk_main_iteration will be called, unless retval is zero. */ #ifdef USE_GTK - if (retval == 0) + need_to_dispatch = retval == 0; +#else + need_to_dispatch = true; #endif - while (g_main_context_pending (context)) - g_main_context_dispatch (context); + if (need_to_dispatch) + { + int pselect_errno = errno; + while (g_main_context_pending (context)) + g_main_context_dispatch (context); + errno = pselect_errno; + } /* To not have to recalculate timeout, return like this. */ if ((our_fds > 0 || (nfds == 0 && tmop == &tmo)) && (retval == 0)) ------------------------------------------------------------ revno: 116664 committer: Paul Eggert branch nick: trunk timestamp: Tue 2014-03-04 22:28:20 -0800 message: Fix minor --enable-gcc-warnings issues. * widget.c (update_various_frame_slots, EmacsFrameResize): Avoid unused locals. Prefer 'if' to '#if' when either will do. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-03-04 19:02:49 +0000 +++ src/ChangeLog 2014-03-05 06:28:20 +0000 @@ -1,3 +1,9 @@ +2014-03-05 Paul Eggert + + Fix minor --enable-gcc-warnings issues. + * widget.c (update_various_frame_slots, EmacsFrameResize): + Avoid unused locals. Prefer 'if' to '#if' when either will do. + 2014-03-04 Ken Brown * gmalloc.c (aligned_alloc): Clarify the code by making `adj' === modified file 'src/widget.c' --- src/widget.c 2014-02-18 10:52:00 +0000 +++ src/widget.c 2014-03-05 06:28:20 +0000 @@ -598,16 +598,18 @@ update_various_frame_slots (EmacsFrame ew) { struct frame *f = ew->emacs_frame.frame; - struct x_output *x = f->output_data.x; + /* Don't do that: It confuses the check in change_frame_size_1 whether the pixel size of the frame changed due to a change of the internal border width. Bug#16736. */ -#if 0 - FRAME_PIXEL_HEIGHT (f) = ew->core.height + x->menubar_height; - FRAME_PIXEL_WIDTH (f) = ew->core.width; -#endif + if (false) + { + struct x_output *x = f->output_data.x; + FRAME_PIXEL_HEIGHT (f) = ew->core.height + x->menubar_height; + FRAME_PIXEL_WIDTH (f) = ew->core.width; + } + f->internal_border_width = ew->emacs_frame.internal_border_width; - } static void @@ -682,13 +684,11 @@ { EmacsFrame ew = (EmacsFrame)widget; struct frame *f = ew->emacs_frame.frame; - struct x_output *x = f->output_data.x; -#if 0 /* Always process resize requests pixelwise. Frame maximizing - should work even when frame_resize_pixelwise is nil. */ - if (frame_resize_pixelwise) + /* Always process resize requests pixelwise. Frame maximizing + should work even when frame_resize_pixelwise is nil. */ + if (true || frame_resize_pixelwise) { -#endif /* 0 */ int width, height; pixel_to_text_size (ew, ew->core.width, ew->core.height, &width, &height); @@ -698,10 +698,10 @@ update_various_frame_slots (ew); cancel_mouse_face (f); -#if 0 /* See comment above. */ } else { + struct x_output *x = f->output_data.x; int columns, rows; pixel_to_char_size (ew, ew->core.width, ew->core.height, &columns, &rows); @@ -717,7 +717,6 @@ cancel_mouse_face (f); } } -#endif /* 0 */ } static Boolean ------------------------------------------------------------ revno: 116663 fixes bug: http://debbugs.gnu.org/16896 committer: Paul Eggert branch nick: trunk timestamp: Tue 2014-03-04 18:39:05 -0800 message: Fix configuration bug on Solaris 2.5.1. * configure.ac: Fix a bug in shell pattern matching that caused 'configure' to treat Solaris 2.5.1 as if it were Solaris 10 or later. diff: === modified file 'ChangeLog' --- ChangeLog 2014-03-03 04:57:26 +0000 +++ ChangeLog 2014-03-05 02:39:05 +0000 @@ -1,3 +1,9 @@ +2014-03-05 Paul Eggert + + Fix configuration bug on Solaris 2.5.1 (Bug#16896). + * configure.ac: Fix a bug in shell pattern matching that caused + 'configure' to treat Solaris 2.5.1 as if it were Solaris 10 or later. + 2014-02-25 Paul Eggert Merge from gnulib (Bug#16825). === modified file 'configure.ac' --- configure.ac 2014-02-25 18:28:59 +0000 +++ configure.ac 2014-03-05 02:39:05 +0000 @@ -575,6 +575,10 @@ * ) unported=yes ;; esac case "${canonical}" in + *-sunos5.[1-9][0-9]* | *-solaris2.[1-9][0-9]* ) + opsys=sol2-10 + emacs_check_sunpro_c=yes + ;; *-sunos5.6* | *-solaris2.6* ) opsys=sol2-6 RANLIB="ar -ts" @@ -583,10 +587,6 @@ opsys=sol2-6 emacs_check_sunpro_c=yes ;; - *-sunos5* | *-solaris* ) - opsys=sol2-10 - emacs_check_sunpro_c=yes - ;; esac ## Watch out for a compiler that we know will not work. case "${canonical}" in ------------------------------------------------------------ revno: 116662 committer: Ken Brown branch nick: trunk timestamp: Tue 2014-03-04 14:02:49 -0500 message: Further follow-up to last change in gmalloc.c. * src/gmalloc.c (aligned_alloc): Clarify the code by making `adj' represent the actual adjustment needed for alignment. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-03-04 17:35:15 +0000 +++ src/ChangeLog 2014-03-04 19:02:49 +0000 @@ -1,3 +1,8 @@ +2014-03-04 Ken Brown + + * gmalloc.c (aligned_alloc): Clarify the code by making `adj' + represent the actual adjustment needed for alignment. + 2014-03-04 Eli Zaretskii * gmalloc.c (aligned_alloc): Don't allocate more memory than === modified file 'src/gmalloc.c' --- src/gmalloc.c 2014-03-04 17:35:15 +0000 +++ src/gmalloc.c 2014-03-04 19:02:49 +0000 @@ -1597,34 +1597,34 @@ /* Figure out how much we will need to pad this particular block to achieve the required alignment. */ - adj = (uintptr_t) result % alignment; - if (adj == 0) - adj = alignment; + adj = alignment - (uintptr_t) result % alignment; + if (adj == alignment) + adj = 0; - if (adj != 1) + if (adj != alignment - 1) { do { /* Reallocate the block with only as much excess as it needs. */ free (result); - result = malloc (size + alignment - adj); + result = malloc (size + adj); if (result == NULL) /* Impossible unless interrupted. */ return NULL; lastadj = adj; - adj = (uintptr_t) result % alignment; - if (adj == 0) - adj = alignment; + adj = alignment - (uintptr_t) result % alignment; + if (adj == alignment) + adj = 0; /* It's conceivable we might have been so unlucky as to get a different block with weaker alignment. If so, this block is too short to contain SIZE after alignment correction. So we must try again and get another block, slightly larger. */ - } while (adj < lastadj); + } while (adj > lastadj); } - if (adj != alignment) + if (adj != 0) { /* Record this block in the list of aligned blocks, so that `free' can identify the pointer it is passed, which will be in the middle @@ -1648,7 +1648,7 @@ if (l != NULL) { l->exact = result; - result = l->aligned = (char *) result + alignment - adj; + result = l->aligned = (char *) result + adj; } UNLOCK_ALIGNED_BLOCKS (); if (l == NULL) ------------------------------------------------------------ revno: 116661 fixes bug: http://debbugs.gnu.org/16901 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2014-03-04 19:35:15 +0200 message: Follow-up improvements for last change in gmalloc.c. src/gmalloc.c (aligned_alloc): Don't allocate more memory than needed, and don't reallocate if the initial allocation already fits the bill. Suggested by Ken Brown . diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-03-04 11:02:36 +0000 +++ src/ChangeLog 2014-03-04 17:35:15 +0000 @@ -1,3 +1,9 @@ +2014-03-04 Eli Zaretskii + + * gmalloc.c (aligned_alloc): Don't allocate more memory than + needed, and don't reallocate if the initial allocation already + fits the bill. Suggested by Ken Brown . + 2014-03-04 YAMAMOTO Mitsuharu * xterm.c (x_draw_stretch_glyph_string): Reset clipping. === modified file 'src/gmalloc.c' --- src/gmalloc.c 2014-03-03 16:46:36 +0000 +++ src/gmalloc.c 2014-03-04 17:35:15 +0000 @@ -38,6 +38,10 @@ #include /* for sbrk */ #endif +#ifdef emacs +extern void emacs_abort (void); +#endif + #ifdef __cplusplus extern "C" { @@ -1594,24 +1598,33 @@ /* Figure out how much we will need to pad this particular block to achieve the required alignment. */ adj = (uintptr_t) result % alignment; + if (adj == 0) + adj = alignment; - do + if (adj != 1) { - /* Reallocate the block with only as much excess as it needs. */ - free (result); - result = malloc (size + alignment - adj); - if (result == NULL) /* Impossible unless interrupted. */ - return NULL; - - lastadj = adj; - adj = (uintptr_t) result % alignment; - /* It's conceivable we might have been so unlucky as to get a - different block with weaker alignment. If so, this block is too - short to contain SIZE after alignment correction. So we must - try again and get another block, slightly larger. */ - } while (adj < lastadj); - - if (adj != 0) + do + { + /* Reallocate the block with only as much excess as it + needs. */ + free (result); + result = malloc (size + alignment - adj); + if (result == NULL) /* Impossible unless interrupted. */ + return NULL; + + lastadj = adj; + adj = (uintptr_t) result % alignment; + if (adj == 0) + adj = alignment; + /* It's conceivable we might have been so unlucky as to get + a different block with weaker alignment. If so, this + block is too short to contain SIZE after alignment + correction. So we must try again and get another block, + slightly larger. */ + } while (adj < lastadj); + } + + if (adj != alignment) { /* Record this block in the list of aligned blocks, so that `free' can identify the pointer it is passed, which will be in the middle ------------------------------------------------------------ revno: 116660 fixes bug: http://debbugs.gnu.org/16933 committer: Glenn Morris branch nick: trunk timestamp: Tue 2014-03-04 09:01:37 -0800 message: * minibuffer.el (completion-hilit-commonality): Revert 2014-03-01 short-cut, which changed the return value. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-04 15:07:59 +0000 +++ lisp/ChangeLog 2014-03-04 17:01:37 +0000 @@ -1,3 +1,8 @@ +2014-03-04 Glenn Morris + + * minibuffer.el (completion-hilit-commonality): + Revert 2014-03-01 short-cut, which changed the return value. (Bug#16933) + 2014-03-04 Juanma Barranquero * hilit-chg.el (hilit-chg-unload-function): New function. === modified file 'lisp/minibuffer.el' --- lisp/minibuffer.el 2014-03-04 14:33:56 +0000 +++ lisp/minibuffer.el 2014-03-04 17:01:37 +0000 @@ -1597,36 +1597,34 @@ It returns a list with font-lock properties applied to each element, and with BASE-SIZE appended as the last element." (when completions - (if (zerop prefix-len) - completions - (let ((com-str-len (- prefix-len (or base-size 0)))) - (nconc - (mapcar - (lambda (elem) - (let ((str - ;; Don't modify the string itself, but a copy, since the - ;; the string may be read-only or used for other purposes. - ;; Furthermore, since `completions' may come from - ;; display-completion-list, `elem' may be a list. - (if (consp elem) - (car (setq elem (cons (copy-sequence (car elem)) - (cdr elem)))) - (setq elem (copy-sequence elem))))) - (font-lock-prepend-text-property - 0 - ;; If completion-boundaries returns incorrect - ;; values, all-completions may return strings - ;; that don't contain the prefix. - (min com-str-len (length str)) - 'face 'completions-common-part str) - (if (> (length str) com-str-len) - (font-lock-prepend-text-property com-str-len (1+ com-str-len) - 'face - 'completions-first-difference - str))) - elem) - completions) - base-size))))) + (let ((com-str-len (- prefix-len (or base-size 0)))) + (nconc + (mapcar + (lambda (elem) + (let ((str + ;; Don't modify the string itself, but a copy, since the + ;; the string may be read-only or used for other purposes. + ;; Furthermore, since `completions' may come from + ;; display-completion-list, `elem' may be a list. + (if (consp elem) + (car (setq elem (cons (copy-sequence (car elem)) + (cdr elem)))) + (setq elem (copy-sequence elem))))) + (font-lock-prepend-text-property + 0 + ;; If completion-boundaries returns incorrect + ;; values, all-completions may return strings + ;; that don't contain the prefix. + (min com-str-len (length str)) + 'face 'completions-common-part str) + (if (> (length str) com-str-len) + (font-lock-prepend-text-property com-str-len (1+ com-str-len) + 'face + 'completions-first-difference + str))) + elem) + completions) + base-size)))) (defun display-completion-list (completions &optional common-substring) "Display the list of completions, COMPLETIONS, using `standard-output'. ------------------------------------------------------------ revno: 116659 committer: Juanma Barranquero branch nick: trunk timestamp: Tue 2014-03-04 16:07:59 +0100 message: lisp/hilit-chg.el (hilit-chg-unload-function): New function. (highlight-changes-mode, highlight-changes-visible-mode): Fix typos. (hilit-chg-map-changes): Prefer cardinal number to digit. (hilit-chg-display-changes): Reflow docstring. (highlight-changes-rotate-faces): Remove superfluous backslash. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-04 14:40:38 +0000 +++ lisp/ChangeLog 2014-03-04 15:07:59 +0000 @@ -1,3 +1,11 @@ +2014-03-04 Juanma Barranquero + + * hilit-chg.el (hilit-chg-unload-function): New function. + (highlight-changes-mode, highlight-changes-visible-mode): Fix typos. + (hilit-chg-map-changes): Prefer cardinal number to digit. + (hilit-chg-display-changes): Reflow docstring. + (highlight-changes-rotate-faces): Remove superfluous backslash. + 2014-03-04 Michael Albinus * net/tramp-sh.el (tramp-sh-handle-vc-registered): Do not call === modified file 'lisp/hilit-chg.el' --- lisp/hilit-chg.el 2014-01-01 07:43:34 +0000 +++ lisp/hilit-chg.el 2014-03-04 15:07:59 +0000 @@ -333,7 +333,7 @@ When Highlight Changes is enabled, changes are marked with a text property. Normally they are displayed in a distinctive face, but -command \\[highlight-changes-visible-mode] can be used to toggles +command \\[highlight-changes-visible-mode] can be used to toggle this on and off. Other functions for buffers in this mode include: @@ -379,7 +379,7 @@ The default value can be customized with variable `highlight-changes-visibility-initial-state'. -This command does not itself set highlight-changes mode." +This command does not itself set Highlight Changes mode." t ;; init-value nil ;; lighter @@ -455,7 +455,7 @@ "Call function FUNC for each region used by Highlight Changes mode. If START-POSITION is nil, (point-min) is used. If END-POSITION is nil, (point-max) is used. -FUNC is called with 3 params: PROPERTY START STOP." +FUNC is called with three params: PROPERTY START STOP." (let ((start (or start-position (point-min))) (limit (or end-position (point-max))) prop end) @@ -470,8 +470,8 @@ (defun hilit-chg-display-changes (&optional beg end) "Display face information for Highlight Changes mode. -An overlay from BEG to END containing a change face is added from the -information in the text property of type `hilit-chg'. +An overlay from BEG to END containing a change face is added +from the information in the text property of type `hilit-chg'. This is the opposite of `hilit-chg-hide-changes'." (hilit-chg-map-changes 'hilit-chg-make-ov beg end)) @@ -731,7 +731,7 @@ this function to `write-file-functions' as a buffer-local value. To do this, eval the following in the buffer to be saved: - \(add-hook 'write-file-functions 'highlight-changes-rotate-faces nil t)" + (add-hook 'write-file-functions 'highlight-changes-rotate-faces nil t)" (interactive) (when (and highlight-changes-mode highlight-changes-visible-mode) (let ((modified (buffer-modified-p)) @@ -1022,6 +1022,12 @@ ;; ;; ================== end of debug =============== +(defun hilit-chg-unload-function () + "Unload the Highlight Changes library." + (global-hi-lock-mode -1) + ;; continue standard unloading + nil) + (provide 'hilit-chg) ;;; hilit-chg.el ends here ------------------------------------------------------------ revno: 116658 committer: Michael Albinus branch nick: trunk timestamp: Tue 2014-03-04 15:40:38 +0100 message: * net/tramp-sh.el (tramp-sh-handle-vc-registered): Do not call `tramp-send-command-and-check'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-04 14:33:56 +0000 +++ lisp/ChangeLog 2014-03-04 14:40:38 +0000 @@ -1,3 +1,8 @@ +2014-03-04 Michael Albinus + + * net/tramp-sh.el (tramp-sh-handle-vc-registered): Do not call + `tramp-send-command-and-check'. + 2014-03-04 Bastien Guerry * minibuffer.el (minibuffer-completion-help): Use 0 as the === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2014-02-27 05:11:50 +0000 +++ lisp/net/tramp-sh.el 2014-03-04 14:40:38 +0000 @@ -3341,7 +3341,6 @@ tramp-vc-registered-file-names "\n") tramp-end-of-heredoc)) - (tramp-send-command-and-check v nil) (with-current-buffer (tramp-get-connection-buffer v) ;; Read the expression. (goto-char (point-min)) ------------------------------------------------------------ revno: 116657 committer: Bastien Guerry branch nick: trunk timestamp: Tue 2014-03-04 15:33:56 +0100 message: minibuffer.el (minibuffer-completion-help): Use 0 as thefallback value for `base-size' * minibuffer.el (minibuffer-completion-help): Use 0 as the fallback value for `base-size'. (Bug#16933) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-04 14:13:41 +0000 +++ lisp/ChangeLog 2014-03-04 14:33:56 +0000 @@ -1,3 +1,8 @@ +2014-03-04 Bastien Guerry + + * minibuffer.el (minibuffer-completion-help): Use 0 as the + fallback value for `base-size'. (Bug#16933) + 2014-03-04 Juanma Barranquero * hexl.el (hexl-address-region, hexl-ascii-region) === modified file 'lisp/minibuffer.el' --- lisp/minibuffer.el 2014-03-01 02:31:05 +0000 +++ lisp/minibuffer.el 2014-03-04 14:33:56 +0000 @@ -1753,7 +1753,7 @@ (if completions "Sole completion" "No completions"))) (let* ((last (last completions)) - (base-size (cdr last)) + (base-size (or (cdr last) 0)) (prefix (unless (zerop base-size) (substring string 0 base-size))) (all-md (completion--metadata (buffer-substring-no-properties start (point)) ------------------------------------------------------------ revno: 116656 committer: Juanma Barranquero branch nick: trunk timestamp: Tue 2014-03-04 15:13:41 +0100 message: lisp/hexl.el: Fix typos in docstrings. (hexl-address-region, hexl-ascii-region) (hexl-goto-hex-address, hexl-backward-char, hexl-forward-char) (hexl-backward-short, hexl-forward-short, hexl-backward-word) (hexl-forward-word, hexl-previous-line, hexl-next-line): Use "Hexl mode" for non-hyperlinked hexl-mode references in docstrings. (hexl-mode): Doc fix. (hexl-ascii-start-column, hexl-beginning-of-line, hexl-end-of-line) (hexl-mode-ruler): Fix typos in docstrings. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-04 13:01:48 +0000 +++ lisp/ChangeLog 2014-03-04 14:13:41 +0000 @@ -1,5 +1,14 @@ 2014-03-04 Juanma Barranquero + * hexl.el (hexl-address-region, hexl-ascii-region) + (hexl-goto-hex-address, hexl-backward-char, hexl-forward-char) + (hexl-backward-short, hexl-forward-short, hexl-backward-word) + (hexl-forward-word, hexl-previous-line, hexl-next-line): + Use "Hexl mode" for non-hyperlinked hexl-mode references in docstrings. + (hexl-mode): Doc fix. + (hexl-ascii-start-column, hexl-beginning-of-line, hexl-end-of-line) + (hexl-mode-ruler): Fix typos in docstrings. + * strokes.el (strokes-xpm-header, strokes-rate-stroke): Fix typos. (strokes-character, strokes-get-grid-position, strokes-list-strokes): Remove superfluous backslashes. === modified file 'lisp/hexl.el' --- lisp/hexl.el 2014-02-10 01:34:22 +0000 +++ lisp/hexl.el 2014-03-04 14:13:41 +0000 @@ -95,12 +95,12 @@ (defface hexl-address-region '((t (:inherit header-line))) - "Face used in address area of hexl-mode buffer." + "Face used in address area of Hexl mode buffer." :group 'hexl) (defface hexl-ascii-region '((t (:inherit header-line))) - "Face used in ascii area of hexl-mode buffer." + "Face used in ASCII area of Hexl mode buffer." :group 'hexl) (defvar hexl-max-address 0 @@ -282,10 +282,10 @@ Each line in the buffer has an \"address\" (displayed in hexadecimal) representing the offset into the file that the characters on this line are at and 16 characters from the file (displayed as hexadecimal -values grouped every `hexl-bits' bits) and as their ASCII values. +values grouped every `hexl-bits' bits, and as their ASCII values). If any of the characters (displayed as ASCII characters) are -unprintable (control or meta characters) they will be replaced as +unprintable (control or meta characters) they will be replaced by periods. If `hexl-mode' is invoked with an argument the buffer is assumed to be @@ -309,8 +309,8 @@ 000000b0: 7461 626c 6520 6368 6172 6163 7465 7220 table character 000000c0: 7265 6769 6f6e 2e0a region.. -Movement is as simple as movement in a normal Emacs text buffer. Most -cursor movement bindings are the same: use \\[hexl-backward-char], \\[hexl-forward-char], \\[hexl-next-line], and \\[hexl-previous-line] +Movement is as simple as movement in a normal Emacs text buffer. +Most cursor movement bindings are the same: use \\[hexl-backward-char], \\[hexl-forward-char], \\[hexl-next-line], and \\[hexl-previous-line] to move the cursor left, right, down, and up. Advanced cursor movement commands (ala \\[hexl-beginning-of-line], \\[hexl-end-of-line], \\[hexl-beginning-of-buffer], and \\[hexl-end-of-buffer]) are @@ -335,7 +335,7 @@ \\[hexl-insert-decimal-char] will insert a given decimal value (if it is between 0 and 255) into the buffer at the current point. -\\[hexl-mode-exit] will exit hexl-mode. +\\[hexl-mode-exit] will exit `hexl-mode'. Note: saving the file with any of the usual Emacs commands will actually convert it back to binary format while saving. @@ -565,7 +565,7 @@ (format "Current address is %d/0x%08x" addr addr))) (defun hexl-ascii-start-column () - "Column at which the ascii portion of the hexl display starts." + "Column at which the ASCII portion of the hexl display starts." (+ 43 (/ 128 hexl-bits))) (defun hexl-address-to-marker (address) @@ -586,7 +586,7 @@ (goto-char (hexl-address-to-marker address))) (defun hexl-goto-hex-address (hex-address) - "Go to hexl-mode address (hex string) HEX-ADDRESS. + "Go to Hexl mode address (hex string) HEX-ADDRESS. Signal error if HEX-ADDRESS is out of range." (interactive "sHex Address: ") (hexl-goto-address (hexl-hex-string-to-integer hex-address))) @@ -615,17 +615,17 @@ ;; move point functions (defun hexl-backward-char (arg) - "Move to left ARG bytes (right if ARG negative) in hexl-mode." + "Move to left ARG bytes (right if ARG negative) in Hexl mode." (interactive "p") (hexl-goto-address (- (hexl-current-address) arg))) (defun hexl-forward-char (arg) - "Move to right ARG bytes (left if ARG negative) in hexl-mode." + "Move to right ARG bytes (left if ARG negative) in Hexl mode." (interactive "p") (hexl-goto-address (+ (hexl-current-address) arg))) (defun hexl-backward-short (arg) - "Move to left ARG shorts (right if ARG negative) in hexl-mode." + "Move to left ARG shorts (right if ARG negative) in Hexl mode." (interactive "p") (hexl-goto-address (let ((address (hexl-current-address))) (if (< arg 0) @@ -657,12 +657,12 @@ address))) (defun hexl-forward-short (arg) - "Move to right ARG shorts (left if ARG negative) in hexl-mode." + "Move to right ARG shorts (left if ARG negative) in Hexl mode." (interactive "p") (hexl-backward-short (- arg))) (defun hexl-backward-word (arg) - "Move to left ARG words (right if ARG negative) in hexl-mode." + "Move to left ARG words (right if ARG negative) in Hexl mode." (interactive "p") (hexl-goto-address (let ((address (hexl-current-address))) (if (< arg 0) @@ -694,18 +694,18 @@ address))) (defun hexl-forward-word (arg) - "Move to right ARG words (left if ARG negative) in hexl-mode." + "Move to right ARG words (left if ARG negative) in Hexl mode." (interactive "p") (hexl-backward-word (- arg))) (defun hexl-previous-line (arg) - "Move vertically up ARG lines [16 bytes] (down if ARG negative) in hexl-mode. + "Move vertically up ARG lines [16 bytes] (down if ARG negative) in Hexl mode. If there is no byte at the target address move to the last byte in that line." (interactive "p") (hexl-next-line (- arg))) (defun hexl-next-line (arg) - "Move vertically down ARG lines [16 bytes] (up if ARG negative) in hexl-mode. + "Move vertically down ARG lines [16 bytes] (up if ARG negative) in Hexl mode. If there is no byte at the target address move to the last byte in that line." (interactive "p") (hexl-goto-address (let ((address (+ (hexl-current-address) (* arg 16)))) @@ -739,12 +739,12 @@ (hexl-goto-address (- hexl-max-address (1- arg)))) (defun hexl-beginning-of-line () - "Goto beginning of line in hexl mode." + "Goto beginning of line in Hexl mode." (interactive) (goto-char (+ (* (/ (point) (hexl-line-displen)) (hexl-line-displen)) 11))) (defun hexl-end-of-line () - "Goto end of line in hexl mode." + "Goto end of line in Hexl mode." (interactive) (hexl-goto-address (let ((address (logior (hexl-current-address) 15))) (if (> address hexl-max-address) @@ -1099,7 +1099,7 @@ )) (defun hexl-mode-ruler () - "Return a string ruler for hexl mode." + "Return a string ruler for Hexl mode." (let* ((highlight (mod (hexl-current-address) 16)) (s (cdr (assq hexl-bits hexl-rulers))) (pos 0)) ------------------------------------------------------------ revno: 116655 committer: Juanma Barranquero branch nick: trunk timestamp: Tue 2014-03-04 14:01:48 +0100 message: lisp/strokes.el: Fix typos. (strokes-xpm-header, strokes-rate-stroke): Fix typos. (strokes-character, strokes-get-grid-position, strokes-list-strokes): Remove superfluous backslashes. (strokes-last-stroke, strokes-global-map, strokes-mode): Reflow docstrings. (strokes-xpm-for-stroke, strokes-xpm-to-compressed-string) (strokes-xpm-for-compressed-string): Use quotes with buffer name. (strokes-distance-squared, strokes-global-set-stroke) (strokes-global-set-stroke-string): Doc fixes. (strokes-help): Fix typos; reflow docstring. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-04 10:44:46 +0000 +++ lisp/ChangeLog 2014-03-04 13:01:48 +0000 @@ -1,3 +1,16 @@ +2014-03-04 Juanma Barranquero + + * strokes.el (strokes-xpm-header, strokes-rate-stroke): Fix typos. + (strokes-character, strokes-get-grid-position, strokes-list-strokes): + Remove superfluous backslashes. + (strokes-last-stroke, strokes-global-map, strokes-mode): + Reflow docstrings. + (strokes-xpm-for-stroke, strokes-xpm-to-compressed-string) + (strokes-xpm-for-compressed-string): Use quotes with buffer name. + (strokes-distance-squared, strokes-global-set-stroke) + (strokes-global-set-stroke-string): Doc fixes. + (strokes-help): Fix typos; reflow docstring. + 2014-03-04 Martin Rudalics * window.el (window-in-direction): Fix doc-string. === modified file 'lisp/strokes.el' --- lisp/strokes.el 2014-02-10 01:34:22 +0000 +++ lisp/strokes.el 2014-03-04 13:01:48 +0000 @@ -202,7 +202,7 @@ \"P c #FFFF0000FFFF\", \". c #45458B8B0000\", /* pixels */\n" - "The header to all xpm buffers created by strokes.") + "The header to all XPM buffers created by strokes.") ;;; user variables... @@ -221,7 +221,7 @@ (defcustom strokes-character ?@ "Character used when drawing strokes in the strokes buffer. -\(The default is `@', which works well.\)" +\(The default is `@', which works well.)" :type 'character :group 'strokes) @@ -284,16 +284,15 @@ (defvar strokes-last-stroke nil "Last stroke entered by the user. -Its value gets set every time the function -`strokes-fill-stroke' gets called, -since that is the best time to set the variable.") +Its value gets set every time the function `strokes-fill-stroke' +gets called, since that is the best time to set the variable.") (defvar strokes-global-map '() "Association list of strokes and their definitions. Each entry is (STROKE . COMMAND) where STROKE is itself a list of coordinates (X . Y) where X and Y are lists of positions on the -normalized stroke grid, with the top left at (0 . 0). COMMAND is the -corresponding interactive function.") +normalized stroke grid, with the top left at (0 . 0). COMMAND is +the corresponding interactive function.") (defvar strokes-load-hook nil "Functions to be called when Strokes is loaded.") @@ -349,7 +348,7 @@ (* x x)) (defsubst strokes-distance-squared (p1 p2) - "Gets the distance (squared) between to points P1 and P2. + "Compute the distance (squared) between to points P1 and P2. P1 and P2 are cons cells in the form (X . Y)." (let ((x1 (car p1)) (y1 (cdr p1)) @@ -434,9 +433,9 @@ ;;;###autoload (defun strokes-global-set-stroke (stroke command) "Interactively give STROKE the global binding as COMMAND. -Operated just like `global-set-key', except for strokes. -COMMAND is a symbol naming an interactively-callable function. STROKE -is a list of sampled positions on the stroke grid as described in the +Works just like `global-set-key', except for strokes. COMMAND is +a symbol naming an interactively-callable function. STROKE is a +list of sampled positions on the stroke grid as described in the documentation for the `strokes-define-stroke' function. See also `strokes-global-set-stroke-string'." @@ -450,7 +449,7 @@ (defun strokes-global-set-stroke-string (stroke string) "Interactively give STROKE the global binding as STRING. -Operated just like `global-set-key', except for strokes. STRING +Works just like `global-set-key', except for strokes. STRING is a string to be inserted by the stroke. STROKE is a list of sampled positions on the stroke grid as described in the documentation for the `strokes-define-stroke' function. @@ -476,7 +475,7 @@ (defun strokes-get-grid-position (stroke-extent position &optional grid-resolution) "Map POSITION to a new grid position. Do so based on its STROKE-EXTENT and GRID-RESOLUTION. -STROKE-EXTENT as a list \(\(XMIN . YMIN\) \(XMAX . YMAX\)\). +STROKE-EXTENT is a list ((XMIN . YMIN) (XMAX . YMAX)). If POSITION is a `strokes-lift', then it is itself returned. Optional GRID-RESOLUTION may be used in place of `strokes-grid-resolution'. The grid is a square whose dimension is [0,GRID-RESOLUTION)." @@ -651,7 +650,7 @@ y)))))))))) (defun strokes-rate-stroke (stroke1 stroke2) - "Rates STROKE1 with STROKE2 and return a score based on a distance metric. + "Rate STROKE1 with STROKE2 and return a score based on a distance metric. Note: the rating is an error rating, and therefore, a return of 0 represents a perfect match. Also note that the order of stroke arguments is order-independent for the algorithm used here." @@ -857,6 +856,9 @@ The command will be executed provided one exists for that stroke, based on the variable `strokes-minimum-match-score'. If no stroke matches, nothing is done and return value is nil." + ;; FIXME: Undocument return value. It is not documented for all cases, + ;; and doesn't allow to difference between no stroke matches and + ;; command-execute returning nil, anyway. (let* ((match (strokes-match-stroke stroke strokes-global-map)) (command (car match)) (score (cdr match))) @@ -969,8 +971,8 @@ package lets you program in simple and complex (multi-lift) strokes. The only difference is how you *invoke* the two. You will most likely use simple strokes, as complex strokes were developed for -Chinese/Japanese/Korean. So the shifted middle mouse button (S-mouse-2) will -invoke the command `strokes-do-stroke'. +Chinese/Japanese/Korean. So the shifted middle mouse button (S-mouse-2) +will invoke the command `strokes-do-stroke'. If ever you define a stroke which you don't like, then you can unset it with the command @@ -993,8 +995,8 @@ Your strokes are stored as you enter them. They get saved into the file specified by the `strokes-file' variable, along with other strokes -configuration variables. You will be prompted to save them when -you exit Emacs, or you can save them with +configuration variables. You will be prompted to save them when you +exit Emacs, or you can save them with > M-x strokes-prompt-user-save-strokes @@ -1009,7 +1011,7 @@ be running a version of Emacs with XPM support. You use the binding to `strokes-compose-complex-stroke' to start drawing your strokes. These are just complex strokes, and thus continue drawing with mouse-1 -or mouse-2 and end with mouse-3. Then the stroke image gets inserted +or mouse-2 and end with mouse-3. Then the stroke image gets inserted into the buffer. You treat it somewhat like any other character, which you can copy, paste, delete, move, etc. When all is done, you may want to send the file, or save it. This is done with @@ -1147,7 +1149,7 @@ (not strokes-use-strokes-buffer)))) (defun strokes-xpm-for-stroke (&optional stroke bufname b/w-only) - "Create an XPM pixmap for the given STROKE in buffer ` *strokes-xpm*'. + "Create an XPM pixmap for the given STROKE in buffer \" *strokes-xpm*\". If STROKE is not supplied, then `strokes-last-stroke' will be used. Optional BUFNAME to name something else. The pixmap will contain time information via rainbow dot colors @@ -1318,8 +1320,8 @@ ;;;###autoload (defun strokes-list-strokes (&optional chronological strokes-map) "Pop up a buffer containing an alphabetical listing of strokes in STROKES-MAP. -With CHRONOLOGICAL prefix arg \(\\[universal-argument]\) list strokes -chronologically by command name. +With CHRONOLOGICAL prefix arg (\\[universal-argument]) list strokes chronologically +by command name. If STROKES-MAP is not given, `strokes-global-map' will be used instead." (interactive "P") (setq strokes-map (or strokes-map @@ -1386,8 +1388,8 @@ (define-minor-mode strokes-mode "Toggle Strokes mode, a global minor mode. With a prefix argument ARG, enable Strokes mode if ARG is -positive, and disable it otherwise. If called from Lisp, enable -the mode if ARG is omitted or nil. +positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. \\ Strokes are pictographic mouse gestures which invoke commands. @@ -1540,7 +1542,7 @@ (defun strokes-xpm-to-compressed-string (&optional xpm-buffer) "Convert XPM in XPM-BUFFER to compressed string representing the stroke. -XPM-BUFFER defaults to ` *strokes-xpm*'." +XPM-BUFFER defaults to \" *strokes-xpm*\"." (with-current-buffer (setq xpm-buffer (or xpm-buffer " *strokes-xpm*")) (goto-char (point-min)) (search-forward "/* pixels */") ; skip past header junk @@ -1707,7 +1709,7 @@ (defun strokes-xpm-for-compressed-string (compressed-string &optional bufname) "Convert the stroke represented by COMPRESSED-STRING into an XPM. -Store XPM in buffer BUFNAME if supplied \(default is ` *strokes-xpm*'\)" +Store XPM in buffer BUFNAME if supplied (default is \" *strokes-xpm*\")" (or bufname (setq bufname " *strokes-xpm*")) (with-current-buffer (get-buffer-create bufname) (erase-buffer) ------------------------------------------------------------ revno: 116654 fixes bug: http://debbugs.gnu.org/16932 committer: YAMAMOTO Mitsuharu branch nick: trunk timestamp: Tue 2014-03-04 20:02:36 +0900 message: * xterm.c (x_draw_stretch_glyph_string): Reset clipping. (Bug#16932) diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-03-04 03:14:11 +0000 +++ src/ChangeLog 2014-03-04 11:02:36 +0000 @@ -1,3 +1,8 @@ +2014-03-04 YAMAMOTO Mitsuharu + + * xterm.c (x_draw_stretch_glyph_string): Reset clipping. + (Bug#16932) + 2014-03-04 Michal Nazarewicz * cmds.c (delete-char): Update docstring pointing out that the === modified file 'src/xterm.c' --- src/xterm.c 2014-03-03 08:27:58 +0000 +++ src/xterm.c 2014-03-04 11:02:36 +0000 @@ -2501,6 +2501,8 @@ XFillRectangle (s->display, s->window, gc, x, y, w, h); XSetForeground (s->display, gc, xgcv.foreground); } + + XSetClipMask (s->display, gc, None); } } else if (!s->background_filled_p) ------------------------------------------------------------ revno: 116653 committer: martin rudalics branch nick: trunk timestamp: Tue 2014-03-04 11:44:46 +0100 message: Fix some window code related doc-string and info entries. * window.el (window-in-direction): Fix doc-string. * windows.texi (Windows and Frames): Add some missing &optional designators. Adjust description of window-in-direction. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-03-03 04:57:26 +0000 +++ doc/lispref/ChangeLog 2014-03-04 10:44:46 +0000 @@ -1,3 +1,8 @@ +2014-03-04 Martin Rudalics + + * windows.texi (Windows and Frames): Add some missing &optional + designators. Adjust description of window-in-direction. + 2014-03-02 Barry O'Reilly * markers.texi (Moving Marker Positions): Clarify guidance about === modified file 'doc/lispref/windows.texi' --- doc/lispref/windows.texi 2014-02-27 14:09:26 +0000 +++ doc/lispref/windows.texi 2014-03-04 10:44:46 +0000 @@ -137,7 +137,7 @@ Each window belongs to exactly one frame (@pxref{Frames}). -@defun window-frame window +@defun window-frame &optional window This function returns the frame that the window @var{window} belongs to. If @var{window} is @code{nil}, it defaults to the selected window. @@ -257,14 +257,14 @@ The following functions can be used to retrieve a child window of an internal window, and the siblings of a child window. -@defun window-top-child window +@defun window-top-child &optional window This function returns the topmost child window of @var{window}, if @var{window} is an internal window whose children form a vertical combination. For any other type of window, the return value is @code{nil}. @end defun -@defun window-left-child window +@defun window-left-child &optional window This function returns the leftmost child window of @var{window}, if @var{window} is an internal window whose children form a horizontal combination. For any other type of window, the return value is @@ -322,7 +322,7 @@ @end defun @cindex window in direction -@defun window-in-direction direction &optional window ignore +@defun window-in-direction direction &optional window ignore sign wrap mini This function returns the nearest live window in direction @var{direction} as seen from the position of @code{window-point} in window @var{window}. The argument @var{direction} must be one of @@ -338,6 +338,23 @@ argument @var{ignore} is non-@code{nil}, a window may be returned even if its @code{no-other-window} parameter is non-@code{nil}. +If the optional argument @var{sign} is a negative number, it means to +use the right or bottom edge of @var{window} as reference position +instead of @code{window-point}. If @var{sign} is a positive number, it +means to use the left or top edge of @var{window} as reference position. + +If the optional argument @var{wrap} is non-@code{nil}, this means to +wrap @var{direction} around frame borders. For example, if @var{window} +is at the top of the frame and @var{direction} is @code{above}, then +return the minibuffer window provided the frame has one, and a window at +the bottom of the frame otherwise. + +If the optional argument @var{mini} is @code{nil}, this means to return +the minibuffer window if and only if it is currently active. If +@var{mini} is non-@code{nil}, it returns the minibuffer window even when +it's not active. However, if @var{wrap} non-@code{nil}, it always acts +as if @var{mini} were @code{nil}. + If it doesn't find a suitable window, this function returns @code{nil}. @end defun === modified file 'etc/NEWS' --- etc/NEWS 2014-03-04 08:35:11 +0000 +++ etc/NEWS 2014-03-04 10:44:46 +0000 @@ -197,6 +197,12 @@ ** Frame and window changes +++ +*** The function `window-in-direction' introduced in Emacs 24.1 now +takes additional arguments for specifiying a reference point, wrapping +selection around frame borders, and specifying ways to select the +minibuffer window. + ++++ *** New commands `toggle-frame-fullscreen' and `toggle-frame-maximized', bound to and M-, respectively. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-04 08:35:11 +0000 +++ lisp/ChangeLog 2014-03-04 10:44:46 +0000 @@ -1,3 +1,7 @@ +2014-03-04 Martin Rudalics + + * window.el (window-in-direction): Fix doc-string. + 2014-03-04 Glenn Morris * emacs-lisp/smie.el (smie-config-guess): Doc fix. === modified file 'lisp/window.el' --- lisp/window.el 2014-03-02 12:04:29 +0000 +++ lisp/window.el 2014-03-04 10:44:46 +0000 @@ -1817,10 +1817,9 @@ top edge of WINDOW as reference position. Optional argument WRAP non-nil means to wrap DIRECTION around -frame borders. This means to return for a WINDOW a the top of -the frame and DIRECTION `above' to return the minibuffer window -if the frame has one, and a window at the bottom of the frame -otherwise. +frame borders. This means to return for WINDOW at the top of the +frame and DIRECTION `above' the minibuffer window if the frame +has one, and a window at the bottom of the frame otherwise. Optional argument MINI nil means to return the minibuffer window if and only if it is currently active. MINI non-nil means to ------------------------------------------------------------ revno: 116652 committer: Glenn Morris branch nick: trunk timestamp: Tue 2014-03-04 00:37:48 -0800 message: * lisp/cedet/semantic/util.el (semantic-complete-symbol): Replace use of obsolete argument of display-completion-list. diff: === modified file 'lisp/cedet/ChangeLog' --- lisp/cedet/ChangeLog 2014-03-03 04:57:26 +0000 +++ lisp/cedet/ChangeLog 2014-03-04 08:37:48 +0000 @@ -1,3 +1,8 @@ +2014-03-04 Glenn Morris + + * semantic/util.el (semantic-complete-symbol): + Replace use of obsolete argument of display-completion-list. + 2014-02-03 Glenn Morris * semantic/senator.el (senator-copy-tag-to-register): === modified file 'lisp/cedet/semantic/util.el' --- lisp/cedet/semantic/util.el 2014-01-01 07:43:34 +0000 +++ lisp/cedet/semantic/util.el 2014-03-04 08:37:48 +0000 @@ -419,7 +419,8 @@ (setq list (sort list 'string<)) (if (> (length list) 1) (with-output-to-temp-buffer "*Completions*" - (display-completion-list list pattern)) + (display-completion-list + (completion-hilit-commonality list (length pattern) nil))) ;; Bury any out-of-date completions buffer. (let ((win (get-buffer-window "*Completions*" 0))) (if win (with-selected-window win (bury-buffer))))))