auto upstream

14 files changed, 485 insertions, 224 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3ccb944a2f4..0d4566a91a6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,116 @@
+2013-01-10  Michael Albinus  <michael.albinus@gmx.de>
+
+        * autorevert.el (auto-revert-notify-enabled): Move up.
+        (auto-revert-use-notify): New defcustom.
+        (auto-revert-mode, global-auto-revert-mode)
+        (auto-revert-notify-add-watch, auto-revert-handler)
+        (auto-revert-buffers): Use `auto-revert-use-notify' instead of
+        `auto-revert-notify-enabled'.
+
+2013-01-10  Elias Pipping  <pipping@exherbo.org>
+
+        * files.el (auto-mode-alist): Use doc-view for djvu files (bug#13164).
+        * doc-view.el (doc-view-document->bitmap):
+        Use doc-view-single-page-converter-function instead of
+        single-page-converter arg; adjust callers.
+
+2013-01-10  Feng Li  <fengli@gmail.com>  (tiny change)
+
+        * progmodes/which-func.el (which-function): Understand Semantic's use
+        of overlays in imenu--index-alist.
+
+2013-01-10  Wolfgang Jenkner  <wjenkner@inode.at>
+
+        * man.el: Handle different "man -k" behaviors (bug#13160).  Use utf-8.
+        (Man-man-k-use-anchor): New var.
+        (Man-parse-man-k): New function.
+        (Man-completion-table): Use it.
+        (man): Flush the completion cache between uses.
+
+2013-01-10  Michael Albinus  <michael.albinus@gmx.de>
+
+        * autorevert.el: Add file watch support.
+        (auto-revert-notify-enabled): New defconst.
+        (auto-revert-notify-watch-descriptor-hash-list)
+        (auto-revert-notify-watch-descriptor)
+        (auto-revert-notify-modified-p): New defvars.
+        (auto-revert-notify-rm-watch, auto-revert-notify-add-watch)
+        (auto-revert-notify-handler): New defuns.
+        (auto-revert-mode, global-auto-revert-mode): Remove file watches
+        when mode is disabled.
+        (auto-revert-handler): Check for `auto-revert-notify-modified-p'.
+        (auto-revert-buffers): Add file watches for active buffers.
+
+2013-01-10  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * cus-start.el (toplevel): Only allow float values for
+        scroll-up-aggressively and scroll-down-aggressively.
+        Allow any number for line-spacing.
+
+2013-01-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * doc-view.el (doc-view-pdfdraw-program): Allow "pdfdraw" name.
+        (doc-view-pdf->png-converter-function): Use mupdf if available.
+        (doc-view-djvu->png-converter-function)
+        (doc-view-ps->png-converter-function): Remove.
+        (doc-view--image-file-pattern): Replace doc-view--image-file-extension.
+        (doc-view-goto-page, doc-view-convert-current-doc, doc-view-display)
+        (doc-view-already-converted-p): Adjust accordingly.
+        (doc-view-mode-p): Simplify.
+        (doc-view-enlarge): Use setq-local.
+        (doc-view-pdf->png-converter-ghostscript)
+        (doc-view-djvu->png-converter-ddjvu)
+        (doc-view-pdf->png-converter-mupdf): Rework to call
+        doc-view-start-process directly.
+        (doc-view-pdf/ps->png): Simplify accordingly.
+        (doc-view-pdf->png-1, doc-view-djvu->png-1): Remove.
+        (doc-view-document->bitmap): Rename from doc-view-document->png.
+        (doc-view-convert-current-doc): Merge pdf and djvu cases.
+        (doc-view-set-slice-from-bounding-box): Fix completion table.
+        (doc-view-mode): Use add-hook for after-revert-hook.
+
+2013-01-10  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/authors.el (authors-ignored-files)
+        (authors-valid-file-names, authors-renamed-files-alist):
+        Add some more entries.
+
+2013-01-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * image-mode.el (image-mode-winprops): Don't throw away the fallback
+        `t' pseudo-window entry.
+
+2013-01-10  Alan Mackenzie  <acm@muc.de>
+
+        Fix bugs in the c-parse-state mechanism.  Reuse some markers
+        instead of continually generating new ones.
+
+        * progmodes/cc-engine.el (c-state-old-cpp-beg-marker)
+        (c-state-old-cpp-end-marker): New variables.
+        (c-append-lower-brace-pair-to-state-cache): Start a backward
+        search for "}" definitively outside CPP constructs.
+        (c-remove-stale-state-cache): Inform the caller of a need to
+        search back for a brace pair in certain circumstances.
+        (c-state-maybe-marker): New macro.
+        (c-parse-state): Reuse markers when appropriate.
+
+2013-01-10  Glenn Morris  <rgm@gnu.org>
+
+        * simple.el (execute-extended-command): Doc fix.
+        Bind prefix-arg around read-extended-command, for prompt.  (Bug#13395)
+
+2013-01-10  Chong Yidong  <cyd@gnu.org>
+
+        * faces.el (read-face-name): Doc fix.
+
+2013-01-10  Roland Winkler  <winkler@gnu.org>
+
+        * emacs-lisp/crm.el: Allow any regexp for separators.
+        (crm-default-separator): All spaces around the default comma separator.
+        (crm--completion-command): New macro.
+        (crm-completion-help, crm-complete, crm-complete-word): Use it.
+        (crm-complete-and-exit): Handle non-single-char separators.
+
 2013-01-09  Elias Pipping  <pipping@lavabit.com>
 
         * doc-view.el: Add support for DjVu (bug#13164).
@@ -5945,7 +6058,7 @@
 
 2012-08-08  Fabián Ezequiel Gallina  <fgallina@cuca>
 
-        * progmodes/python.el Fixed defsubst warning.
+        * progmodes/python.el: Fix defsubst warning.
         (python-syntax-context) Rename from python-info-ppss-context.
         (python-syntax-context-type): Rename from
         python-info-ppss-context-type.
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index f491f2427be..4434ed21169 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -48,6 +48,11 @@
 ;; Emacs.  You should never even notice that this package is active
 ;; (except that your buffers will be reverted, of course).
 ;;
+;; If Emacs is compiled with file watch support, notifications are
+;; used instead of checking the time stamp of the files.  You can
+;; disable this by setting the user option `auto-revert-use-notify' to
+;; nil.
+;;
 ;; After reverting a file buffer, Auto Revert Mode normally puts point
 ;; at the same position that a regular manual revert would.  However,
 ;; there is one exception to this rule.  If point is at the end of the
@@ -254,6 +259,28 @@ buffers.  CPU usage depends on the version control system."
 This variable becomes buffer local when set in any fashion.")
 (make-variable-buffer-local 'global-auto-revert-ignore-buffer)
 
+(defconst auto-revert-notify-enabled
+  (or (featurep 'inotify) (featurep 'w32notify))
+  "Non-nil when Emacs has been compiled with file watch support.")
+
+(defcustom auto-revert-use-notify auto-revert-notify-enabled
+  "If non-nil Auto Revert Mode uses file watch functions.
+This requires Emacs being compiled with file watch support (see
+`auto-revert-notify-enabled').  You should set this variable
+through Custom only."
+  :group 'auto-revert
+  :type 'boolean
+  :set (lambda (variable value)
+         (set-default variable (and auto-revert-notify-enabled value))
+         (if (symbol-value variable)
+             (add-hook 'kill-buffer-hook 'auto-revert-notify-rm-watch)
+           (remove-hook 'kill-buffer-hook 'auto-revert-notify-rm-watch)
+           (when auto-revert-notify-enabled
+             (dolist (buf (buffer-list))
+               (with-current-buffer buf
+                 (auto-revert-notify-rm-watch))))))
+  :version "24.4")
+
 ;; Internal variables:
 
 (defvar auto-revert-buffer-list ()
@@ -276,6 +303,20 @@ the list of old buffers.")
             (set (make-local-variable 'auto-revert-tail-pos)
                  (nth 7 (file-attributes buffer-file-name)))))
 
+(defvar auto-revert-notify-watch-descriptor-hash-list
+  (make-hash-table :test 'equal)
+  "A hash table collecting all file watch descriptors.
+Hash key is a watch descriptor, hash value is the corresponding buffer.")
+
+(defvar auto-revert-notify-watch-descriptor nil
+  "The file watch descriptor active for the current buffer.")
+(make-variable-buffer-local 'auto-revert-notify-watch-descriptor)
+
+(defvar auto-revert-notify-modified-p nil
+  "Non-nil when file has been modified on the file system.
+This has been reported by a file watch event.")
+(make-variable-buffer-local 'auto-revert-notify-modified-p)
+
 ;; Functions:
 
 ;;;###autoload
@@ -296,6 +337,7 @@ without being changed in the part that is already in the buffer."
   (if auto-revert-mode
       (if (not (memq (current-buffer) auto-revert-buffer-list))
           (push (current-buffer) auto-revert-buffer-list))
+    (when auto-revert-use-notify (auto-revert-notify-rm-watch))
     (setq auto-revert-buffer-list
           (delq (current-buffer) auto-revert-buffer-list)))
   (auto-revert-set-timer)
@@ -399,9 +441,12 @@ It displays the text that `global-auto-revert-mode-text'
 specifies in the mode line."
   :global t :group 'auto-revert :lighter global-auto-revert-mode-text
   (auto-revert-set-timer)
-  (when global-auto-revert-mode
-    (auto-revert-buffers)))
-
+  (if global-auto-revert-mode
+      (auto-revert-buffers)
+    (when auto-revert-use-notify
+      (dolist (buf (buffer-list))
+        (with-current-buffer buf
+          (auto-revert-notify-rm-watch))))))
 
 (defun auto-revert-set-timer ()
   "Restart or cancel the timer used by Auto-Revert Mode.
@@ -418,6 +463,39 @@ will use an up-to-date value of `auto-revert-interval'"
                             auto-revert-interval
                             'auto-revert-buffers))))
 
+(defun auto-revert-notify-rm-watch ()
+  "Disable file watch for current buffer's associated file."
+  (when auto-revert-notify-watch-descriptor
+    (funcall (if (fboundp 'inotify-rm-watch) 'inotify-rm-watch 'w32-rm-watch)
+             auto-revert-notify-watch-descriptor)
+    (remhash auto-revert-notify-watch-descriptor
+             auto-revert-notify-watch-descriptor-hash-list))
+  (setq auto-revert-notify-watch-descriptor nil
+        auto-revert-notify-modified-p nil))
+
+(defun auto-revert-notify-add-watch ()
+  "Enable file watch for current buffer's associated file."
+  (when (and buffer-file-name auto-revert-use-notify)
+    (auto-revert-notify-rm-watch)
+    (let ((func (if (fboundp 'inotify-add-watch)
+                    'inotify-add-watch 'w32-add-watch))
+          (aspect (if (fboundp 'inotify-add-watch)
+                      '(close-write) '(last-write-time))))
+      (setq auto-revert-notify-watch-descriptor
+            (funcall func buffer-file-name aspect 'auto-revert-notify-handler))
+      (puthash auto-revert-notify-watch-descriptor
+               (current-buffer)
+               auto-revert-notify-watch-descriptor-hash-list))))
+
+(defun auto-revert-notify-handler (event)
+  "Handle an event returned from file watch."
+  (when (listp event)
+    (let ((buffer
+           (gethash (car event) auto-revert-notify-watch-descriptor-hash-list)))
+      (when (bufferp buffer)
+        (with-current-buffer buffer
+          (setq auto-revert-notify-modified-p t))))))
+
 (defun auto-revert-active-p ()
   "Check if auto-revert is active (in current buffer or globally)."
   (or auto-revert-mode
@@ -445,9 +523,12 @@ This is an internal function used by Auto-Revert Mode."
                                     (setq size
                                           (nth 7 (file-attributes
                                                   buffer-file-name))))))
-                       (and (not (file-remote-p buffer-file-name))
-                            (file-readable-p buffer-file-name)
-                            (not (verify-visited-file-modtime buffer)))))
+                       (if auto-revert-use-notify
+                           ;; There are file watches.
+                           auto-revert-notify-modified-p
+                         (and (not (file-remote-p buffer-file-name))
+                              (file-readable-p buffer-file-name)
+                              (not (verify-visited-file-modtime buffer))))))
                 (and (or auto-revert-mode
                          global-auto-revert-non-file-buffers)
                      revert-buffer-function
@@ -456,6 +537,7 @@ This is an internal function used by Auto-Revert Mode."
                      (funcall buffer-stale-function t))))
            eob eoblist)
       (when revert
+        (setq auto-revert-notify-modified-p nil)
         (when (and auto-revert-verbose
                    (not (eq revert 'fast)))
           (message "Reverting buffer `%s'." (buffer-name)))
@@ -561,7 +643,12 @@ the timer when no buffers need to be checked."
                          (memq buf auto-revert-buffer-list))
                     (setq auto-revert-buffer-list
                           (delq buf auto-revert-buffer-list)))
-                (when (auto-revert-active-p) (auto-revert-handler)))
+                (when (auto-revert-active-p)
+                  ;; Enable file watches.
+                  (when (and auto-revert-use-notify buffer-file-name
+                             (not auto-revert-notify-watch-descriptor)
+                      (auto-revert-notify-add-watch)))
+                  (auto-revert-handler)))
             ;; Remove dead buffer from `auto-revert-buffer-list'.
             (setq auto-revert-buffer-list
                   (delq buf auto-revert-buffer-list))))
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 9d2c2750987..b954ed60baa 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -115,12 +115,12 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                             (const :tag "On the right" (down . right))))
                (other :tag "On left, no arrows" t)))
              (scroll-up-aggressively windows
-                                     (choice (const :tag "off" nil) number)
+                                     (choice (const :tag "off" nil) float)
                                      "21.1")
              (scroll-down-aggressively windows
-                                       (choice (const :tag "off" nil) number)
+                                       (choice (const :tag "off" nil) float)
                                        "21.1")
-             (line-spacing display (choice (const :tag "none" nil) integer)
+             (line-spacing display (choice (const :tag "none" nil) number)
                            "22.1")
              (cursor-in-non-selected-windows
               cursor boolean nil
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 0658a11c30a..fa54eef828d 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -158,13 +158,18 @@
   :type 'file
   :group 'doc-view)
 
-(defcustom doc-view-pdfdraw-program "mudraw"
-  "Program to convert PDF files to PNG."
+(defcustom doc-view-pdfdraw-program
+  (cond
+   ((executable-find "pdfdraw") "pdfdraw")
+   (t "mudraw"))
+  "Name of MuPDF's program to convert PDF files to PNG."
   :type 'file
   :version "24.4")
 
 (defcustom doc-view-pdf->png-converter-function
-  'doc-view-pdf->png-converter-ghostscript
+  (if (executable-find doc-view-pdfdraw-program)
+      #'doc-view-pdf->png-converter-mupdf
+    #'doc-view-pdf->png-converter-ghostscript)
   "Function to call to convert a PDF file into a PNG file."
   :type '(radio
           (function-item doc-view-pdf->png-converter-ghostscript
@@ -174,23 +179,6 @@
           function)
   :version "24.4")
 
-;; FIXME: Get rid of it: there's no choice.
-(defcustom doc-view-djvu->png-converter-function
-  'doc-view-djvu->png-converter-ddjvu
-  "Function to call to convert a DJVU file into a PNG file"
-  :type '(radio (function-item doc-view-djvu->png-converter-ddjvu
-                               :doc "Use ddjvu")
-                function))
-
-;; FIXME: Get rid of it: there's no choice.
-(defcustom doc-view-ps->png-converter-function
-  'doc-view-ps->png-converter-ghostscript
-  "Function to call to convert a PS file into a PNG file."
-  :type '(radio (function-item doc-view-ps->png-converter-ghostscript
-                               :doc "Use ghostscript")
-                function)
-  :version "24.4")
-
 (defcustom doc-view-ghostscript-options
   '("-dSAFER" ;; Avoid security problems when rendering files from untrusted
     ;; sources.
@@ -358,14 +346,13 @@ Can be `dvi', `pdf', or `ps'.")
 May operate on the source document or on some intermediate (typically PDF)
 conversion of it.")
 
-(defvar doc-view--image-type nil
+(defvar-local doc-view--image-type nil
   "The type of image in the current buffer.
 Can be `png' or `tiff'.")
 
-(defvar doc-view--image-file-extension nil
-  ;; FIXME: Replace it with a `format' string, like "page-%d.png".
-  "The file extension of the image type in the current buffer.
-Can be `png' or `tif'.")
+(defvar-local doc-view--image-file-pattern nil
+  "The `format' pattern of image file names.
+Typically \"page-%s.png\".")
 
 ;;;; DocView Keymaps
 
@@ -506,7 +493,7 @@ Can be `png' or `tif'.")
     ;; that's not right if the pages are not generated sequentially
     ;; or if the page isn't in doc-view-current-files yet.
     (let ((file (expand-file-name
-                 (format "page-%d.%s" page doc-view--image-file-extension)
+                 (format doc-view--image-file-pattern page)
                  (doc-view-current-cache-dir))))
       (doc-view-insert-image file :pointer 'arrow)
       (set-window-hscroll (selected-window) hscroll)
@@ -708,8 +695,7 @@ OpenDocument format)."
                        (executable-find doc-view-dvipdf-program))
                   (and doc-view-dvipdfm-program
                        (executable-find doc-view-dvipdfm-program)))))
-        ((or (eq type 'postscript) (eq type 'ps) (eq type 'eps)
-             (eq type 'pdf))
+        ((memq type '(postscript ps eps pdf))
          ;; FIXME: allow mupdf here
          (and doc-view-ghostscript-program
               (executable-find doc-view-ghostscript-program)))
@@ -735,13 +721,13 @@ OpenDocument format)."
       ;; ImageMagick supports on-the-fly-rescaling.
       (let ((new (ceiling (* factor doc-view-image-width))))
         (unless (equal new doc-view-image-width)
-          (set (make-local-variable 'doc-view-image-width) new)
+          (setq-local doc-view-image-width new)
           (doc-view-insert-image
            (plist-get (cdr (doc-view-current-image)) :file)
            :width doc-view-image-width)))
     (let ((new (ceiling (* factor doc-view-resolution))))
       (unless (equal new doc-view-resolution)
-        (set (make-local-variable 'doc-view-resolution) new)
+        (setq-local doc-view-resolution new)
         (doc-view-reconvert-doc)))))
 
 (defun doc-view-shrink (factor)
@@ -878,35 +864,44 @@ Should be invoked when the cached images aren't up-to-date."
                             (list "-o" pdf dvi)
                             callback)))
 
-(defun doc-view-pdf->png-converter-ghostscript (resolution pdf png &optional page)
-  `((command . ,doc-view-ghostscript-program)
-    (arguments . (,@doc-view-ghostscript-options
-                  ,(format "-r%d" resolution)
-                  ,@(if page `(,(format "-dFirstPage=%d" page)))
-                  ,@(if page `(,(format "-dLastPage=%d" page)))
-                  ,(concat "-sOutputFile=" png)
-                  ,pdf))))
+(defun doc-view-pdf->png-converter-ghostscript (pdf png page callback)
+  (doc-view-start-process
+   "pdf/ps->png" doc-view-ghostscript-program
+   `(,@doc-view-ghostscript-options
+     ,(format "-r%d" (round doc-view-resolution))
+     ,@(if page `(,(format "-dFirstPage=%d" page)))
+     ,@(if page `(,(format "-dLastPage=%d" page)))
+     ,(concat "-sOutputFile=" png)
+     ,pdf)
+   callback))
 
 (defalias 'doc-view-ps->png-converter-ghostscript
   'doc-view-pdf->png-converter-ghostscript)
 
-(defun doc-view-djvu->png-converter-ddjvu (resolution djvu png &optional page)
-  `((command . "ddjvu")
-    (arguments . ("-format=tiff"
-                  ;; ddjvu only accepts the range 1-999.
-                  ,(format "-scale=%d" resolution)
-                  ;; -eachpage was only added after djvulibre-3.5.25.3!
-                  ,@(unless page '("-eachpage"))
-                  ,@(if page `(,(format "-page=%d" page)))
-                  ,djvu
-                  ,png))))
-
-(defun doc-view-pdf->png-converter-mupdf (resolution pdf png &optional page)
-  `((command . ,doc-view-pdfdraw-program)
-    (arguments . (,(concat "-o" png)
-                  ,(format "-r%d" resolution)
-                  ,pdf
-                  ,@(if page `(,(format "%d" page)))))))
+(defun doc-view-djvu->tiff-converter-ddjvu (djvu tiff page callback)
+  "Convert PAGE of a DJVU file to bitmap(s) asynchronously.
+Call CALLBACK with no arguments when done.
+If PAGE is nil, convert the whole document."
+  (doc-view-start-process
+   "djvu->tiff" "ddjvu"
+   `("-format=tiff"
+     ;; ddjvu only accepts the range 1-999.
+     ,(format "-scale=%d" (round doc-view-resolution))
+     ;; -eachpage was only added after djvulibre-3.5.25.3!
+     ,@(unless page '("-eachpage"))
+     ,@(if page `(,(format "-page=%d" page)))
+     ,djvu
+     ,tiff)
+   callback))
+
+(defun doc-view-pdf->png-converter-mupdf (pdf png page callback)
+  (doc-view-start-process
+   "pdf->png" doc-view-pdfdraw-program
+   `(,(concat "-o" png)
+     ,(format "-r%d" (round doc-view-resolution))
+     ,pdf
+     ,@(if page `(,(format "%d" page))))
+   callback))
 
 (defun doc-view-odf->pdf (odf callback)
   "Convert ODF to PDF asynchronously and call CALLBACK when finished.
@@ -919,16 +914,12 @@ is named like ODF with the extension turned to pdf."
 (defun doc-view-pdf/ps->png (pdf-ps png)
   ;; FIXME: Fix name and docstring to account for djvu&tiff.
   "Convert PDF-PS to PNG asynchronously."
-  (let ((invocation
-         (funcall (pcase doc-view-doc-type
-                    (`pdf doc-view-pdf->png-converter-function)
-                    (`djvu doc-view-djvu->png-converter-function)
-                    (_    doc-view-ps->png-converter-function))
-                  (round doc-view-resolution) pdf-ps png)))
-
-    (doc-view-start-process
-     "pdf/ps->png" (cdr (assoc 'command invocation))
-     (cdr (assoc 'arguments invocation))
+  (funcall
+   (pcase doc-view-doc-type
+     (`pdf doc-view-pdf->png-converter-function)
+     (`djvu #'doc-view-djvu->tiff-converter-ddjvu)
+     (_ #'doc-view-ps->png-converter-ghostscript))
+   pdf-ps png nil
    (let ((resolution doc-view-resolution))
      (lambda ()
        ;; Only create the resolution file when it's all done, so it also
@@ -940,7 +931,8 @@ is named like ODF with the extension turned to pdf."
        (when doc-view-current-timer
          (cancel-timer doc-view-current-timer)
          (setq doc-view-current-timer nil))
-       (doc-view-display (current-buffer) 'force)))))
+       (doc-view-display (current-buffer) 'force))))
+
   ;; Update the displayed pages as soon as they're done generating.
   (when doc-view-conversion-refresh-interval
     (setq doc-view-current-timer
@@ -948,31 +940,10 @@ is named like ODF with the extension turned to pdf."
                        'doc-view-display
                        (current-buffer)))))
 
-(defun doc-view-pdf->png-1 (pdf png page callback)
-  "Convert a PAGE of a PDF file to PNG asynchronously.
-Call CALLBACK with no arguments when done."
-  (let ((invocation (funcall doc-view-pdf->png-converter-function
-                             (round doc-view-resolution) pdf png page)))
-    (doc-view-start-process
-     "pdf/ps->png" (cdr (assoc 'command invocation))
-     (cdr (assoc 'arguments invocation))
-     callback)))
-
-(defun doc-view-djvu->png-1 (djvu png page callback)
-  "Convert a PAGE of a DJVU file to bitmap asynchronously.
-Call CALLBACK with no arguments when done."
-  (let ((invocation (funcall doc-view-djvu->png-converter-function
-                             (round doc-view-resolution) djvu png page)))
-    (doc-view-start-process
-     "djvu->png" (cdr (assoc 'command invocation))
-     (cdr (assoc 'arguments invocation))
-     callback)))
-
 (declare-function clear-image-cache "image.c" (&optional filter))
 
-(defun doc-view-document->png (pdf png pages single-page-converter)
-  ;; FIXME: Fix docstring.
-  "Convert a PDF file to PNG asynchronously.
+(defun doc-view-document->bitmap (pdf png pages)
+  "Convert a document file to bitmap images asynchronously.
 Start by converting PAGES, and then the rest."
   (if (null pages)
       (doc-view-pdf/ps->png pdf png)
@@ -981,11 +952,11 @@ Start by converting PAGES, and then the rest."
     ;; a single page anyway, and of the remaining 1%, few cases will have
     ;; consecutive pages, it's not worth the trouble.
     (let ((rest (cdr pages)))
-      (funcall single-page-converter
+      (funcall doc-view-single-page-converter-function
                pdf (format png (car pages)) (car pages)
        (lambda ()
          (if rest
-             (doc-view-document->png pdf png rest)
+             (doc-view-document->bitmap pdf png rest)
            ;; Yippie, the important pages are done, update the display.
            (clear-image-cache)
            ;; For the windows that have a message (like "Welcome to
@@ -1065,7 +1036,7 @@ Those files are saved in the directory given by the function
   ;; resets during the redisplay).
   (setq doc-view-pending-cache-flush t)
   (let ((png-file (expand-file-name
-                   (concat "page-%d." doc-view--image-file-extension)
+                   (format doc-view--image-file-pattern "%d")
                    (doc-view-current-cache-dir))))
     (make-directory (doc-view-current-cache-dir) t)
     (pcase doc-view-doc-type
@@ -1092,15 +1063,10 @@ Those files are saved in the directory given by the function
                               ;; Rename to doc.pdf
                               (rename-file opdf pdf)
                               (doc-view-pdf/ps->png pdf png-file)))))
-      (`pdf
-       (let ((pages (doc-view-active-pages)))
-         ;; Convert PDF to PNG images starting with the active pages.
-         (doc-view-document->png doc-view-buffer-file-name png-file pages
-                                 'doc-view-pdf->png-1)))
-      (`djvu
+      ((or `pdf `djvu)
        (let ((pages (doc-view-active-pages)))
-         (doc-view-document->png doc-view-buffer-file-name png-file pages
-                                 'doc-view-djvu->png-1)))
+         ;; Convert doc to bitmap images starting with the active pages.
+         (doc-view-document->bitmap doc-view-buffer-file-name png-file pages)))
       (_
        ;; Convert to PNG images.
        (doc-view-pdf/ps->png doc-view-buffer-file-name png-file)))))
@@ -1211,9 +1177,10 @@ much more accurate than could be done manually using
       (let* ((is (image-size (doc-view-current-image) t))
              (iw (car is))
              (ih (cdr is))
-             (ps (or (and (null force-paper-size) (doc-view-guess-paper-size iw ih))
+             (ps (or (and (null force-paper-size)
+                          (doc-view-guess-paper-size iw ih))
                      (intern (completing-read "Paper size: "
-                                              (mapcar #'car doc-view-paper-sizes)
+                                              doc-view-paper-sizes
                                               nil t))))
              (bb (doc-view-scale-bounding-box ps iw ih bb))
              (x1 (nth 0 bb))
@@ -1294,16 +1261,15 @@ have the page we want to view."
     (let ((prev-pages doc-view-current-files))
       (setq doc-view-current-files
             (sort (directory-files (doc-view-current-cache-dir) t
-                                   (concat "page-[0-9]+\\."
-                                           doc-view--image-file-extension)
+                                   (format doc-view--image-file-pattern
+                                           "[0-9]+")
                                    t)
                   'doc-view-sort))
       (dolist (win (or (get-buffer-window-list buffer nil t)
                        (list t)))
         (let* ((page (doc-view-current-page win))
                (pagefile (expand-file-name
-                          (format "page-%d.%s"
-                                  page doc-view--image-file-extension)
+                          (format doc-view--image-file-pattern page)
                           (doc-view-current-cache-dir))))
           (when (or force
                     (and (not (member pagefile prev-pages))
@@ -1369,7 +1335,7 @@ For now these keys are useful:
         (doc-view-kill-proc)
         (setq buffer-read-only nil)
         (remove-overlays (point-min) (point-max) 'doc-view t)
-        (set (make-local-variable 'image-mode-winprops-alist) t)
+        (setq-local image-mode-winprops-alist t)
         ;; Switch to the previously used major mode or fall back to
         ;; normal mode.
         (doc-view-fallback-mode)
@@ -1499,7 +1465,7 @@ If BACKWARD is non-nil, jump to the previous match."
                                           (doc-view-current-cache-dir)))
        (> (length (directory-files
                    (doc-view-current-cache-dir)
-                   nil (concat "\\." doc-view--image-file-extension "\\'")))
+                   nil (format doc-view--image-file-pattern "[0-9]+")))
           0)))
 
 (defun doc-view-initiate-display ()
@@ -1511,7 +1477,7 @@ If BACKWARD is non-nil, jump to the previous match."
         (if (doc-view-already-converted-p)
             (progn
               (message "DocView: using cached files!")
-              ;; Load the saved resolution
+              ;; Load the saved resolution.
               (let* ((res-file (expand-file-name "resolution.el"
                                                  (doc-view-current-cache-dir)))
                      (res
@@ -1520,7 +1486,7 @@ If BACKWARD is non-nil, jump to the previous match."
                           (insert-file-contents res-file)
                           (read (current-buffer))))))
                 (when (numberp res)
-                  (set (make-local-variable 'doc-view-resolution) res)))
+                  (setq-local doc-view-resolution res)))
               (doc-view-display (current-buffer) 'force))
           (doc-view-convert-current-doc))
         (message
@@ -1590,23 +1556,23 @@ If BACKWARD is non-nil, jump to the previous match."
             ((looking-at "%PDF") '(pdf))
             ((looking-at "\367\002") '(dvi))
             ((looking-at "AT&TFORM") '(djvu))))))
-    (set (make-local-variable 'doc-view-doc-type)
-         (car (or (doc-view-intersection name-types content-types)
-                  (when (and name-types content-types)
-                    (error "Conflicting types: name says %s but content says %s"
-                           name-types content-types))
-                  name-types content-types
-                  (error "Cannot determine the document type"))))))
+    (setq-local doc-view-doc-type
+        (car (or (doc-view-intersection name-types content-types)
+                 (when (and name-types content-types)
+                   (error "Conflicting types: name says %s but content says %s"
+                          name-types content-types))
+                 name-types content-types
+                 (error "Cannot determine the document type"))))))
 
 (defun doc-view-set-up-single-converter ()
   "Find the right single-page converter for the current document type"
   (pcase-let ((`(,conv-function ,type ,extension)
                (pcase doc-view-doc-type
-                 (`djvu (list #'doc-view-djvu->png-1 'tiff "tif"))
-                 (_     (list #'doc-view-pdf->png-1  'png  "png")))))
+                 (`djvu (list #'doc-view-djvu->tiff-converter-ddjvu 'tiff "tif"))
+                 (_     (list doc-view-pdf->png-converter-function  'png  "png")))))
     (setq-local doc-view-single-page-converter-function conv-function)
     (setq-local doc-view--image-type type)
-    (setq-local doc-view--image-file-extension extension)))
+    (setq-local doc-view--image-file-pattern (concat "page-%s." extension))))
 
 ;;;###autoload
 (defun doc-view-mode ()
@@ -1631,8 +1597,7 @@ toggle between displaying the document or editing it as text.
                               (unless (eq major-mode 'fundamental-mode)
                                 major-mode))))
       (kill-all-local-variables)
-      (set (make-local-variable 'doc-view-previous-major-mode)
-           prev-major-mode))
+      (setq-local doc-view-previous-major-mode prev-major-mode))
 
     (dolist (var doc-view-saved-settings)
       (set (make-local-variable (car var)) (cdr var)))
@@ -1644,7 +1609,7 @@ toggle between displaying the document or editing it as text.
 
     (doc-view-make-safe-dir doc-view-cache-directory)
     ;; Handle compressed files, remote files, files inside archives
-    (set (make-local-variable 'doc-view-buffer-file-name)
+    (setq-local doc-view-buffer-file-name
          (cond
           (jka-compr-really-do-compress
            ;; FIXME: there's a risk of name conflicts here.
@@ -1683,20 +1648,19 @@ toggle between displaying the document or editing it as text.
               'doc-view-new-window-function nil t)
     (image-mode-setup-winprops)
 
-    (set (make-local-variable 'mode-line-position)
-         '(" P" (:eval (number-to-string (doc-view-current-page)))
-           "/" (:eval (number-to-string (doc-view-last-page-number)))))
+    (setq-local mode-line-position
+                '(" P" (:eval (number-to-string (doc-view-current-page)))
+                  "/" (:eval (number-to-string (doc-view-last-page-number)))))
     ;; Don't scroll unless the user specifically asked for it.
-    (set (make-local-variable 'auto-hscroll-mode) nil)
-    (set (make-local-variable 'mwheel-scroll-up-function)
-         'doc-view-scroll-up-or-next-page)
-    (set (make-local-variable 'mwheel-scroll-down-function)
-         'doc-view-scroll-down-or-previous-page)
-    (set (make-local-variable 'cursor-type) nil)
+    (setq-local auto-hscroll-mode nil)
+    (setq-local mwheel-scroll-up-function #'doc-view-scroll-up-or-next-page)
+    (setq-local mwheel-scroll-down-function
+                #'doc-view-scroll-down-or-previous-page)
+    (setq-local cursor-type nil)
     (use-local-map doc-view-mode-map)
-    (set (make-local-variable 'after-revert-hook) 'doc-view-reconvert-doc)
-    (set (make-local-variable 'bookmark-make-record-function)
-         'doc-view-bookmark-make-record)
+    (add-hook 'after-revert-hook 'doc-view-reconvert-doc nil t)
+    (setq-local bookmark-make-record-function
+                #'doc-view-bookmark-make-record)
     (setq mode-name "DocView"
           buffer-read-only t
           major-mode 'doc-view-mode)
@@ -1705,7 +1669,7 @@ toggle between displaying the document or editing it as text.
     ;; canonical view mode for PDF/PS/DVI files.  This could be
     ;; switched on automatically depending on the value of
     ;; `view-read-only'.
-    (set (make-local-variable 'view-read-only) nil)
+    (setq-local view-read-only nil)
     (run-mode-hooks 'doc-view-mode-hook)))
 
 (defun doc-view-fallback-mode ()
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index 6741094aa55..270badd53cb 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -295,6 +295,14 @@ Changes to files matching one of the regexps in this list are not listed.")
     "calc/INSTALL" "calc/Makefile"
     "vms-pp.trans" "_emacs" "batcomp.com" "notes/cpp" ; admin/
     "emacsver.texi.in"
+    "vpath.sed"
+    "Cocoa/Emacs.base/Contents/Info.plist"
+    "Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings"
+    "GNUstep/Emacs.base/Resources/Info-gnustep.plist"
+    "GNUstep/Emacs.base/Resources/Emacs.desktop"
+    "Cocoa/Emacs.base/Contents/Resources/English.lproj"
+    ;; Only existed briefly, then deleted:
+    "coccinelle/overlay.cocci" "coccinelle/symbol.cocci"
     ;; MH-E stuff not in Emacs:
     "import-emacs" "release-utils"
     ;; Erc stuff not in Emacs:
@@ -540,6 +548,7 @@ Changes to files in this list are not listed.")
     "makedist.bat"
     "makefile.def"
     "makefile.nt"
+    "ns.mk"
     "debug.bat.in" "emacs.bat.in"
     ".gdbinit-union"
     "alloca.s"
@@ -553,15 +562,17 @@ Changes to files in this list are not listed.")
     "ymakefile"
     "permute-index" "index.perm"
     "ibmrs6000.inp"
-    "b2m.c" "b2m.1" "b2m.pl"
+    "b2m.c" "b2m.1" "b2m.pl" "rcs-checkin.1"
     "emacs.bash" "emacs.csh" "ms-kermit"
     "emacs.ico"
     "emacs21.ico"
+    "emacs.py" "emacs2.py" "emacs3.py"
     "BABYL" "LPF" "LEDIT" "OTHER.EMACSES"
     "emacs16_mac.png" "emacs24_mac.png"
     "emacs256_mac.png" "emacs32_mac.png"
     "emacs48_mac.png" "emacs512_mac.png"
     "revdiff"                           ; admin/
+    "vcdiff" "rcs-checkin" "tindex.pl"
     "mainmake" "sed1.inp" "sed2.inp" "sed3.inp" ; msdos/
     "mac-fix-env.m"
     ;; Deleted vms stuff:
@@ -580,6 +591,7 @@ in the repository.")
     ("s/windowsnt.h" . "s/ms-w32.h")
     ("s/ms-w32.h" . "inc/ms-w32.h")
     ("winnt.el" . "w32-fns.el")
+    ("emacs.manifest" . "emacs-x86.manifest")
     ("config.emacs" . "configure")
     ("configure.in" . "configure.ac")
     ("config.h.dist" . "config.in")
@@ -616,6 +628,8 @@ in the repository.")
     ("build-install" . "build-ins.in")
     ("build-install.in" . "build-ins.in")
     ("unidata/Makefile" . "unidata/Makefile.in")
+    ("move-if-change" . "build-aux/move-if-change")
+    ("update-subdirs" . "build-aux/update-subdirs")
     ;; Not renamed, but we only have the latter in the Emacs repo.
     ("trampver.texi.in" . "trampver.texi")
     ("e/eterm" . "e/eterm-color")
diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el
index 5607c9b0698..f88cb0ef9bb 100644
--- a/lisp/emacs-lisp/crm.el
+++ b/lisp/emacs-lisp/crm.el
@@ -30,12 +30,12 @@
 ;; a single prompt, optionally using completion.
 
 ;; Multiple strings are specified by separating each of the strings
-;; with a prespecified separator character.  For example, if the
-;; separator character is a comma, the strings 'alice', 'bob', and
+;; with a prespecified separator regexp.  For example, if the
+;; separator regexp is ",", the strings 'alice', 'bob', and
 ;; 'eve' would be specified as 'alice,bob,eve'.
 
-;; The default value for the separator character is the value of
-;; `crm-default-separator' (comma).  The separator character may be
+;; The default value for the separator regexp is the value of
+;; `crm-default-separator' (comma).  The separator regexp may be
 ;; changed by modifying the value of `crm-separator'.
 
 ;; Contiguous strings of non-separator-characters are referred to as
@@ -96,14 +96,14 @@
 ;;   first revamped version
 
 ;;; Code:
-(defconst crm-default-separator ","
-  "Default separator for `completing-read-multiple'.")
+(defconst crm-default-separator "[ \t]*,[ \t]*"
+  "Default separator regexp for `completing-read-multiple'.")
 
 (defvar crm-separator crm-default-separator
-  "Separator used for separating strings in `completing-read-multiple'.
-It should be a single character string that doesn't appear in the list of
-completion candidates.  Modify this value to make `completing-read-multiple'
-use a separator other than `crm-default-separator'.")
+  "Separator regexp used for separating strings in `completing-read-multiple'.
+It should be a regexp that does not match the list of completion candidates.
+Modify this value to make `completing-read-multiple' use a separator other
+than `crm-default-separator'.")
 
 (defvar crm-local-completion-map
   (let ((map (make-sparse-keymap)))
@@ -173,13 +173,17 @@ Place an overlay on the element, with a `field' property, and return it."
     (overlay-put ol 'field (make-symbol "crm"))
     ol))
 
+(defmacro crm--completion-command (command)
+  "Make COMMAND a completion command for `completing-read-multiple'."
+  `(let ((ol (crm--select-current-element)))
+     (unwind-protect
+         ,command
+       (delete-overlay ol))))
+
 (defun crm-completion-help ()
   "Display a list of possible completions of the current minibuffer element."
   (interactive)
-  (let ((ol (crm--select-current-element)))
-    (unwind-protect
-        (minibuffer-completion-help)
-      (delete-overlay ol)))
+  (crm--completion-command (minibuffer-completion-help))
   nil)
 
 (defun crm-complete ()
@@ -188,19 +192,13 @@ If no characters can be completed, display a list of possible completions.
 
 Return t if the current element is now a valid match; otherwise return nil."
   (interactive)
-  (let ((ol (crm--select-current-element)))
-    (unwind-protect
-        (minibuffer-complete)
-      (delete-overlay ol))))
+  (crm--completion-command (minibuffer-complete)))
 
 (defun crm-complete-word ()
   "Complete the current element at most a single word.
 Like `minibuffer-complete-word' but for `completing-read-multiple'."
   (interactive)
-  (let ((ol (crm--select-current-element)))
-    (unwind-protect
-        (minibuffer-complete-word)
-      (delete-overlay ol))))
+  (crm--completion-command (minibuffer-complete-word)))
 
 (defun crm-complete-and-exit ()
   "If all of the minibuffer elements are valid completions then exit.
@@ -222,9 +220,10 @@ This function is modeled after `minibuffer-complete-and-exit'."
                      (setq doexit nil))
                  (goto-char (overlay-end ol))
                  (delete-overlay ol))
-               (not (eobp))))
+               (not (eobp)))
+             (looking-at crm-separator))
       ;; Skip to the next element.
-      (forward-char 1))
+      (goto-char (match-end 0)))
     (if doexit (exit-minibuffer))))
 
 (defun crm--choose-completion-string (choice buffer base-position
@@ -248,12 +247,12 @@ By using this functionality, a user may specify multiple strings at a
 single prompt, optionally using completion.
 
 Multiple strings are specified by separating each of the strings with
-a prespecified separator character.  For example, if the separator
-character is a comma, the strings 'alice', 'bob', and 'eve' would be
+a prespecified separator regexp.  For example, if the separator
+regexp is \",\", the strings 'alice', 'bob', and 'eve' would be
 specified as 'alice,bob,eve'.
 
-The default value for the separator character is the value of
-`crm-default-separator' (comma).  The separator character may be
+The default value for the separator regexp is the value of
+`crm-default-separator' (comma).  The separator regexp may be
 changed by modifying the value of `crm-separator'.
 
 Contiguous strings of non-separator-characters are referred to as
@@ -282,8 +281,8 @@ INHERIT-INPUT-METHOD."
                (map (if require-match
                         crm-local-must-match-map
                       crm-local-completion-map))
-               ;; If the user enters empty input, read-from-minibuffer returns
-               ;; the empty string, not DEF.
+               ;; If the user enters empty input, `read-from-minibuffer'
+               ;; returns the empty string, not DEF.
                (input (read-from-minibuffer
                        prompt initial-input map
                        nil hist def inherit-input-method)))
diff --git a/lisp/faces.el b/lisp/faces.el
index f78a4cb9e3d..60410733514 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -929,27 +929,29 @@ of the default face.  Value is FACE."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (defun read-face-name (prompt &optional default multiple)
-  "Read a face, defaulting to the face or faces at point.
-If the text at point has the property `read-face-name', that
-overrides the `face' property for determining the default.
+  "Read one or more face names, defaulting to the face(s) at point.
+PROMPT should be a prompt string; it should not end in a space or
+a colon.
 
-PROMPT should be a string that describes what the caller will do
-with the face; it should not end in a space.
+The optional argument DEFAULT specifies the default face name(s)
+to return if the user just types RET.  If its value is non-nil,
+it should be a list of face names (symbols); in that case, the
+default return value is the `car' of DEFAULT (if the argument
+MULTIPLE is non-nil), or DEFAULT (if MULTIPLE is nil).  See below
+for the meaning of MULTIPLE.
 
+If DEFAULT is nil, the list of default face names is taken from
+the `read-face-name' property of the text at point, or, if that
+is nil, from the `face' property of the text at point.
 
 This function uses `completing-read-multiple' with \",\" as the
-separator character, i.e.
-
-
-
-
-
-The optional argument DEFAULT provides the value to display in the
-minibuffer prompt that is returned if the user just types RET
-unless DEFAULT is a string (in which case nil is returned).
-
-If MULTIPLE is non-nil, return a list of faces (possibly only one).
-Otherwise, return a single face."
+separator character.  Thus, the user may enter multiple face
+names, separated by commas.  The optional argument MULTIPLE
+specifies the form of the return value.  If MULTIPLE is non-nil,
+return a list of face names; if the user entered just one face
+name, the return value would be a list of one face name.
+Otherwise, return a single face name; if the user entered more
+than one face name, return only the first one."
   (let ((faceprop (or (get-char-property (point) 'read-face-name)
                       (get-char-property (point) 'face)))
         (aliasfaces nil)
diff --git a/lisp/files.el b/lisp/files.el
index ca5a415fb8e..b015b53db3c 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2357,7 +2357,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode)
      ("\\.\\(diffs?\\|patch\\|rej\\)\\'" . diff-mode)
      ("\\.\\(dif\\|pat\\)\\'" . diff-mode) ; for MSDOG
      ("\\.[eE]?[pP][sS]\\'" . ps-mode)
-     ("\\.\\(?:PDF\\|DVI\\|OD[FGPST]\\|DOCX?\\|XLSX?\\|PPTX?\\|pdf\\|dvi\\|od[fgpst]\\|docx?\\|xlsx?\\|pptx?\\)\\'" . doc-view-mode-maybe)
+     ("\\.\\(?:PDF\\|DVI\\|OD[FGPST]\\|DOCX?\\|XLSX?\\|PPTX?\\|pdf\\|djvu\\|dvi\\|od[fgpst]\\|docx?\\|xlsx?\\|pptx?\\)\\'" . doc-view-mode-maybe)
      ("configure\\.\\(ac\\|in\\)\\'" . autoconf-mode)
      ("\\.s\\(v\\|iv\\|ieve\\)\\'" . sieve-mode)
      ("BROWSE\\'" . ebrowse-tree-mode)
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 90eb5dfaec5..a95dde1d999 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -63,8 +63,9 @@ otherwise it defaults to t, used for times when the buffer is not displayed."
   (when cleanup
     (setq image-mode-winprops-alist
           (delq nil (mapcar (lambda (winprop)
-                              (if (window-live-p (car-safe winprop))
-                                  winprop))
+                              (let ((w (car-safe winprop)))
+                                (if (or (not (windowp w)) (window-live-p w))
+                                    winprop)))
                             image-mode-winprops-alist))))
   (let ((winprops (assq window image-mode-winprops-alist)))
     ;; For new windows, set defaults from the latest.
diff --git a/lisp/imenu.el b/lisp/imenu.el
index 0bfee770094..f64d1afe951 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -447,6 +447,8 @@ Don't move point."
 Simple elements in the alist look like (INDEX-NAME . POSITION).
 POSITION is the buffer position of the item; to go to the item
 is simply to move point to that position.
+POSITION is passed to `imenu-default-goto-function', so it can be a non-number
+if that variable has been changed (e.g. Semantic uses overlays for POSITIONs).
 
 Special elements look like (INDEX-NAME POSITION FUNCTION ARGUMENTS...).
 To \"go to\" a special element means applying FUNCTION
diff --git a/lisp/man.el b/lisp/man.el
index b6a6c179374..93a67128de4 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -1,4 +1,4 @@
-;;; man.el --- browse UNIX manual pages -*- coding: iso-8859-1 -*-
+;;; man.el --- browse UNIX manual pages  -*- coding: utf-8 -*-
 
 ;; Copyright (C) 1993-1994, 1996-1997, 2001-2013 Free Software
 ;; Foundation, Inc.
@@ -276,7 +276,7 @@ Used in `bookmark-set' to get the default bookmark name."
   :type 'hook
   :group 'man)
 
-(defvar Man-name-regexp "[-a-zA-Z0-9_­+][-a-zA-Z0-9_.:­+]*"
+(defvar Man-name-regexp "[-a-zA-Z0-9_­+][-a-zA-Z0-9_.:­+]*"
   "Regular expression describing the name of a manpage (without section).")
 
 (defvar Man-section-regexp "[0-9][a-zA-Z0-9+]*\\|[LNln]"
@@ -780,6 +780,59 @@ POS defaults to `point'."
   ;; but apparently that's not the case in all cases, so let's add a cache.
   "Cache of completion table of the form (PREFIX . TABLE).")
 
+(defvar Man-man-k-use-anchor
+  ;; man-db or man-1.*
+  (memq system-type '(gnu gnu/linux gnu/kfreebsd))
+  "If non-nil prepend ^ to the prefix passed to \"man -k\" for completion.
+The value should be nil if \"man -k ^PREFIX\" may omit some man
+pages whose names start with PREFIX.
+
+Currently, the default value depends on `system-type' and is
+non-nil where the standard man programs are known to behave
+properly.  Setting the value to nil always gives correct results
+but computing the list of completions may take a bit longer.")
+
+(defun Man-parse-man-k ()
+  "Parse \"man -k\" output and return the list of page names.
+
+The current buffer should contain the output of a command of the
+form \"man -k keyword\", which is traditionally also available with
+apropos(1).
+
+While POSIX man(1p) is a bit vague about what to expect here,
+this function tries to parse some commonly used formats, which
+can be described in the following informal way, with square brackets
+indicating optional parts and whitespace being interpreted
+somewhat loosely.
+
+foo[, bar [, ...]] [other stuff] (sec) - description
+foo(sec)[, bar(sec) [, ...]] [other stuff] - description
+
+For more details and some regression tests, please see
+test/automated/man-tests.el in the emacs bzr repository."
+  (goto-char (point-min))
+  ;; See man-tests for data about which systems use which format (hopefully we
+  ;; will be able to simplify the code if/when some of those formats aren't
+  ;; used any more).
+  (let (table)
+    (while (search-forward-regexp "^\\([^ \t,\n]+\\)\\(.*?\\)\
+\\(?:[ \t]\\(([^ \t,\n]+?)\\)\\)?\\(?:[ \t]+- ?\\(.*\\)\\)?$" nil t)
+      (let ((section (match-string 3))
+            (description (match-string 4))
+            (bound (match-end 2)))
+        (goto-char (match-end 1))
+        (while
+            (progn
+              ;; The first regexp grouping may already match the section
+              ;; tacked on to the name, which is ok since for the formats we
+              ;; claim to support the third (non-shy) grouping does not
+              ;; match in this case, i.e., section is nil.
+              (push (propertize (concat (match-string 1) section)
+                                'help-echo description)
+                    table)
+              (search-forward-regexp "\\=, *\\([^ \t,]+\\)" bound t)))))
+    (nreverse table)))
+
 (defun Man-completion-table (string pred action)
   (cond
    ;; This ends up returning t for pretty much any string, and hence leads to
@@ -811,16 +864,15 @@ POS defaults to `point'."
             ;; run differently in Man-getpage-in-background, an error
             ;; here may not necessarily mean that we'll also get an
             ;; error later.
-            (ignore-errors
-              (call-process manual-program nil '(t nil) nil
-                            "-k" (concat "^" prefix))))
-          (goto-char (point-min))
-          (while (re-search-forward "^\\([^ \t\n]+\\)\\(?: ?\\((.+?)\\)\\(?:[ \t]+- \\(.*\\)\\)?\\)?" nil t)
-            (push (propertize (concat (match-string 1) (match-string 2))
-                              'help-echo (match-string 3))
-                  table)))
-        ;; Cache the table for later reuse.
-        (setq Man-completion-cache (cons prefix table)))
+            (ignore-errors
+              (call-process manual-program nil '(t nil) nil
+                            "-k" (concat (when (or Man-man-k-use-anchor
+                                                   (string-equal prefix ""))
+                                           "^")
+                                         prefix))))
+          (setq table (Man-parse-man-k)))
+        ;; Cache the table for later reuse.
+        (setq Man-completion-cache (cons prefix table)))
       ;; The table may contain false positives since the match is made
       ;; by "man -k" not just on the manpage's name.
       (if section
@@ -891,6 +943,7 @@ names or descriptions.  The pattern argument is usually an
                 ;; ("man -k" is case-insensitive similarly, so the
                 ;; table has everything available to complete)
                 (completion-ignore-case t)
+                Man-completion-cache    ;Don't cache across calls.
                 (input (completing-read
                         (format "Manual entry%s"
                                 (if (string= default-entry "")
@@ -1395,7 +1448,7 @@ The following key bindings are currently in effect in the buffer:
                               ;; Update len, in case a reference spans
                               ;; more than two lines (paranoia).
                               len (1- (length word))))
-                    (if (memq (aref word len) '(?- ?­))
+                    (if (memq (aref word len) '(?- ?­))
                         (setq hyphenated (substring word 0 len)))
                     (and (string-match Man-reference-regexp word)
                          (not (member word Man--refpages))
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 6ffa67f59c1..560b66bf3b0 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -2464,8 +2464,12 @@ comment at the start of cc-engine.el for more info."
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Variables which keep track of preprocessor constructs.
+(defvar c-state-old-cpp-beg-marker nil)
+(make-variable-buffer-local 'c-state-old-cpp-beg-marker)
 (defvar c-state-old-cpp-beg nil)
 (make-variable-buffer-local 'c-state-old-cpp-beg)
+(defvar c-state-old-cpp-end-marker nil)
+(make-variable-buffer-local 'c-state-old-cpp-end-marker)
 (defvar c-state-old-cpp-end nil)
 (make-variable-buffer-local 'c-state-old-cpp-end)
 ;; These are the limits of the macro containing point at the previous call of
@@ -2653,13 +2657,21 @@ comment at the start of cc-engine.el for more info."
   ;; reduce the time wasted in repeated fruitless searches in brace deserts.
   (save-excursion
     (save-restriction
-      (let ((bra from) ce               ; Positions of "{" and "}".
-            new-cons
-            (cache-pos (c-state-cache-top-lparen)) ; might be nil.
-            (macro-start-or-from
-             (progn (goto-char from)
-                    (c-beginning-of-macro)
-                    (point))))
+      (let* (new-cons
+             (cache-pos (c-state-cache-top-lparen)) ; might be nil.
+             (macro-start-or-from
+              (progn (goto-char from)
+                     (c-beginning-of-macro)
+                     (point)))
+             (bra                       ; Position of "{".
+              ;; Don't start scanning in the middle of a CPP construct unless
+              ;; it contains HERE - these constructs, in Emacs, are "commented
+              ;; out" with category properties.
+              (if (eq (c-get-char-property macro-start-or-from 'category)
+                        'c-cpp-delimiter)
+                    macro-start-or-from
+                  from))
+             ce)                        ; Position of "}"
         (or upper-lim (setq upper-lim from))
 
         ;; If we're essentially repeating a fruitless search, just give up.
@@ -2899,7 +2911,9 @@ comment at the start of cc-engine.el for more info."
                   (point-max)
                 (min (point-max) c-state-old-cpp-beg)))
         (while (and c-state-cache (>= (c-state-cache-top-lparen) upper-lim))
+          (setq scan-back-pos (car-safe (car c-state-cache)))
           (setq c-state-cache (cdr c-state-cache)))
+
         ;; If `upper-lim' is inside the last recorded brace pair, remove its
         ;; RBrace and indicate we'll need to search backwards for a previous
         ;; brace pair.
@@ -3324,6 +3338,13 @@ comment at the start of cc-engine.el for more info."
      (c-with-cpps-commented-out
       (c-invalidate-state-cache-1 here)))))
 
+(defmacro c-state-maybe-marker (place marker)
+  ;; If PLACE is non-nil, return a marker marking it, otherwise nil.
+  ;; We (re)use MARKER.
+  `(and ,place
+        (or ,marker (setq ,marker (make-marker)))
+        (set-marker ,marker ,place)))
+
 (defun c-parse-state ()
   ;; This is a wrapper over `c-parse-state-1'.  See that function for a
   ;; description of the functionality and return value.
@@ -3350,9 +3371,10 @@ comment at the start of cc-engine.el for more info."
               (c-parse-state-1))
            (c-with-cpps-commented-out
             (c-parse-state-1))))
-      (setq c-state-old-cpp-beg (and here-cpp-beg (copy-marker here-cpp-beg t))
-            c-state-old-cpp-end (and here-cpp-end (copy-marker here-cpp-end t)))
-      )))
+      (setq c-state-old-cpp-beg
+            (c-state-maybe-marker here-cpp-beg c-state-old-cpp-beg-marker)
+            c-state-old-cpp-end
+            (c-state-maybe-marker here-cpp-end c-state-old-cpp-end-marker)))))
 
 ;; Debug tool to catch cache inconsistencies.  This is called from
 ;; 000tests.el.
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index 0279319cc89..adf378f6bc7 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -319,7 +319,9 @@ If no function name is found, return nil."
                     namestack (cons (car pair) namestack)
                     alist     (cdr pair)))
 
-             ((number-or-marker-p (setq mark (cdr pair)))
+             ((or (number-or-marker-p (setq mark (cdr pair)))
+                  (and (overlayp mark)
+                       (setq mark (overlay-start mark))))
               (when (and (>= (setq offset (- (point) mark)) 0)
                          (< offset minoffset)) ; Find the closest item.
                 (setq minoffset offset
diff --git a/lisp/simple.el b/lisp/simple.el
index d06a04aa5dc..dcd6d792acb 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1391,14 +1391,16 @@ If the value is non-nil and not a number, we wait 2 seconds."
   ;; Aaron S. Hawley <aaron.s.hawley(at)gmail.com> 2009-08-24
   "Read function name, then read its arguments and call it.
 
-To pass a numeric argument to the command you are invoking with, specify
+To pass a numeric argument to the command you are invoking, specify
 the numeric argument to this command.
 
 Noninteractively, the argument PREFIXARG is the prefix argument to
 give to the command you invoke, if it asks for an argument."
   (interactive (list current-prefix-arg (read-extended-command)))
   ;; Emacs<24 calling-convention was with a single `prefixarg' argument.
-  (if (null command-name) (setq command-name (read-extended-command)))
+  (if (null command-name)
+      (setq command-name (let ((current-prefix-arg prefixarg)) ; for prompt
+                           (read-extended-command))))
   (let* ((function (and (stringp command-name) (intern-soft command-name)))
          (binding (and suggest-key-bindings
                        (not executing-kbd-macro)