14 files changed, 220 insertions, 97 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4f025f3051e..d5951bbbe26 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,52 @@
+2012-02-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el: Make sure cycling is reset upon edit with icomplete.el.
+        (completion--cache-all-sorted-completions): New function.
+        (completion-all-sorted-completions): Use it.
+        (completion--do-completion, minibuffer-force-complete):
+        Use it to re-instate the flush hook.
+
+        * icomplete.el (icomplete-completions): Replace last fix with a better
+        one (bug#10850).
+
+2012-02-23  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * emacs-lisp/lisp.el (beginning-of-defun-raw): Don't call end-of-defun
+        when it might call us back infinitely (bug#10797).
+
+2012-02-23  Glenn Morris  <rgm@gnu.org>
+
+        * minibuffer.el (completion-category-overrides): Doc fix.
+
+2012-02-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (completion-table-with-context): Fix inf-loop.
+        Reported by Aaron S. Hawley <aaron.s.hawley@gmail.com>.
+
+2012-02-23  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/authors.el (authors-aliases, authors-fixed-case)
+        (authors-obsolete-files-regexps, authors-ignored-files)
+        (authors-ambiguous-files, authors-renamed-files-alist):
+        Add more entries.
+
+2012-02-23  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-occur): Sync interactive spec with occur's
+        new feature in `occur-read-primary-args'.  Doc fix.  (Bug#10705)
+
+        * replace.el (occur-menu-map): Add menu item for `occur-edit-mode'.
+
+2012-02-22  Juri Linkov  <juri@jurta.org>
+
+        * international/mule-cmds.el (read-char-by-name): Use \` and \'.
+        (ucs-insert): Doc fix.  Check for hex digits in the string.
+        Don't display `nil' in the error message.  (Bug#10857)
+
+2012-02-22  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-mode.el: Revert change #2012-02-06T22:08:41Z!larsi@gnus.org from 2012-02-06.
+
 2012-02-22  Glenn Morris  <rgm@gnu.org>
 
         * ffap.el (ffap-c-path):
@@ -172,7 +221,7 @@
 
         Fix a loop in c-set-fl-decl-start.
 
-        * progmodes/cc-engine (c-set-fl-decl-start): Add a check that
+        * progmodes/cc-engine.el (c-set-fl-decl-start): Add a check that
         c-backward-syntactic-ws actually moves backwards.
 
 2012-02-13  Leo Liu  <sdl.web@gmail.com>
@@ -1362,10 +1411,10 @@
 
         Add the switch statement to AWK Mode.
 
-        * progmodes/cc-awk (awk-font-lock-keywords): Add "switch", "case",
+        * progmodes/cc-awk.el (awk-font-lock-keywords): Add "switch", "case",
         "default" to the keywords regexp.
 
-        * progmodes/cc-langs (c-label-kwds): Let AWK take the same
+        * progmodes/cc-langs.el (c-label-kwds): Let AWK take the same
         expression as the rest.
         (c-nonlabel-token-key): Allow string literals for AWK.
         Refactor for the other modes.
@@ -6384,7 +6433,7 @@
         * comint.el (comint-password-prompt-regexp): Accept "Response" as
         a password-like phrase.
 
-2011-06-30  Mastake YAMATO  <yamato@redhat.com>
+2011-06-30  Masatake YAMATO  <yamato@redhat.com>
 
         * progmodes/cc-guess.el: New file.
 
@@ -10692,7 +10741,8 @@
         (calc-lu-field-reference): Rename from
         `calc-logunits-field-reference'.
 
-        * calc/calc-help (calc-l-prefix-help): Mention musical note functions.
+        * calc/calc-help.el (calc-l-prefix-help):
+        Mention musical note functions.
 
 2011-03-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -10868,7 +10918,7 @@
 
 2011-03-09  Ken Manheimer  <ken.manheimer@gmail.com>
 
-        * allout.el Summary: Change so yank of distinctive-bullet items
+        * allout.el: Change so yank of distinctive-bullet items
         preserves the existing header prefix, rebulleting it if necessary,
         rather than replacing it.  This is necessary for proper operation
         of cooperative addons like allout-widgets.
diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14
index 6db8f66f0ca..254e2863889 100644
--- a/lisp/ChangeLog.14
+++ b/lisp/ChangeLog.14
@@ -604,7 +604,7 @@
         * help-at-pt.el (help-at-pt-kbd-string): Reflow docstring.
         (scan-buf-previous-region): Fix typo in docstring.
 
-2009-04-14  Edward Wiebe  <usenet@pusto.de>  (tiny change)
+2009-04-14  Eduard Wiebe  <usenet@pusto.de>  (tiny change)
 
         * jit-lock.el (jit-lock-stealth-chunk-start): Fix typo in docstring.
 
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index 5bc9c8a8d25..425268909ea 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -4115,7 +4115,7 @@
 
         * ffap.el (dired-at-point): Add autoload cookie.
 
-1998-04-23  Jens Petersen  <petersen@kurims.kyoto-u.ac.jp>
+1998-04-23  Jens-Ulrik Petersen  <petersen@kurims.kyoto-u.ac.jp>
 
         * ffap.el (dired-at-point-require-prefix): New option.
         (dired-at-point): New command.
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index 495144f7252..f12beed3271 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -41,17 +41,21 @@ files.")
 (defconst authors-aliases
   '(
     ("Aaron S. Hawley" "Aaron Hawley")
+    ("Alexandru Harsanyi" "Alex Harsanyi")
     ("Andrew Csillag" "Drew Csillag")
     ("Anna M. Bigatti" "Anna Bigatti")
     ("Barry A. Warsaw" "Barry A. Warsaw, Century Computing, Inc."
      "Barry A. Warsaw, ITB" "Barry Warsaw")
+    ("Bill Carpenter" "WJ Carpenter")
     ("Bill Mann" "William F. Mann")
     ("Bill Rozas" "Guillermo J. Rozas")
     ("Björn Torkelsson" "Bjorn Torkelsson")
     ("Brian Fox" "Brian J. Fox")
+    ("Brian Sniffen" "Brian T. Sniffen")
     ("Christoph Wedler" "Christoph.Wedler@sap.com")
     ("Daniel Pfeiffer" "<Daniel.Pfeiffer@Informatik.START.db.de>"
      "<Daniel.Pfeiffer@Informatik.START.dbp.de>")
+    ("David Abrahams" "Dave Abrahams")
     ("David De La Harpe Golden" "David Golden")
     ("David Gillespie" "Dave Gillespie")
     ("David Kågedal" "David K..edal")
@@ -77,6 +81,8 @@ files.")
     ("Gerd Möllmann" "Gerd Moellmann")
     ("Hallvard B. Furuseth" "Hallvard B Furuseth" "Hallvard Furuseth")
     ("Hrvoje Nikšić" "Hrvoje Niksic")
+    ;; lisp/org/ChangeLog 2010-11-11.
+    (nil "aaa bbb")
     ;; src/ChangeLog.4, 1994-01-11, since fixed.
 ;;;    (nil "(afs@hplb.hpl.hp.com)")
     ;; lisp/gnus/ChangeLog.1, 1998-01-15.
@@ -93,6 +99,7 @@ files.")
     ("Jens-Ulrik Holger Petersen" "Jens-Ulrik Petersen")
     ("Jeremy Bertram Maitin-Shepard" "Jeremy Maitin-Shepard")
     ("Johan Bockgård" "Johan Bockgard")
+    ("John J Foerch" "John Foerch")
     ("John W. Eaton" "John Eaton")
     ("Jonathan I. Kamens" "Jonathan Kamens")
     ("Joseph Arceneaux" "Joe Arceneaux")
@@ -110,10 +117,11 @@ files.")
     ("Kevin Greiner" "Kevin J. Greiner")
     ("Kim F. Storm" "Kim Storm")
     ("Kyle Jones" "Kyle E. Jones")
+    ("Lars Magne Ingebrigtsen" "Lars Ingebrigtsen")
     ("Marcus G. Daniels" "Marcus Daniels")
     ("Mark D. Baushke" "Mark D Baushke")
     ("Marko Kohtala" "Kohtala Marko")
-    ("Agustín Martín" "Agustin Martin")
+    ("Agustín Martín" "Agustin Martin" "Agustín Martín Domingo")
     ("Martin Lorentzon" "Martin Lorentzson")
     ("Matt Swift" "Matthew Swift")
     ("Maxime Edouard Robert Froumentin" "Max Froumentin")
@@ -125,12 +133,14 @@ files.")
     ("Michael Sperber" "Michael Sperber \\[Mr. Preprocessor\\]")
     ("Mikio Nakajima" "Nakajima Mikio")
     ("Nelson Jose dos Santos Ferreira" "Nelson Ferreira")
+    ("Noorul Islam" "Noorul Islam K M")
     ("Paul Eggert" "eggert")
     ("Paul Reilly" "(pmr@legacy.pajato.com)")
     ("Pavel Janík" "Pavel Janík Ml." "Pavel Janik Ml." "Pavel Janik" "Pavel Janík" "Pavel@Janik.Cz")
     ("Pavel Kobiakov" "Pavel Kobyakov")
     ("Per Abrahamsen" "Per Abhiddenware")
     ("Per Starbäck" "Per Starback")
+    ("Peter J. Weisberg" "PJ Weisberg")
     ("Peter S. Galbraith" "Peter Galbraith")
     ("Peter Runestig" "Peter 'luna' Runestig")
     ("Peter S. Galbraith" "Peter S Galbraith")
@@ -145,16 +155,19 @@ files.")
     ("Sacha Chua" "Sandra Jean Chua")
     ("Sam Steingold" "Sam Shteingold")
     ("Satyaki Das" "Indexed search by Satyaki Das")
+    ("Sébastien Vauban" "Sebastien Vauban")
     ;; There are other Stefans.
 ;;;    ("Stefan Monnier" "Stefan")
     ("Stephen A. Wood" "(saw@cebaf.gov)")
     ("Steven L. Baur" "SL Baur" "Steven L Baur")
     ("Stewart M. Clamen" "Stewart Clamen")
     ("Stuart D. Herring" "Stuart Herring" "Davis Herring")
+    ("T.V. Raman" "T\\. V\\. Raman")
     ("Taichi Kawabata" "KAWABATA,? Taichi")
     ("Takaaki Ota" "Tak Ota")
     ("Takahashi Naoto" "Naoto Takahashi")
     ("Teodor Zlatanov" "Ted Zlatanov")
+    ("Thomas Dye" "Tom Dye")
     ("Thomas Horsley" "Tom Horsley")    ; FIXME ?
     ("Thomas Wurgler" "Tom Wurgler")
     ("Tomohiko Morioka" "MORIOKA Tomohiko")
@@ -175,6 +188,7 @@ Each entry is of the form (REALNAME REGEXP...).  If an author's name
 matches one of the REGEXPs, use REALNAME instead.
 If REALNAME is nil, ignore that author.")
 
+;; FIXME seems it would be less fragile to check for O', Mc, etc.
 (defconst authors-fixed-case
   '("Bryan O'Sullivan"
     "Christian von Roques"
@@ -183,6 +197,7 @@ If REALNAME is nil, ignore that author.")
     "David J. MacKenzie"
     "David McCabe"
     "David O'Toole"
+    "Devon Sean McCullough"
     "Dominique de Waleffe"
     "Edward O'Connor"
     "Exal de Jesus Garcia Carrillo"
@@ -195,8 +210,11 @@ If REALNAME is nil, ignore that author.")
     "Nelson Jose dos Santos Ferreira"
     "Peter von der Ahe"
     "Peter O'Gorman"
+    "Piet van Oostrum"
     "Roland McGrath"
-    "Sean O'Rourke")
+    "Sean O'Halpin"
+    "Sean O'Rourke"
+    "Tijs van Bakel")
   "List of authors whose names cannot be simply capitalized.")
 
 (defvar authors-public-domain-files
@@ -223,11 +241,12 @@ If REALNAME is nil, ignore that author.")
     ".*loaddefs.el$"                    ; not obsolete, but auto-generated
     "\\.\\(cvs\\|git\\)ignore$"         ; obsolete or uninteresting
     "\\.arch-inventory$"
+    ;; TODO lib/? Matches other things?
+    "build-aux/" "m4/" "Emacs.xcodeproj" "charsets" "mapfiles"
     "preferences\\.\\(nib\\|gorm\\)"
     "vc-\\(rcs\\|cvs\\|sccs\\)-hooks\\.el$")
   "List of regexps matching obsolete files.
-Changes to files matching one of the regexps in this list are not
-listed.")
+Changes to files matching one of the regexps in this list are not listed.")
 
 (defconst authors-ignored-files
   '("external-lisp"
@@ -258,7 +277,12 @@ listed.")
     "*.el"
     ;; Autogen:
     "cus-load.el" "finder-inf.el" "ldefs-boot.el"
+    "compile" "config.guess" "config.sub" "depcomp"
+    ;; Only existed briefly, then renamed:
+    "images/icons/allout-widgets-dark-bg"
+    "images/icons/allout-widgets-light-bg"
     ;; Never had any meaningful changes logged, now deleted:
+    "unidata/bidimirror.awk" "unidata/biditype.awk"
     "split-man" "Xkeymap.txt" "ms-7bkermit" "ulimit.hack"
     "gnu-hp300" "refcard.bit" "ledit.l" "forms.README" "forms-d2.dat"
     "CXTERM-DIC/PY.tit" "CXTERM-DIC/ZIRANMA.tit"
@@ -309,29 +333,47 @@ Changes to files in this list are not listed.")
     "complete.el"
     "cpp.el"
     "ctxt.el"
+    "custom.el"
+    "cyrillic.el"
+    "czech.el"
     "debug.el"
     "dired.el"
     "el.el"
+    "eshell.el"
+    "ethiopic.el"
+    "f90.el"
     "files.el"
     "find.el"
     "format.el"
+    "generic.el"
+    "georgian.el"
+    "greek.el"
     "grep.el"
+    "hebrew.el"
     "imenu.el"
+    "indian.el"
+    "japanese.el"
     "java.el"
+    "lao.el"
     "linux.el"
     "locate.el"
     "make.el"
     "mode.el"
     "python.el"
+    "rmailmm.el"
     "semantic.el"
     "shell.el"
     "simple.el"
+    "slovak.el"
     "sort.el"
     "speedbar.el"
     "srecode.el"
     "table.el"
     "texi.el"
+    "thai.el"
+    "tibetan.el"
     "util.el"
+    "vc-bzr.el"
     "wisent.el")
   "List of basenames occurring more than once in the source.")
 
@@ -589,6 +631,7 @@ in the repository.")
     ("texi/url.txi" . "url.texi")
     ("edt-user.doc" . "edt.texi")
     ("DEV-NOTES" . "nextstep")
+    ("org/COPYRIGHT-AND-LICENSE" . "org/README")
     ;; Moved to different directories.
     ("ctags.1" . "ctags.1")
     ("etags.1" . "etags.1")
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index 8c53ad58612..4efdc3240cd 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -257,9 +257,8 @@ is called as a function to find the defun's beginning."
        (if (> arg 0)
            (dotimes (i arg)
              (funcall beginning-of-defun-function))
-         ;; Better not call end-of-defun-function directly, in case
-         ;; it's not defined.
-         (end-of-defun (- arg))))))
+         (dotimes (i (- arg))
+           (funcall end-of-defun-function))))))
 
    ((or defun-prompt-regexp open-paren-in-column-0-is-defun-start)
     (and (< arg 0) (not (eobp)) (forward-char 1))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c9fd83aaaa0..0729fb90c48 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -2094,11 +2094,6 @@
         (gnus-registry--split-fancy-with-parent-internal): Fix splitting bugs
         and provide better messaging.
 
-2011-04-06  David Engster  <dengste@eml.cc>
-
-        * Makefile.in (fail-on-warning): New rule to compile with warnings as
-        errors.
-
 2011-04-06  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * gnus-registry.el: Don't use ERT if it's not available.  Load it
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index a9719651957..97a14b12891 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -333,23 +333,23 @@ are exhibited within the square braces.)"
                  (window-width)))
              (prefix-len
               ;; Find the common prefix among `comps'.
-              (if (eq t (compare-strings (car comps) nil (length most)
-                                         most nil nil completion-ignore-case))
-                  ;; Common case.
-                  (length most)
-                ;; Else, use try-completion.
-                (let ((comps-prefix (try-completion "" comps)))
-                  (and (stringp comps-prefix)
-                       (length comps-prefix)))))
+              ;; We can't use the optimization below because its assumptions
+              ;; aren't always true, e.g. when completion-cycling (bug#10850):
+              ;; (if (eq t (compare-strings (car comps) nil (length most)
+              ;;                         most nil nil completion-ignore-case))
+              ;;     ;; Common case.
+              ;;     (length most)
+              ;; Else, use try-completion.
+              (let ((comps-prefix (try-completion "" comps)))
+                (and (stringp comps-prefix)
+                     (length comps-prefix)))) ;;)
 
              prospects most-is-exact comp limit)
         (if (eq most-try t) ;; (or (null (cdr comps))
             (setq prospects nil)
           (while (and comps (not limit))
             (setq comp
-                  (if (and prefix-len (<= prefix-len (length (car comps))))
-                      (substring (car comps) prefix-len)
-                    (car comps))
+                  (if prefix-len (substring (car comps) prefix-len) (car comps))
                   comps (cdr comps))
             (cond ((string-equal comp "") (setq most-is-exact t))
                   ((member comp prospects))
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index a7fac427e41..debc328c551 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2949,9 +2949,9 @@ point or a number in hash notation, e.g. #o21430 for octal,
                        '(metadata (category . unicode-name))
                      (complete-with-action action (ucs-names) string pred))))))
     (cond
-     ((string-match-p "^[0-9a-fA-F]+$" input)
+     ((string-match-p "\\`[0-9a-fA-F]+\\'" input)
       (string-to-number input 16))
-     ((string-match-p "^#" input)
+     ((string-match-p "\\`#" input)
       (read input))
      (t
       (cdr (assoc-string input (ucs-names) t))))))
