------------------------------------------------------------ revno: 116418 committer: Glenn Morris branch nick: trunk timestamp: Wed 2014-02-12 00:27:27 -0800 message: Some icomplete doc * doc/emacs/mini.texi (Completion Options): No longer mention icomplete, which has its own section now. * doc/emacs/modes.texi (Minor Modes): Update Icomplete xref. * lisp/icomplete.el: Commentary updates. (icomplete): Add info-link to defgroup. (icomplete-with-completion-tables, icomplete-minibuffer-setup-hook) (icomplete-minibuffer-map, icomplete-mode) (icomplete-simple-completing-p, icomplete-completions): Doc fixes. * etc/NEWS: Related edits. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-02-12 01:20:34 +0000 +++ doc/emacs/ChangeLog 2014-02-12 08:27:27 +0000 @@ -1,5 +1,9 @@ 2014-02-12 Glenn Morris + * mini.texi (Completion Options): No longer mention icomplete, + which has its own section now. + * modes.texi (Minor Modes): Update Icomplete xref. + * help.texi (Package Keywords): Mention describe-package buttons. * package.texi (Package Menu): Mention package-menu-filter. === modified file 'doc/emacs/mini.texi' --- doc/emacs/mini.texi 2014-01-06 06:25:30 +0000 +++ doc/emacs/mini.texi 2014-02-12 08:27:27 +0000 @@ -575,13 +575,6 @@ numeric value @var{n}, completion commands switch to this cycling behavior only when there are @var{n} or fewer alternatives. -@cindex Icomplete mode -@findex icomplete-mode - Icomplete mode presents a constantly-updated display that tells you -what completions are available for the text you've entered so far. The -command to enable or disable this minor mode is @kbd{M-x -icomplete-mode}. - @node Minibuffer History @section Minibuffer History @cindex minibuffer history === modified file 'doc/emacs/modes.texi' --- doc/emacs/modes.texi 2014-01-01 07:43:34 +0000 +++ doc/emacs/modes.texi 2014-02-12 08:27:27 +0000 @@ -263,8 +263,7 @@ @item Icomplete mode displays an indication of available completions when -you are in the minibuffer and completion is active. @xref{Completion -Options}. +you are in the minibuffer and completion is active. @xref{Icomplete}. @item Line Number mode enables display of the current line number in the === modified file 'etc/NEWS' --- etc/NEWS 2014-02-12 01:20:34 +0000 +++ etc/NEWS 2014-02-12 08:27:27 +0000 @@ -232,6 +232,7 @@ `(eval-expression-)print-level' to nil. Additionally, it causes integers to be printed in other formats (octal, hexadecimal, and character). +--- *** New hook `eval-expression-minibuffer-setup-hook' run by `eval-expression' on entering the minibuffer. @@ -554,17 +555,26 @@ --- ** New F90 mode option `f90-smart-end-names'. -** Icomplete is a bit more like Ido. - -*** Key bindings to navigate through and select the completions. - -*** The icomplete-separator is customizable, and its default has changed. - -*** Removed `icomplete-show-key-bindings'. - -*** Icomplete-mode by defaults applies to all forms of minibuffer completion. -(setq icomplete-with-completion-tables '(internal-complete-buffer)) -will revert to the old behavior. +** Icomplete + +*** Icomplete by default now applies to all forms of minibuffer completion. +The variable `icomplete-with-completion-tables' (now a user option) +controls this. To restore the old behavior, set it back to +'(internal-complete-buffer). + +*** You can navigate through and select completions using the keys +from `icomplete-minibuffer-map'. + +--- +*** The string that separates potential completions is now a customizable +option (`icomplete-separator'). The default is " | " rather than ",". + +--- +*** New face `icomplete-first-match'; and new options +`icomplete-hide-common-prefix' and `icomplete-show-matches-on-no-input'. + +--- +*** The option `icomplete-show-key-bindings' has been removed. ** Ido === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-12 06:23:42 +0000 +++ lisp/ChangeLog 2014-02-12 08:27:27 +0000 @@ -5,6 +5,11 @@ 2014-02-12 Glenn Morris + * icomplete.el (icomplete): Add info-link to defgroup. + (icomplete-with-completion-tables, icomplete-minibuffer-setup-hook) + (icomplete-minibuffer-map, icomplete-mode) + (icomplete-simple-completing-p, icomplete-completions): Doc fixes. + * emacs-lisp/package.el (package-menu-mode-map): Tweak menu. (package-menu-filter): Rename from package-menu-filter-interactive. Doc fix. === modified file 'lisp/icomplete.el' --- lisp/icomplete.el 2014-02-09 03:49:02 +0000 +++ lisp/icomplete.el 2014-02-12 08:27:27 +0000 @@ -1,12 +1,11 @@ ;;; icomplete.el --- minibuffer completion incremental feedback -;; Copyright (C) 1992-1994, 1997, 1999, 2001-2014 Free Software -;; Foundation, Inc. +;; Copyright (C) 1992-1994, 1997, 1999, 2001-2014 +;; Free Software Foundation, Inc. ;; Author: Ken Manheimer ;; Maintainer: Ken Manheimer ;; Created: Mar 1993 Ken Manheimer, klm@nist.gov - first release to usenet -;; Last update: Ken Manheimer , 11/18/1999. ;; Keywords: help, abbrev ;; This file is part of GNU Emacs. @@ -26,7 +25,7 @@ ;;; Commentary: -;; Loading this package implements a more fine-grained minibuffer +;; Enabling this package implements a more fine-grained minibuffer ;; completion feedback scheme. Prospective completions are concisely ;; indicated within the minibuffer itself, with each successive ;; keystroke. @@ -38,14 +37,7 @@ ;; customize icomplete setup for interoperation with other ;; minibuffer-oriented packages. -;; To activate icomplete mode, load the package and use the -;; `icomplete-mode' function. You can subsequently deactivate it by -;; invoking the function icomplete-mode with a negative prefix-arg -;; (C-U -1 ESC-x icomplete-mode). Also, you can prevent activation of -;; the mode during package load by first setting the variable -;; `icomplete-mode' to nil. Icompletion can be enabled any time after -;; the package is loaded by invoking icomplete-mode without a prefix -;; arg. +;; To enable/disable icomplete mode, use the `icomplete-mode' function. ;; Thanks to everyone for their suggestions for refinements of this ;; package. I particularly have to credit Michael Cook, who @@ -61,6 +53,7 @@ (defgroup icomplete nil "Show completions dynamically in minibuffer." :prefix "icomplete-" + :link '(info-link "(emacs)Icomplete") :group 'minibuffer) (defvar icomplete-prospects-length 80) @@ -83,7 +76,17 @@ :type 'boolean :version "24.4") -(defface icomplete-first-match '((t :weight bold)) +(defcustom icomplete-with-completion-tables t + "Specialized completion tables with which icomplete should operate. +If this is t, Icomplete operates on all tables. +Otherwise this should be a list of the completion tables (e.g., +`internal-complete-buffer') on which Icomplete should operate." + ;; Prior to 24.4, not a user-option, default '(internal-complete-buffer). + :version "24.4" + :type '(choice (const :tag "All" t) + (repeat function))) + +(defface icomplete-first-match '((t :weight bold)) "Face used by icomplete for highlighting first match." :version "24.4") @@ -120,10 +123,7 @@ with other features and packages. For instance: \(add-hook 'icomplete-minibuffer-setup-hook - \(function - \(lambda () - \(make-local-variable 'max-mini-window-height) - \(setq max-mini-window-height 3)))) + \(lambda () (setq-local max-mini-window-height 3))) will constrain Emacs to a maximum minibuffer height of 3 lines when icompletion is occurring." @@ -146,24 +146,14 @@ (let ((non-essential t)) ;E.g. don't prompt for password! (icomplete-exhibit))) -;;;_ = icomplete-with-completion-tables -(defcustom icomplete-with-completion-tables t - "Specialized completion tables with which icomplete should operate. - -If this variable is a list, Icomplete will not operate with any -specialized completion tables except those on this list. If this -variable is t, it won't restrict completion tables." - :version "24.4" - :type '(choice (const :tag "All" t) - (repeat function))) - (defvar icomplete-minibuffer-map (let ((map (make-sparse-keymap))) (define-key map [?\M-\t] 'minibuffer-force-complete) (define-key map [?\C-j] 'minibuffer-force-complete-and-exit) (define-key map [?\C-.] 'icomplete-forward-completions) (define-key map [?\C-,] 'icomplete-backward-completions) - map)) + map) + "Keymap used by `icomplete-mode' in the minibuffer.") (defun icomplete-forward-completions () "Step forward completions by one entry. @@ -199,7 +189,20 @@ "Toggle incremental minibuffer completion (Icomplete mode). With a prefix argument ARG, enable Icomplete mode if ARG is positive, and disable it otherwise. If called from Lisp, enable -the mode if ARG is omitted or nil." +the mode if ARG is omitted or nil. + +When this global minor mode is enabled, typing in the minibuffer +continuously displays a list of possible completions that match +the string you have typed. See `icomplete-completions' for a +description of how prospective completions are displayed. + +For more information, see Info node `(emacs)Icomplete'. +For options you can set, `M-x customize-group icomplete'. + +You can use the following key bindings to navigate and select +completions: + +\\{icomplete-minibuffer-map}" :global t :group 'icomplete (remove-hook 'minibuffer-setup-hook #'icomplete-minibuffer-setup) (remove-hook 'completion-in-region-mode-hook #'icomplete--in-region-setup) @@ -230,7 +233,7 @@ ;;;_ > icomplete-simple-completing-p () (defun icomplete-simple-completing-p () - "Non-nil if current window is minibuffer that's doing simple completion. + "Non-nil if current window is a minibuffer that's doing simple completion. Conditions are: the selected window is a minibuffer, @@ -356,11 +359,11 @@ \{...} - multiple prospects, separated by commas, are indicated, and further input is required to distinguish a single one. +If there are multiple possibilities, `icomplete-separator' separates them. + The displays for unambiguous matches have ` [Matched]' appended \(whether complete or not), or ` \[No matches]', if no eligible -matches exist. \(Keybindings for uniquely matched commands -are exhibited within the square braces.)" - +matches exist." (let* ((minibuffer-completion-table candidates) (minibuffer-completion-predicate predicate) (md (completion--field-metadata (icomplete--field-beg))) ------------------------------------------------------------ revno: 116417 fixes bug: http://debbugs.gnu.org/16683 committer: Jan D. branch nick: trunk timestamp: Wed 2014-02-12 08:50:24 +0100 message: * image.c (pbm_load): Set to NO_PIXMAP on error. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-02-12 01:07:06 +0000 +++ src/ChangeLog 2014-02-12 07:50:24 +0000 @@ -1,3 +1,7 @@ +2014-02-12 Marcus Karlsson (tiny change) + + * image.c (pbm_load): Set to NO_PIXMAP on error (Bug#16683). + 2014-02-12 Lars Ingebrigtsen * buffer.c (syms_of_buffer): Doc clarification (bug#9981). === modified file 'src/image.c' --- src/image.c 2014-01-23 17:27:37 +0000 +++ src/image.c 2014-02-12 07:50:24 +0000 @@ -5215,6 +5215,7 @@ image_error ("Not a PBM image: `%s'", img->spec, Qnil); error: xfree (contents); + img->pixmap = NO_PIXMAP; return 0; } ------------------------------------------------------------ revno: 116416 committer: Dmitry Gutov branch nick: trunk timestamp: Wed 2014-02-12 08:23:42 +0200 message: * lisp/progmodes/js.el (js-indent-line): Don't widen. http://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00276.html diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-12 01:20:34 +0000 +++ lisp/ChangeLog 2014-02-12 06:23:42 +0000 @@ -1,3 +1,8 @@ +2014-02-12 Dmitry Gutov + + * progmodes/js.el (js-indent-line): Don't widen. + http://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00276.html + 2014-02-12 Glenn Morris * emacs-lisp/package.el (package-menu-mode-map): Tweak menu. === modified file 'lisp/progmodes/js.el' --- lisp/progmodes/js.el 2014-01-01 07:43:34 +0000 +++ lisp/progmodes/js.el 2014-02-12 06:23:42 +0000 @@ -1905,13 +1905,11 @@ (defun js-indent-line () "Indent the current line as JavaScript." (interactive) - (save-restriction - (widen) - (let* ((parse-status - (save-excursion (syntax-ppss (point-at-bol)))) - (offset (- (current-column) (current-indentation)))) - (indent-line-to (js--proper-indentation parse-status)) - (when (> offset 0) (forward-char offset))))) + (let* ((parse-status + (save-excursion (syntax-ppss (point-at-bol)))) + (offset (- (current-column) (current-indentation)))) + (indent-line-to (js--proper-indentation parse-status)) + (when (> offset 0) (forward-char offset)))) ;;; Filling ------------------------------------------------------------ revno: 116415 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Tue 2014-02-11 21:51:37 -0800 message: Fix the last patch to work from non-fancy splits, too diff: === modified file 'lisp/gnus/nnmail.el' --- lisp/gnus/nnmail.el 2014-02-12 05:48:39 +0000 +++ lisp/gnus/nnmail.el 2014-02-12 05:51:37 +0000 @@ -1397,7 +1397,7 @@ ((stringp split) (when nnmail-split-tracing (push split nnmail-split-trace)) - (list (nnmail-expand-newtext split))) + (list (nnmail-expand-newtext split t))) ;; Junk the message. ((eq split 'junk) @@ -1517,7 +1517,7 @@ ;; on the same split, which will find it immediately in the cache. (nnmail-split-it split)))))) -(defun nnmail-expand-newtext (newtext) +(defun nnmail-expand-newtext (newtext &optional fancyp) (let ((len (length newtext)) (pos 0) c expanded beg N did-expand) @@ -1544,7 +1544,8 @@ (setq N (- c ?0))) ;; We wrapped the searches in parentheses, so we have to ;; add some parentheses here... - (setq N (+ N 3)) + (when fancyp + (setq N (+ N 3))) (when (match-beginning N) (push (if nnmail-split-lowercase-expanded (downcase (buffer-substring (match-beginning N) ------------------------------------------------------------ revno: 116414 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Tue 2014-02-11 21:48:39 -0800 message: * nnmail.el (nnmail-expand-newtext): Further sub-match fixups (bug#12375). diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2014-02-09 04:37:38 +0000 +++ lisp/gnus/ChangeLog 2014-02-12 05:48:39 +0000 @@ -1,3 +1,8 @@ +2014-02-12 Lars Ingebrigtsen + + * nnmail.el (nnmail-expand-newtext): Further sub-match fixups + (bug#12375). + 2014-02-09 Lars Ingebrigtsen * message.el (message-tab): Mention what happens on normal tabs === modified file 'lisp/gnus/nnmail.el' --- lisp/gnus/nnmail.el 2014-01-31 01:56:00 +0000 +++ lisp/gnus/nnmail.el 2014-02-12 05:48:39 +0000 @@ -1542,6 +1542,9 @@ (if (= c ?\&) (setq N 0) (setq N (- c ?0))) + ;; We wrapped the searches in parentheses, so we have to + ;; add some parentheses here... + (setq N (+ N 3)) (when (match-beginning N) (push (if nnmail-split-lowercase-expanded (downcase (buffer-substring (match-beginning N) ------------------------------------------------------------ revno: 116413 committer: Glenn Morris branch nick: trunk timestamp: Tue 2014-02-11 20:43:35 -0500 message: * doc/lispref/package.texi (Simple Packages): Describe URL and Keywords headers diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-02-10 02:37:43 +0000 +++ doc/lispref/ChangeLog 2014-02-12 01:43:35 +0000 @@ -1,3 +1,7 @@ +2014-02-12 Glenn Morris + + * package.texi (Simple Packages): Describe URL and Keywords headers. + 2014-02-10 Lars Ingebrigtsen * text.texi (User-Level Deletion): Document === modified file 'doc/lispref/package.texi' --- doc/lispref/package.texi 2014-01-01 07:43:34 +0000 +++ doc/lispref/package.texi 2014-02-12 01:43:35 +0000 @@ -141,7 +141,8 @@ ;; Author: J. R. Hacker ;; Version: 1.3 ;; Package-Requires: ((flange "1.0")) -;; Keywords: frobnicate +;; Keywords: multimedia, frobnicate +;; URL: http://example.com/jrhacker/superfrobnicate @dots{} @@ -177,6 +178,11 @@ Headers}, for a description of the @samp{Package-Requires} header. If the header is omitted, the package has no dependencies. + The @samp{Keywords} and @samp{URL} headers are optional, but recommended. +The command @code{describe-package} uses these to add links to its +output. The @samp{Keywords} header should contain at least one +standard keyword from the @code{finder-known-keywords} list. + The file ought to also contain one or more autoload magic comments, as explained in @ref{Packaging Basics}. In the above example, a magic comment autoloads @code{superfrobnicator-mode}. ------------------------------------------------------------ revno: 116412 committer: Glenn Morris branch nick: trunk timestamp: Tue 2014-02-11 20:20:34 -0500 message: Some package doc updates * doc/emacs/help.texi (Package Keywords): Mention describe-package buttons. * doc/emacs/package.texi (Package Menu): Mention package-menu-filter. * lisp/emacs-lisp/package.el (package-menu-mode-map): Tweak menu. (package-menu-filter): Rename from package-menu-filter-interactive. Doc fix. * etc/NEWS: Related edits. Copyedit. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-02-11 06:34:29 +0000 +++ doc/emacs/ChangeLog 2014-02-12 01:20:34 +0000 @@ -1,3 +1,9 @@ +2014-02-12 Glenn Morris + + * help.texi (Package Keywords): Mention describe-package buttons. + + * package.texi (Package Menu): Mention package-menu-filter. + 2014-02-11 Lars Ingebrigtsen * text.texi (Editing Format Info): Use @samp for menus (bug#13736). === modified file 'doc/emacs/help.texi' --- doc/emacs/help.texi 2014-01-01 07:43:34 +0000 +++ doc/emacs/help.texi 2014-02-12 01:20:34 +0000 @@ -458,7 +458,9 @@ @kindex C-h P @kbd{C-h P} (@code{describe-package}) prompts for the name of a package, and displays a help buffer describing the attributes of the -package and the features that it implements. +package and the features that it implements. The buffer lists the +keywords that relate to the package in the form of buttons. Click on +a button to see other packages related to that keyword. @node Language Help @section Help for International Language Support === modified file 'doc/emacs/package.texi' --- doc/emacs/package.texi 2014-01-01 07:43:34 +0000 +++ doc/emacs/package.texi 2014-02-12 01:20:34 +0000 @@ -126,6 +126,12 @@ Refresh the package list (@code{package-menu-refresh}). This fetches the list of available packages from the package archive again, and recomputes the package list. + +@item f +Filter the package list (@code{package-menu-filter}). This prompts +for a keyword (e.g., @samp{games}), then shows only the packages +that relate to that keyword. To restore the full package list, +type @kbd{q}. @end table @noindent === modified file 'etc/NEWS' --- etc/NEWS 2014-02-09 04:24:02 +0000 +++ etc/NEWS 2014-02-12 01:20:34 +0000 @@ -197,16 +197,15 @@ These are normal hooks run when an Emacs frame gains or loses input focus. --- -*** Emacs can now draw dividers between adjacent windows. To put -dividers between side-by-side windows customize the frame parameter -right-divider-width to some positive integer. To put dividers between -vertically stacked windows set the frame parameter bottom-divider-width -to some positive integer. Dividers can be dragged with the mouse and -show a corresponding cursor when the mouse hovers over them. The -appearance of dividers can be changed by customizing the basic faces -window-divider, window-divider-first-pixel and window-divider-last-pixel -where the latter two are useful to provide a 3D effect or to better set -dividers apart from surrounding display objects. +*** Emacs can now draw dividers between adjacent windows. +To put dividers between side-by-side/vertically stacked windows +customize the frame parameter `right-divider-width'/`bottom-divider-width' +to some positive integer. You can drag dividers with the mouse +(they show a corresponding cursor when the mouse hovers over them). +You can change the appearance of dividers by customizing the faces +`window-divider', `window-divider-first-pixel', and +`window-divider-last-pixel'. The last two are useful to provide a 3D +effect, or to better distinguish dividers from surrounding display objects. --- *** `split-window' is now a non-interactive function, not a command. @@ -673,19 +672,21 @@ ** Package ++++ +*** In the `list-packages' buffer, you can use `f' (`package-menu-filter') +to filter the list of packages by a keyword. + ++++ +*** In the `describe-package' buffer, there are now buttons listing the +keywords related to the package. Click on a button to see other packages +related to that keyword. + +--- *** The format of `archive-contents' files, generated by package repositories, has changed to allow a new (fifth) element in the data vectors, containing an associative list with extra properties. - -*** `describe-package' buffer uses the `:url' extra property to -display a `Homepage' header, if it's present. - -*** In the buffer produced by `describe-package', there are now buttons -listing the keywords related to that package. You can click on them -to see other packages related to any given keyword. - -*** In the *Packages* buffer, `f' or the Package->Filter menu filters -the packages by a keyword. +(For example, `describe-package' uses the `:url' extra property to +display a "Homepage" header.) --- ** In Prolog mode, `prolog-use-smie' has been removed, === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-11 20:48:23 +0000 +++ lisp/ChangeLog 2014-02-12 01:20:34 +0000 @@ -1,3 +1,9 @@ +2014-02-12 Glenn Morris + + * emacs-lisp/package.el (package-menu-mode-map): Tweak menu. + (package-menu-filter): Rename from package-menu-filter-interactive. + Doc fix. + 2014-02-11 Juanma Barranquero * frameset.el (frameset--jump-to-register): Select the required @@ -73,9 +79,6 @@ (custom-buffer-create): Doc fix (bug#11122). (custom-sort-items): Doc fix (bug#11121). - * dired-aux.el (dired-copy-file-recursive): Remove slighly - misleading comment (bug#11328). - * repeat.el (repeat-message-function): Reword doc slightly (bug#11619). * icomplete.el (icomplete-with-completion-tables): Doc fix (bug#11654). === modified file 'lisp/emacs-lisp/package.el' --- lisp/emacs-lisp/package.el 2014-01-22 19:22:45 +0000 +++ lisp/emacs-lisp/package.el 2014-02-12 01:20:34 +0000 @@ -1570,7 +1570,7 @@ (define-key map "i" 'package-menu-mark-install) (define-key map "U" 'package-menu-mark-upgrades) (define-key map "r" 'package-menu-refresh) - (define-key map "f" 'package-menu-filter-interactive) + (define-key map "f" 'package-menu-filter) (define-key map "~" 'package-menu-mark-obsolete-for-deletion) (define-key map "x" 'package-menu-execute) (define-key map "h" 'package-menu-quick-help) @@ -1579,9 +1579,6 @@ (define-key menu-map [mq] '(menu-item "Quit" quit-window :help "Quit package selection")) - (define-key menu-map [mf] - '(menu-item "Filter" package-menu-filter-interactive - :help "Filter package selection (q to go back)")) (define-key menu-map [s1] '("--")) (define-key menu-map [mn] '(menu-item "Next" next-line @@ -1606,6 +1603,9 @@ '(menu-item "Mark Upgradable Packages" package-menu-mark-upgrades :help "Mark packages that have a newer version for upgrading")) (define-key menu-map [s3] '("--")) + (define-key menu-map [mf] + '(menu-item "Filter Package List..." package-menu-filter + :help "Filter package selection (q to go back)")) (define-key menu-map [mg] '(menu-item "Update Package List" revert-buffer :help "Update the list of packages")) @@ -2120,8 +2120,12 @@ (package-menu--generate nil packages keywords)) (switch-to-buffer buf))) -(defun package-menu-filter-interactive (keyword) - "Filter the *Packages* buffer." +;; package-menu--generate rebinds "q" on the fly, so we have to +;; hard-code the binding in the doc-string here. +(defun package-menu-filter (keyword) + "Filter the *Packages* buffer. +Show only those items that relate to the specified KEYWORD. +To restore the full package list, type `q'." (interactive (list (completing-read "Keyword: " (package-all-keywords)))) (package-show-package-list t (list keyword))) ------------------------------------------------------------ revno: 116411 fixes bug: http://debbugs.gnu.org/9981 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Tue 2014-02-11 17:07:06 -0800 message: * buffer.c (syms_of_buffer): Doc clarification. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-02-11 18:02:19 +0000 +++ src/ChangeLog 2014-02-12 01:07:06 +0000 @@ -1,3 +1,7 @@ +2014-02-12 Lars Ingebrigtsen + + * buffer.c (syms_of_buffer): Doc clarification (bug#9981). + 2014-02-11 Glenn Morris * nsfns.m (ns_display_info_for_name, Fx_open_connection): === modified file 'src/buffer.c' --- src/buffer.c 2014-02-08 04:11:52 +0000 +++ src/buffer.c 2014-02-12 01:07:06 +0000 @@ -6181,15 +6181,16 @@ DEFVAR_PER_BUFFER ("buffer-invisibility-spec", &BVAR (current_buffer, invisibility_spec), Qnil, doc: /* Invisibility spec of this buffer. -The default is t, which means that text is invisible -if it has a non-nil `invisible' property. -If the value is a list, a text character is invisible if its `invisible' -property is an element in that list (or is a list with members in common). -If an element is a cons cell of the form (PROP . ELLIPSIS), -then characters with property value PROP are invisible, -and they have an ellipsis as well if ELLIPSIS is non-nil. -Setting this variable is very fast, much faster than scanning all the -text in the buffer looking for properties to change. */); +The default is t, which means that text is invisible if it has a non-nil +`invisible' property. +This variable can also be a list. The list can have two kinds of elements: +`ATOM' and `(ATOM . ELLIPSIS)'. A text character is invisible if its +`invisible' property is `ATOM', or has an `invisible' property that is a list +that contains `ATOM'. +If the `(ATOM . ELLIPSIS)' form is used, and `ELLIPSIS' is non-nil, an +ellipsis will be displayed after the invisible characters. +Setting this variable is very fast, much faster than scanning all the text in +the buffer looking for properties to change. */); DEFVAR_PER_BUFFER ("buffer-display-count", &BVAR (current_buffer, display_count), Qintegerp, ------------------------------------------------------------ revno: 116410 fixes bug: http://debbugs.gnu.org/16696 committer: Juanma Barranquero branch nick: trunk timestamp: Tue 2014-02-11 21:48:23 +0100 message: lisp/frameset.el (frameset--jump-to-register): Fix bug#16696. Select the required window and buffer before restoring position. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-11 11:16:38 +0000 +++ lisp/ChangeLog 2014-02-11 20:48:23 +0000 @@ -1,3 +1,8 @@ +2014-02-11 Juanma Barranquero + + * frameset.el (frameset--jump-to-register): Select the required + window and buffer before restoring position (bug#16696). + 2014-02-11 Lars Ingebrigtsen * dired.el (dired-get-marked-files): Clarify doc (bug#11534). === modified file 'lisp/frameset.el' --- lisp/frameset.el 2014-02-03 07:56:44 +0000 +++ lisp/frameset.el 2014-02-11 20:48:23 +0000 @@ -522,7 +522,6 @@ Frame parameters not on this alist are passed intact, as if they were defined with ACTION = nil.") - (defvar frameset--target-display nil ;; Either (minibuffer . VALUE) or nil. ;; This refers to the current frame config being processed inside @@ -1217,7 +1216,12 @@ (let ((frame (frameset-frame-with-id (aref data 1)))) (when frame (select-frame-set-input-focus frame) - (goto-char (aref data 2)))))) + (let* ((position (aref data 2)) + (buffer (marker-buffer position)) + (window (get-buffer-window buffer frame))) + (when (and window (window-live-p window)) + (set-frame-selected-window frame window) + (with-current-buffer buffer (goto-char position)))))))) ;;;###autoload (defun frameset-to-register (register) ------------------------------------------------------------ revno: 116409 committer: Glenn Morris branch nick: trunk timestamp: Tue 2014-02-11 13:05:01 -0500 message: Fix typo in previous diff: === modified file 'src/nsfns.m' --- src/nsfns.m 2014-02-11 18:02:19 +0000 +++ src/nsfns.m 2014-02-11 18:05:01 +0000 @@ -183,7 +183,7 @@ if (!NILP (Fstring_equal (XCAR (dpyinfo->name_list_element), name))) return dpyinfo; - error ("Emacs for Nextstep does not yet support multi-display."); + error ("Emacs for Nextstep does not yet support multi-display"); Fx_open_connection (name, Qnil, Qnil); dpyinfo = x_display_list; ------------------------------------------------------------ revno: 116408 committer: Glenn Morris branch nick: trunk timestamp: Tue 2014-02-11 13:02:19 -0500 message: * src/nsfns.m (ns_display_info_for_name, Fx_open_connection): Doc fixes. Replace refs to "OpenStep" in messages. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-02-10 22:15:54 +0000 +++ src/ChangeLog 2014-02-11 18:02:19 +0000 @@ -1,3 +1,8 @@ +2014-02-11 Glenn Morris + + * nsfns.m (ns_display_info_for_name, Fx_open_connection): + Replace refs to "OpenStep" in messages. + 2014-02-10 Paul Eggert Avoid "." at end of error diagnostics. === modified file 'src/nsfns.m' --- src/nsfns.m 2014-02-10 22:15:54 +0000 +++ src/nsfns.m 2014-02-11 18:02:19 +0000 @@ -183,13 +183,13 @@ if (!NILP (Fstring_equal (XCAR (dpyinfo->name_list_element), name))) return dpyinfo; - error ("Emacs for OpenStep does not yet support multi-display"); + error ("Emacs for Nextstep does not yet support multi-display."); Fx_open_connection (name, Qnil, Qnil); dpyinfo = x_display_list; if (dpyinfo == 0) - error ("OpenStep on %s not responding.\n", SDATA (name)); + error ("Display on %s not responding.\n", SDATA (name)); return dpyinfo; } @@ -1817,10 +1817,10 @@ if (dpyinfo == 0) { if (!NILP (must_succeed)) - fatal ("OpenStep on %s not responding.\n", + fatal ("Display on %s not responding.\n", SSDATA (display)); else - error ("OpenStep on %s not responding.\n", + error ("Display on %s not responding.\n", SSDATA (display)); } ------------------------------------------------------------ revno: 116407 fixes bug: http://debbugs.gnu.org/11534 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Tue 2014-02-11 03:16:38 -0800 message: * dired.el (dired-get-marked-files): Clarify doc. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-10 21:43:01 +0000 +++ lisp/ChangeLog 2014-02-11 11:16:38 +0000 @@ -1,3 +1,7 @@ +2014-02-11 Lars Ingebrigtsen + + * dired.el (dired-get-marked-files): Clarify doc (bug#11534). + 2014-02-10 Glenn Morris * jit-lock.el (jit-lock-force-redisplay): Doc fix. (Bug#14394) === modified file 'lisp/dired.el' --- lisp/dired.el 2014-02-10 11:21:38 +0000 +++ lisp/dired.el 2014-02-11 11:16:38 +0000 @@ -634,7 +634,8 @@ point instead of marked files. It usually comes from the prefix argument. If ARG is an integer, use the next ARG files. - Any other value means to use the current file instead. + If ARG is any other non-nil value, return the current file name. + If no files are marked, and ARG is nil, also return the current file name. Optional third argument FILTER, if non-nil, is a function to select some of the files--those for which (funcall FILTER FILENAME) is non-nil. ------------------------------------------------------------ revno: 116406 committer: Michael Albinus branch nick: trunk timestamp: Tue 2014-02-11 09:31:39 +0100 message: * automated/tramp-tests.el (top): Require `vc', `vc-bzr', `vc-git' and `vc-hg'. Declare `tramp-find-executable' and `tramp-get-remote-path'. (tramp-test29-vc-registered): New test. (tramp-test30-utf8): Rename from `tramp-test29-utf8'. diff: === modified file 'test/ChangeLog' --- test/ChangeLog 2014-02-07 15:47:18 +0000 +++ test/ChangeLog 2014-02-11 08:31:39 +0000 @@ -1,3 +1,11 @@ +2014-02-11 Michael Albinus + + * automated/tramp-tests.el (top): Require `vc', `vc-bzr', `vc-git' + and `vc-hg'. Declare `tramp-find-executable' and + `tramp-get-remote-path'. + (tramp-test29-vc-registered): New test. + (tramp-test30-utf8): Rename from `tramp-test29-utf8'. + 2014-02-07 Michael Albinus * automated/tramp-tests.el (tramp-test26-process-file): Improve test. === modified file 'test/automated/tramp-tests.el' --- test/automated/tramp-tests.el 2014-02-07 15:56:15 +0000 +++ test/automated/tramp-tests.el 2014-02-11 08:31:39 +0000 @@ -37,6 +37,13 @@ (require 'ert) (require 'tramp) +(require 'vc) +(require 'vc-bzr) +(require 'vc-git) +(require 'vc-hg) + +(declare-function tramp-find-executable "tramp-sh") +(declare-function tramp-get-remote-path "tramp-sh") ;; There is no default value on w32 systems, which could work out of the box. (defconst tramp-test-temporary-file-directory @@ -1188,7 +1195,55 @@ (format "%s\n" (file-name-nondirectory tmp-name)) (buffer-string)))) (ignore-errors (delete-file tmp-name))))) -(ert-deftest tramp-test29-utf8 () +(ert-deftest tramp-test29-vc-registered () + "Check `vc-registered'." + (skip-unless (tramp--test-enabled)) + (skip-unless + (eq + (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory) + 'tramp-sh-file-name-handler)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + + (let* ((default-directory tramp-test-temporary-file-directory) + (tmp-name1 (tramp--test-make-temp-name)) + (tmp-name2 (expand-file-name "foo" tmp-name1)) + (vc-handled-backends + (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil + (cond + ((tramp-find-executable v vc-bzr-program (tramp-get-remote-path v)) + '(Bzr)) + ((tramp-find-executable v vc-git-program (tramp-get-remote-path v)) + '(Git)) + ((tramp-find-executable v vc-hg-program (tramp-get-remote-path v)) + '(Hg)) + (t nil))))) + (skip-unless vc-handled-backends) + (message "%s" vc-handled-backends) + + (unwind-protect + (progn + (make-directory tmp-name1) + (write-region "foo" nil tmp-name2) + (should (file-directory-p tmp-name1)) + (should (file-exists-p tmp-name2)) + (should-not (vc-registered tmp-name1)) + (should-not (vc-registered tmp-name2)) + + (let ((default-directory tmp-name1)) + ;; Create empty repository, and register the file. + (vc-create-repo (car vc-handled-backends)) + ;; The structure of VC-FILESET is not documented. Let's + ;; hope it won't change. + (vc-register + nil (list (car vc-handled-backends) + (list (file-name-nondirectory tmp-name2))))) + (should (vc-registered tmp-name2))) + + (ignore-errors (delete-directory tmp-name1 'recursive))))) + +(ert-deftest tramp-test30-utf8 () "Check UTF8 encoding in file names and file contents." (skip-unless (tramp--test-enabled)) (tramp-cleanup-connection @@ -1227,7 +1282,6 @@ ;; * make-auto-save-file-name ;; * set-file-acl ;; * set-file-selinux-context -;; * vc-registered ;; * Fix `tramp-test17-insert-directory' for ;; `ls-lisp-insert-directory' ("plink" and friends).