Merge from trunk.

4 files changed, 49 insertions, 57 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b9459a4cfdd..7116a152605 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (completion-pcm--merge-completions): Don't merge "a1b"
+        and "a2b" to "ab" for `prefix'.
+
 2011-08-14  Chong Yidong  <cyd@stupidchicken.com>
 
         * ibuf-ext.el (ibuffer-filter-disable): New arg for deleting
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 5fda52f3d12..725192399ff 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -2648,7 +2648,7 @@ will be inserted before the group at point."
 ;;;;;;  ibuffer-backward-filter-group ibuffer-forward-filter-group
 ;;;;;;  ibuffer-toggle-filter-group ibuffer-mouse-toggle-filter-group
 ;;;;;;  ibuffer-interactive-filter-by-mode ibuffer-mouse-filter-by-mode
-;;;;;;  ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" "001cd83e8e1ff27c9a61097c840a984d")
+;;;;;;  ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" "617b36fc8479547d679cf0103f82e3ff")
 ;;; Generated autoloads from ibuf-ext.el
 
 (autoload 'ibuffer-auto-mode "ibuf-ext" "\
@@ -2778,8 +2778,10 @@ The value from `ibuffer-saved-filter-groups' is used.
 
 (autoload 'ibuffer-filter-disable "ibuf-ext" "\
 Disable all filters currently in effect in this buffer.
+With optional arg DELETE-FILTER-GROUPS non-nil, delete all filter
+group definitions by setting `ibuffer-filter-groups' to nil.
 
-\(fn)" t nil)
+\(fn &optional DELETE-FILTER-GROUPS)" t nil)
 
 (autoload 'ibuffer-pop-filter "ibuf-ext" "\
 Remove the top filter in this buffer.
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 0a2774de572..313298de97e 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -2299,7 +2299,7 @@ the commands start with a \"-\" or a SPC."
 (defun completion-pcm--string->pattern (string &optional point)
   "Split STRING into a pattern.
 A pattern is a list where each element is either a string
-or a symbol chosen among `any', `star', `point', `prefix'."
+or a symbol, see `completion-pcm--merge-completions'."
   (if (and point (< point (length string)))
       (let ((prefix (substring string 0 point))
             (suffix (substring string point)))
@@ -2515,7 +2515,19 @@ filter out additional entries (because TABLE migth not obey PRED)."
     (mapcar 'completion--sreverse strs))))
 
 (defun completion-pcm--merge-completions (strs pattern)
-  "Extract the commonality in STRS, with the help of PATTERN."
+  "Extract the commonality in STRS, with the help of PATTERN.
+PATTERN can contain strings and symbols chosen among `star', `any', `point',
+and `prefix'.  They all match anything (aka \".*\") but are merged differently:
+`any' only grows from the left (when matching \"a1b\" and \"a2b\" it gets
+  completed to just \"a\").
+`prefix' only grows from the right (when matching \"a1b\" and \"a2b\" it gets
+  completed to just \"b\").
+`star' grows from both ends and is reified into a \"*\"  (when matching \"a1b\"
+  and \"a2b\" it gets completed to \"a*b\").
+`point' is like `star' except that it gets reified as the position of point
+  instead of being reified as a \"*\" character.
+The underlying idea is that we should return a string which still matches
+the same set of elements."
   ;; When completing while ignoring case, we want to try and avoid
   ;; completing "fo" to "foO" when completing against "FOO" (bug#4219).
   ;; So we try and make sure that the string we return is all made up
@@ -2568,7 +2580,9 @@ filter out additional entries (because TABLE migth not obey PRED)."
               (let* ((prefix (try-completion fixed comps))
                      (unique (or (and (eq prefix t) (setq prefix fixed))
                                  (eq t (try-completion prefix comps)))))
-                (unless (equal prefix "") (push prefix res))
+                (unless (or (eq elem 'prefix)
+                            (equal prefix ""))
+                  (push prefix res))
                 ;; If there's only one completion, `elem' is not useful
                 ;; any more: it can only match the empty string.
                 ;; FIXME: in some cases, it may be necessary to turn an
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 43e4ad30e06..814e5511d95 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -599,18 +599,11 @@
         (org-footnote-next-reference-or-definition): check more strictly
         footnote definitions.
 
-2011-07-28  Deech  <deech@deech-ThinkPad-X200.(none)>
+2011-07-28  Deech  <deech@deech-ThinkPad-X200.(none)>  (tiny change)
 
         * ob-tangle.el (org-babel-tangle): Ignore errors thrown by
         language modes.
 
-2011-07-28  Suvayu Ali  <fatkasuvayu+linux@gmail.com>
-
-        * Mention use of keywords like multicolumn and float
-
-        * Remove previous mention of hack with placement option as per
-        comments on the mailing list. The hack is better suited for Worg.
-
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
         * ob-python.el (org-babel-python-evaluate-session): Inhibit return
@@ -905,7 +898,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp (org-export-preprocess-string): normalize footnotes
+        * org-exp.el (org-export-preprocess-string): normalize footnotes
         before marking lists ending.
 
         * org-latex.el (org-export-latex-preprocess): work with labels as
@@ -1052,7 +1045,7 @@
 
 2011-07-28  Achim Gratz  <stromeko@nexgo.de>
 
-        * org.el (defcustom org-log-into-drawer): correct typo
+        * org.el (defcustom org-log-into-drawer): correct typo.
 
         * org-clock.el (org-clock-into-drawer): New function to change the
         location of clock events based on properties CLOCK_INTO_DRAWER or,
@@ -1598,7 +1591,7 @@
         * ob-lisp.el (org-babel-execute:lisp): No real functional change,
         just aesthetic.
 
-2011-07-28  Sébastien Delafond  <sdelafond@gmail.com>
+2011-07-28  Sébastien Delafond  <sdelafond@gmail.com>  (tiny change)
 
         * org.el (org-mode-flyspell-verify): This is useful when using
         flyspell with a non-English dictionary, or if some of your
@@ -1841,7 +1834,7 @@
         * ob.el (org-babel-src-block-regexp): Keep the now-mandatory
         newline inside of the code block body.
 
-2011-07-28  Sean O'Halpin  <sean.ohalpin@gmail.com>
+2011-07-28  Sean O'Halpin  <sean.ohalpin@gmail.com>  (tiny change)
 
         * ob.el: Avoid spurious matches to literal.
 
@@ -1908,7 +1901,7 @@
         * org.el (org-special-properties): Add CLOCKSUM to the special
         properties.
 
-2011-07-28  Robert P. Goldman  <rpgoldman@real-time.com>
+2011-07-28  Robert P. Goldman  <rpgoldman@real-time.com>  (tiny change)
 
         * ob-exp.el (org-babel-exp-in-export-file): Bind
         `org-link-search-inhibit-query' to t to inhibit prompts.
@@ -1936,12 +1929,12 @@
         * org-exp.el (org-export-add-options-to-plist): Fix the option
         parser
 
-2011-07-28  Robert P. Goldman  <rpgoldman@real-time.com>
+2011-07-28  Robert P. Goldman  <rpgoldman@real-time.com>  (tiny change)
 
         * org-latex.el (org-export-latex-preprocess): Replace index
         entries.
 
-2011-07-28  Robert P. Goldman  <rpgoldman@real-time.com>
+2011-07-28  Robert P. Goldman  <rpgoldman@real-time.com>  (tiny change)
 
         * org.el (org-structure-template-alist): Add an easy template for
         index (i), and move include file to I from i.
@@ -2277,18 +2270,14 @@
 
         * org.el (org-property-values): Enhance docstring.
 
-2011-07-28  Ethan Ligon  <ligon@are.berkeley.edu>
+2011-07-28  Ethan Ligon  <ligon@are.berkeley.edu>  (tiny change)
 
-        * Illustration of bug in html export - This has a space after the
-        colons :: so will work in latex and html - This doesn't have a
-        space after the colons ::so is an invalid description item
-        according to the org manual.  Won't work in html or docbook.  Will
-        nevertheless work in latex, provided /first/ description item is
-        valid.  - Has a terminating space :: - So it works in both html
-        and latex export!  - Even though it's difficult to distinguish
-        from the next example.  - Lacks a terminating space :: - At
-        present, *doesn't* work in html or docbook export, does in latex.
-        This is the case that the following patch fixes.
+        * lisp/org-html.el (org-html-export-list-line): Fix regexp for
+        detecting description lists to allow "::" marker to be last
+        visible element at end of line.
+        * lisp/org-docbook.el (org-docbook-export-list-line): Fix regexp
+        for detecting description lists to allow "::" marker to be last
+        visible element at end of line.
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
@@ -2346,7 +2335,7 @@
         * org-latex.el (org-export-latex-convert-table.el-table): Fix
         format-string for insertion of captions.
 
-2011-07-28  Nick Dokos  <nicholas.dokos@hp.com>
+2011-07-28  Nick Dokos  <nicholas.dokos@hp.com>  (tiny change)
 
         * org-exp.el (org-export-remove-comment-blocks-and-subtrees): Fix
         regexp.
@@ -2899,7 +2888,7 @@
         * org-html.el (org-export-as-html): Bugfix: don't insert closing
         HTML tags when exporting body only.
 
-2011-07-28  Jason Dunsmore  <emacs-orgmode@deathroller.dunsmor.com>
+2011-07-28  Jason Dunsmore  <emacs-orgmode@deathroller.dunsmor.com>  (tiny change)
 
         * org.el (org-back-over-empty-lines): Bugfix.  Honor
         `org-blank-before-new-entry' correctly in various contexts.
@@ -3359,7 +3348,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list (org-cycle-item-indentation): do not break an
+        * org-list.el (org-cycle-item-indentation): do not break an
         indentation cycle because visibility cycling is requested. This
         happens when an item becomes a parent, due to indentation change.
         Not considered empty anymore, the function cannot change its
@@ -4157,12 +4146,6 @@
         * ob.el (org-babel-insert-result): Don't choke if indent is not a
         number.
 
-2011-07-28  Bastien Guerry  <bzg@gnu.org>
-
-        * 2011
-        ** 2011-02 monthname
-        *** 2011-02-13 dayname
-
 2011-07-28  Christian Moe  <mail@christianmoe.com>  (tiny change)
 
         * org-bbdb.el (org-bbdb-export): When a link description has been
@@ -4455,10 +4438,10 @@
         * org-latex.el (org-export-latex-emph-format): Don't use
         `org-export-latex-use-verb'.  Remove this variable.
 
-2011-07-28  Jason Dunsmore  <emacs-orgmode@dunsmor.com>
+2011-07-28  Jason Dunsmore  <emacs-orgmode@dunsmor.com>  (tiny change)
 
-        * org-html.el (org-html-handle-time-stamps): fix bug when exporing
-        inactive timestamps.
+        * org-html.el (org-html-handle-time-stamps): fix bug when
+        exporting inactive timestamps.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -4503,18 +4486,6 @@
         (org-export-latex-emph-format): distinguish between =...= and
         ~...~ emphasis.
 
-2011-07-28  David Maus  <dmaus@ictsoc.de>
-
-        * test-org-html.el (test-org-html/export-link-alist): New
-        variable. Abstract link export test definition.
-        (test-org-html/export-link-factory): New function. Create tests for
-        link export.
-
-2011-07-28  David Maus  <dmaus@ictsoc.de>
-
-        * org-test.el (org-test-strip-text-props): New function. Strip
-        text properties.
-
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
         * org.el (org-link-expand-abbrev): Allow any type of character in
@@ -4624,7 +4595,7 @@
         (org-store-link):
         (org-mark-subtree): Use `org-with-limited-levels'.
 
-2011-07-28  Jan Seeger  <jan.seeger@thenybble.de>
+2011-07-28  Jan Seeger  <jan.seeger@thenybble.de>  (tiny change)
 
         * org-publish.el (org-publish-get-base-files): Add sitemap file.
 
@@ -7357,7 +7328,7 @@
         (org-export-latex-keywords-maybe):
         Use `org-export-latex-tag-markup'.
 
-2010-11-11  Rémi Vanicat  <vanicat@debian.org>
+2010-11-11  Rémi Vanicat  <vanicat@debian.org>  (tiny change)
 
         * org-icalendar.el (org-icalendar-use-UTC-date-time): New option.
         (org-ical-ts-to-string): Use UTC time when requested.