@@ -2967,6 +2967,10 @@ preceded by an asterisk `*' and use completion, it will show all
 the characters whose names include that substring, not necessarily
 at the beginning of the name.
 
+This function also accepts a hexadecimal number of Unicode code
+point or a number in hash notation, e.g. #o21430 for octal,
+#x2318 for hex, or #10r8984 for decimal.
+
 The optional third arg INHERIT (non-nil when called interactively),
 says to inherit text properties from adjoining text, if those
 properties are sticky."
@@ -2975,9 +2979,12 @@ properties are sticky."
          (prefix-numeric-value current-prefix-arg)
          t))
   (unless count (setq count 1))
-  (if (stringp character)
+  (if (and (stringp character)
+           (string-match-p "\\`[0-9a-fA-F]+\\'" character))
       (setq character (string-to-number character 16)))
   (cond
+   ((null character)
+    (error "Not a Unicode character"))
    ((not (integerp character))
     (error "Not a Unicode character code: %S" character))
    ((or (< character 0) (> character #x10FFFF))
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 27b82940043..9d69443b6a4 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1433,16 +1433,38 @@ See `isearch-query-replace' for more information."
   (isearch-query-replace delimited t))
 
 (defun isearch-occur (regexp &optional nlines)
-  "Run `occur' with regexp to search from the current search string.
-Interactively, REGEXP is the current search regexp or a quoted search
-string.  NLINES has the same meaning as in `occur'."
+  "Run `occur' using the last search string as the regexp.
+Interactively, REGEXP is constructed using the search string from the
+last search command.  NLINES has the same meaning as in `occur'.
+
+If the last search command was a word search, REGEXP is computed from
+the search words, ignoring punctuation.  If the last search
+command was a regular expression search, REGEXP is the regular
+expression used in that search.  If the last search command searched
+for a literal string, REGEXP is constructed by quoting all the special
+characters in that string."
   (interactive
-   (list
-    (cond
-     (isearch-word (word-search-regexp isearch-string))
-     (isearch-regexp isearch-string)
-     (t (regexp-quote isearch-string)))
-    (if current-prefix-arg (prefix-numeric-value current-prefix-arg))))
+   (let* ((perform-collect (consp current-prefix-arg))
+          (regexp (cond
+                   (isearch-word (word-search-regexp isearch-string))
+                   (isearch-regexp isearch-string)
+                   (t (regexp-quote isearch-string)))))
+     (list regexp
+           (if perform-collect
+               ;; Perform collect operation
+               (if (zerop (regexp-opt-depth regexp))
+                   ;; No subexpression so collect the entire match.
+                   "\\&"
+                 ;; Get the regexp for collection pattern.
+                 (isearch-done nil t)
+                 (isearch-clean-overlays)
+                 (let ((default (car occur-collect-regexp-history)))
+                   (read-string
+                    (format "Regexp to collect (default %s): " default)
+                    nil 'occur-collect-regexp-history default)))
+             ;; Otherwise normal occur takes numerical prefix argument.
+             (when current-prefix-arg
+               (prefix-numeric-value current-prefix-arg))))))
   (let ((case-fold-search isearch-case-fold-search)
         ;; Set `search-upper-case' to nil to not call
         ;; `isearch-no-upper-case-p' in `occur-1'.
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 8564cc2009b..1fdf33bf610 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -226,30 +226,31 @@ case sensitive instead."
 
 (defun completion-table-with-context (prefix table string pred action)
   ;; TODO: add `suffix' maybe?
-  ;; Notice that `pred' may not be a function in some abusive cases.
-  (when (functionp pred)
-    (setq pred
-          ;; Predicates are called differently depending on the nature of
-          ;; the completion table :-(
-          (cond
-           ((vectorp table)             ;Obarray.
-            (lambda (sym) (funcall pred (concat prefix (symbol-name sym)))))
-           ((hash-table-p table)
-            (lambda (s _v) (funcall pred (concat prefix s))))
-           ((functionp table)
-            (lambda (s) (funcall pred (concat prefix s))))
-           (t                           ;Lists and alists.
-            (lambda (s)
-              (funcall pred (concat prefix (if (consp s) (car s) s))))))))
-  (if (eq (car-safe action) 'boundaries)
-      (let* ((len (length prefix))
-             (bound (completion-boundaries string table pred (cdr action))))
-        (list* 'boundaries (+ (car bound) len) (cdr bound)))
-    (let ((comp (complete-with-action action table string pred)))
-      (cond
-       ;; In case of try-completion, add the prefix.
-       ((stringp comp) (concat prefix comp))
-       (t comp)))))
+  (let ((pred
+         (if (not (functionp pred))
+             ;; Notice that `pred' may not be a function in some abusive cases.
+             pred
+           ;; Predicates are called differently depending on the nature of
+           ;; the completion table :-(
+           (cond
+            ((vectorp table)            ;Obarray.
+             (lambda (sym) (funcall pred (concat prefix (symbol-name sym)))))
+            ((hash-table-p table)
+             (lambda (s _v) (funcall pred (concat prefix s))))
+            ((functionp table)
+             (lambda (s) (funcall pred (concat prefix s))))
+            (t                          ;Lists and alists.
+             (lambda (s)
+               (funcall pred (concat prefix (if (consp s) (car s) s)))))))))
+    (if (eq (car-safe action) 'boundaries)
+        (let* ((len (length prefix))
+               (bound (completion-boundaries string table pred (cdr action))))
+          (list* 'boundaries (+ (car bound) len) (cdr bound)))
+      (let ((comp (complete-with-action action table string pred)))
+        (cond
+         ;; In case of try-completion, add the prefix.
+         ((stringp comp) (concat prefix comp))
+         (t comp))))))
 
 (defun completion-table-with-terminator (terminator table string pred action)
   "Construct a completion table like TABLE but with an extra TERMINATOR.
@@ -509,7 +510,9 @@ styles for specific categories, such as files, buffers, etc."
 Each override has the shape (CATEGORY . ALIST) where ALIST is
 an association list that can specify properties such as:
 - `styles': the list of `completion-styles' to use for that category.
-- `cycle': the `completion-cycle-threshold' to use for that category."
+- `cycle': the `completion-cycle-threshold' to use for that category.
+Categories are symbols such as `buffer' and `file', used when
+completing buffer and file names, respectively."
   :version "24.1"
   :type `(alist :key-type (choice :tag "Category"
                                   (const buffer)
@@ -702,23 +705,23 @@ when the buffer's text is already an exact match."
 
           ;; It did find a match.  Do we match some possibility exactly now?
           (let* ((exact (test-completion completion
-                                        minibuffer-completion-table
-                                        minibuffer-completion-predicate))
+                                         minibuffer-completion-table
+                                         minibuffer-completion-predicate))
                  (threshold (completion--cycle-threshold md))
-                (comps
-                 ;; Check to see if we want to do cycling.  We do it
-                 ;; here, after having performed the normal completion,
-                 ;; so as to take advantage of the difference between
-                 ;; try-completion and all-completions, for things
-                 ;; like completion-ignored-extensions.
+                 (comps
+                  ;; Check to see if we want to do cycling.  We do it
+                  ;; here, after having performed the normal completion,
+                  ;; so as to take advantage of the difference between
+                  ;; try-completion and all-completions, for things
+                  ;; like completion-ignored-extensions.
                   (when (and threshold
-                            ;; Check that the completion didn't make
-                            ;; us jump to a different boundary.
-                            (or (not completed)
-                                (< (car (completion-boundaries
-                                         (substring completion 0 comp-pos)
-                                         minibuffer-completion-table
-                                         minibuffer-completion-predicate
+                             ;; Check that the completion didn't make
+                             ;; us jump to a different boundary.
+                             (or (not completed)
+                                 (< (car (completion-boundaries
+                                          (substring completion 0 comp-pos)
+                                          minibuffer-completion-table
+                                          minibuffer-completion-predicate
                                          ""))
                                    comp-pos)))
                    (completion-all-sorted-completions))))
@@ -732,7 +735,7 @@ when the buffer's text is already an exact match."
               ;; Fewer than completion-cycle-threshold remaining
               ;; completions: let's cycle.
               (setq completed t exact t)
-              (setq completion-all-sorted-completions comps)
+              (completion--cache-all-sorted-completions comps)
               (minibuffer-force-complete))
              (completed
               ;; We could also decide to refresh the completions,
@@ -797,6 +800,11 @@ scroll the window of possible completions."
         (#b000 nil)
         (t     t)))))
 
+(defun completion--cache-all-sorted-completions (comps)
+  (add-hook 'after-change-functions
+               'completion--flush-all-sorted-completions nil t)
+  (setq completion-all-sorted-completions comps))
+
 (defun completion--flush-all-sorted-completions (&rest _ignore)
   (remove-hook 'after-change-functions
                'completion--flush-all-sorted-completions t)
@@ -845,10 +853,7 @@ scroll the window of possible completions."
           ;; Cache the result.  This is not just for speed, but also so that
           ;; repeated calls to minibuffer-force-complete can cycle through
           ;; all possibilities.
-          (add-hook 'after-change-functions
-                    'completion--flush-all-sorted-completions nil t)
-          (setq completion-all-sorted-completions
-                (nconc all base-size))))))
+          (completion--cache-all-sorted-completions (nconc all base-size))))))
 
 (defun minibuffer-force-complete ()
   "Complete the minibuffer to an exact match.
@@ -872,9 +877,10 @@ Repeated uses step through the possible completions."
         (completion--done (buffer-substring-no-properties start (point))
                           'finished (unless mod "Sole completion"))))
      (t
-      (setq completion-cycling t)
       (completion--replace base end (car all))
       (completion--done (buffer-substring-no-properties start (point)) 'sole)
+      ;; Set cycling after modifying the buffer since the flush hook resets it.
+      (setq completion-cycling t)
       ;; If completing file names, (car all) may be a directory, so we'd now
       ;; have a new set of possible completions and might want to reset
       ;; completion-all-sorted-completions to nil, but we prefer not to,
@@ -882,7 +888,7 @@ Repeated uses step through the possible completions."
       ;; through the previous possible completions.
       (let ((last (last all)))
         (setcdr last (cons (car all) (cdr last)))
-        (setq completion-all-sorted-completions (cdr all)))))))
+        (completion--cache-all-sorted-completions (cdr all)))))))
 
 (defvar minibuffer-confirm-exit-commands
   '(minibuffer-complete minibuffer-complete-word PC-complete PC-complete-word)
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index a2f83eecce5..392fe25202f 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -440,7 +440,7 @@
 
 2012-01-03  Michael Brand  <michael.ch.brand@gmail.com>
 
-        * org.el Key bindings: remap the Outline functions from
+        * org.el (Key bindings): remap the Outline functions from
         `outline-mode-prefix-map' where possible.
 
 2012-01-03  Christian Moe  <mail@christianmoe.com>  (tiny change)
@@ -539,9 +539,7 @@
         (org-odt-styles-dir, org-export-odt-schema-dir): New
         variables.
 
-        * org-odt.el: New file.
-
-        * org-lparse: New file.
+        * org-odt.el, org-lparse.el: New files.
 
 2012-01-03  Carsten Dominik  <carsten.dominik@gmail.com>
 
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 2eb00e72a76..985214db1dc 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1156,8 +1156,7 @@ Note that the style variables are always made local to the buffer."
   ;; `c-set-fl-decl-start' for the detailed functionality.
   (cons (c-set-fl-decl-start beg) end))
 
-(defvar c-standard-font-lock-fontify-region-function
-  (default-value 'font-lock-fontify-region-function)
+(defvar c-standard-font-lock-fontify-region-function nil
   "Standard value of `font-lock-fontify-region-function'")
 
 (defun c-font-lock-fontify-region (beg end &optional verbose)
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index bb72984a00b..a8ee6f4bff4 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -37,7 +37,8 @@
 ;; Some ideas and also a few lines of code have been borrowed (not stolen ;-)
 ;; from Oz.el, the Emacs major mode for the Oz programming language,
 ;; Copyright (C) 1993 DFKI GmbH, Germany, with permission.
-;; Authors: Ralf Scheidhauer and Michael Mehl ([scheidhr|mehl](at)dfki(dot)uni-sb(dot)de)
+;; Authored by Ralf Scheidhauer and Michael Mehl
+;;   ([scheidhr|mehl](at)dfki(dot)uni-sb(dot)de)
 ;;
 ;; More ideas and code have been taken from the SICStus debugger mode
 ;; (http://www.csd.uu.se/~perm/source_debug/index.shtml -- broken link
diff --git a/lisp/replace.el b/lisp/replace.el
index cb6d7d21e77..349e63d4201 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -786,6 +786,9 @@ a previously found match."
     (define-key map [occur-rename-buffer]
       `(menu-item ,(purecopy "Rename Occur Buffer") occur-rename-buffer
                   :help ,(purecopy "Rename the current *Occur* buffer to *Occur: original-buffer-name*.")))
+    (define-key map [occur-edit-buffer]
+      `(menu-item ,(purecopy "Edit Occur Buffer") occur-edit-mode
+                  :help ,(purecopy "Edit the *Occur* buffer and apply changes to the original buffers.")))
     (define-key map [separator-2] menu-bar-separator)
     (define-key map [occur-mode-goto-occurrence-other-window]
       `(menu-item ,(purecopy "Go To Occurrence Other Window") occur-mode-goto-occurrence-other-window