Merge from emacs-24

diff --cc admin/ChangeLog
Simple merge

diff --cc doc/lispref/ChangeLog
Simple merge

diff --cc etc/ChangeLog
Simple merge

diff --cc lisp/ChangeLog
index 7c3443a,c3264d8..b9f35e6
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,50 -1,41 +1,84 @@@
 -2013-01-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 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-09  Alan Mackenzie  <acm@muc.de>
++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-09  Glenn Morris  <rgm@gnu.org>
++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-09  Chong Yidong  <cyd@gnu.org>
++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).
 +      (doc-view-djvu->png-converter-function): New config var.
 +      (doc-view-single-page-converter-function, doc-view--image-type)
 +      (doc-view--image-file-extension): New vars.
 +      (doc-view-mode): Initialize them.
 +      (doc-view-goto-page): Use them.
 +      (doc-view-mode-p): Add support for ddjvu.
 +      (doc-view-djvu->png-converter-ddjvu, doc-view-djvu->png-1)
 +      (doc-view-set-up-single-converter): New funs.
 +      (doc-view-pdf/ps->png): Extend for djvu.
 +      (doc-view-document->png): Rename from doc-view-pdf->png.
 +      (doc-view-convert-current-doc): Handle djvu.
 +      (doc-view-insert-image, doc-view-display)
 +      (doc-view-already-converted-p): Don't hardcode png.
 +      (doc-view-set-doc-type): Recognize djvu docs.
 +
 +2013-01-09  Elias Pipping  <pipping@lavabit.com>
 +
 +      * doc-view.el: Add support for mupdf converter (bug#13164).
 +      (doc-view-pdfdraw-program, doc-view-pdf->png-converter-function)
 +      (doc-view-ps->png-converter-function): New config vars.
 +      (doc-view-pdf->png-converter-ghostscript)
 +      (doc-view-ps->png-converter-ghostscript)
 +      (doc-view-pdf->png-converter-mupdf): New functions.
 +      (doc-view-pdf/ps->png, doc-view-pdf->png-1): Use them.
 +
 +2013-01-09  Jürgen Hötzel  <juergen@archlinux.org>
 +
 +      * net/tramp.el (tramp-eshell-directory-change): Check remote-path
 +      first in session cache: When `tramp-own-remote-path' is in
 +      `tramp-remote-path', the remote path is only set in the session
 +      cache.
 +
  2013-01-09  Glenn Morris  <rgm@gnu.org>
  
 -      * emacs-lisp/trace.el (trace-function, trace-function-background):
 -      Doc fix.
 +      * emacs-lisp/trace.el (trace-function-foreground)
 +      (trace-function-background): Doc fix.
  
  2013-01-09  Juri Linkov  <juri@jurta.org>
  

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/simple.el
Simple merge