Mercurial > emacs
changeset 108339:e88fb053fc02
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Mon, 19 Apr 2010 22:42:15 +0000 |
| parents | 370b10d642d7 (current diff) 41c07e07d991 (diff) |
| children | 486e3cc1b3a6 |
| files | |
| diffstat | 4 files changed, 51 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/misc/ChangeLog Mon Apr 19 03:41:21 2010 +0000 +++ b/doc/misc/ChangeLog Mon Apr 19 22:42:15 2010 +0000 @@ -1,3 +1,10 @@ +2010-04-18 Chong Yidong <cyd@stupidchicken.com> + + * ede.texi (EDE Mode): Refer to init file rather than `.emacs'. Note + that Development menu is always available. + (Creating a project): Fix terminology. + (Add/Remove files): Fix typo. + 2010-04-17 Teodor Zlatanov <tzz@lifelogs.com> * gnus.texi (Gnus Versions, Oort Gnus): Mention the Git repo instead of
--- a/doc/misc/ede.texi Mon Apr 19 03:41:21 2010 +0000 +++ b/doc/misc/ede.texi Mon Apr 19 22:42:15 2010 +0000 @@ -129,27 +129,26 @@ @node EDE Mode, Creating a project, EDE Project Concepts, top @chapter @ede{} Mode -@ede{} is implemented as a minor-mode, which augments other modes such +@ede{} is implemented as a minor mode, which augments other modes such as C mode, and Texinfo mode. You can enable @ede{} for all buffers by running the command @code{global-ede-mode}, or by putting this in your -@file{~/.emacs} file: +init file: @example (global-ede-mode t) @end example -When @ede{} is active for a given buffer, the menu item -``Development'' appears. This menu provides several menu items for -high-level @ede{} commands. These menu items, and their corresponding -keybindings, are independent of the type of project you are actually -working on. +Activating @ede{} adds a menu named @samp{Development} to the menu +bar. This menu provides several menu items for high-level @ede{} +commands. These menu items, and their corresponding keybindings, are +independent of the type of project you are actually working on. @node Creating a project, Modifying your project, EDE Mode, top @chapter Creating a project To create a new project, first visit a file that you want to include -in that project. If you have a hierarchy of directories, choose a -file in the topmost directory first. From this buffer, type @kbd{M-x +in that project. If you have a hierarchy of directories, first visit +a file in the topmost directory. From this buffer, type @kbd{M-x ede-new}, or click on the @samp{Create Project} item in the @samp{Development} menu. @@ -220,8 +219,8 @@ @node Add/Remove target, Add/Remove files, Modifying your project, Modifying your project @section Add/Remove target -To create a new target, type @kbd{C-c . t} (@code{M-x ede-new-target}) -or use the @samp{Add Target} menu item in the @samp{Project Options} +To create a new target, type @kbd{C-c . t} (@code{ede-new-target}) or +use the @samp{Add Target} menu item in the @samp{Project Options} submenu. This prompts for a target name, and adds the current buffer to that target. @@ -237,7 +236,7 @@ @section Add/Remove files To add the current file to an existing target, type @kbd{C-c . a} -(@code{ede-add-file}), or or use the @samp{Add File} menu item in the +(@code{ede-add-file}), or use the @samp{Add File} menu item in the @samp{Target Options} submenu. You can add a file to more than one target; this is OK.
--- a/lisp/ChangeLog Mon Apr 19 03:41:21 2010 +0000 +++ b/lisp/ChangeLog Mon Apr 19 22:42:15 2010 +0000 @@ -102,7 +102,7 @@ 2010-03-29 Stefan Monnier <monnier@iro.umontreal.ca> - Make tmm-menubar work for the Buffers menu again. + Make tmm-menubar work for the Buffers menu again (bug#5726). * tmm.el (tmm-prompt): Also handle keymap entries in the form of vectors rather than cons cells, as used in menu-bar-update-buffers.
--- a/lisp/minibuffer.el Mon Apr 19 03:41:21 2010 +0000 +++ b/lisp/minibuffer.el Mon Apr 19 22:42:15 2010 +0000 @@ -381,18 +381,32 @@ (defconst completion-styles-alist '((emacs21 completion-emacs21-try-completion completion-emacs21-all-completions - "Simple prefix-based completion.") + "Simple prefix-based completion. +I.e. when completing \"foo_bar\" (where _ is the position of point), +it will consider all completions candidates matching the glob +pattern \"foobar*\".") (emacs22 completion-emacs22-try-completion completion-emacs22-all-completions - "Prefix completion that only operates on the text before point.") + "Prefix completion that only operates on the text before point. +I.e. when completing \"foo_bar\" (where _ is the position of point), +it will consider all completions candidates matching the glob +pattern \"foo*\" and will add back \"bar\" to the end of it.") (basic completion-basic-try-completion completion-basic-all-completions - "Completion of the prefix before point and the suffix after point.") + "Completion of the prefix before point and the suffix after point. +I.e. when completing \"foo_bar\" (where _ is the position of point), +it will consider all completions candidates matching the glob +pattern \"foo*bar*\".") (partial-completion completion-pcm-try-completion completion-pcm-all-completions "Completion of multiple words, each one taken as a prefix. -E.g. M-x l-c-h can complete to list-command-history -and C-x C-f /u/m/s to /usr/monnier/src.") +I.e. when completing \"l-co_h\" (where _ is the position of point), +it will consider all completions candidates matching the glob +pattern \"l*-co*h*\". +Furthermore, for completions that are done step by step in subfields, +the method is applied to all the preceding fields that do not yet match. +E.g. C-x C-f /u/mo/s TAB could complete to /usr/monnier/src. +Additionally the user can use the char \"*\" as a glob pattern.") (initials completion-initials-try-completion completion-initials-all-completions "Completion of acronyms and initialisms. @@ -407,7 +421,19 @@ follow the calling convention of `completion-all-completions'), and DOC describes the way this style of completion works.") -(defcustom completion-styles '(basic partial-completion emacs22) +(defcustom completion-styles + ;; First, use `basic' because prefix completion has been the standard + ;; for "ever" and works well in most cases, so using it first + ;; ensures that we obey previous behavior in most cases. + '(basic + ;; Then use `partial-completion' because it has proven to + ;; be a very convenient extension. + partial-completion + ;; Finally use `emacs22' so as to maintain (in many/most cases) + ;; the previous behavior that when completing "foobar" with point + ;; between "foo" and "bar" the completion try to complete "foo" + ;; and simply add "bar" to the end of the result. + emacs22) "List of completion styles to use. The available styles are listed in `completion-styles-alist'." :type `(repeat (choice ,@(mapcar (lambda (x) (list 'const (car x)))