------------------------------------------------------------
revno: 116977
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Mon 2014-04-14 17:01:37 -0400
message:
  * lisp/doc-view.el (doc-view-set-doc-type): Ignore file name case; add .pps.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2014-04-14 15:38:43 +0000
+++ lisp/ChangeLog	2014-04-14 21:01:37 +0000
@@ -1,3 +1,7 @@
+2014-04-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* doc-view.el (doc-view-set-doc-type): Ignore file name case; add .pps.
+
 2014-04-14  Juanma Barranquero  <lekktu@gmail.com>
 
 	* faces.el (face-set-after-frame-default): Remove unused local variable.

=== modified file 'lisp/doc-view.el'
--- lisp/doc-view.el	2014-04-04 17:42:55 +0000
+++ lisp/doc-view.el	2014-04-14 21:01:37 +0000
@@ -1621,24 +1621,25 @@
   "Figure out the current document type (`doc-view-doc-type')."
   (let ((name-types
 	 (when buffer-file-name
-	   (cdr (assoc (file-name-extension buffer-file-name)
-		       '(
-			 ;; DVI
-			 ("dvi" dvi)
-			 ;; PDF
-			 ("pdf" pdf) ("epdf" pdf)
-			 ;; PostScript
-			 ("ps" ps) ("eps" ps)
-			 ;; DjVu
-			 ("djvu" djvu)
-			 ;; OpenDocument formats
-			 ("odt" odf) ("ods" odf) ("odp" odf) ("odg" odf)
-			 ("odc" odf) ("odi" odf) ("odm" odf) ("ott" odf)
-			 ("ots" odf) ("otp" odf) ("otg" odf)
-			 ;; Microsoft Office formats (also handled
-			 ;; by the odf conversion chain)
-			 ("doc" odf) ("docx" odf) ("xls" odf) ("xlsx" odf)
-			 ("ppt" odf) ("pptx" odf))))))
+	   (cdr (assoc-ignore-case
+                 (file-name-extension buffer-file-name)
+                 '(
+                   ;; DVI
+                   ("dvi" dvi)
+                   ;; PDF
+                   ("pdf" pdf) ("epdf" pdf)
+                   ;; PostScript
+                   ("ps" ps) ("eps" ps)
+                   ;; DjVu
+                   ("djvu" djvu)
+                   ;; OpenDocument formats.
+                   ("odt" odf) ("ods" odf) ("odp" odf) ("odg" odf)
+                   ("odc" odf) ("odi" odf) ("odm" odf) ("ott" odf)
+                   ("ots" odf) ("otp" odf) ("otg" odf)
+                   ;; Microsoft Office formats (also handled by the odf
+                   ;; conversion chain).
+                   ("doc" odf) ("docx" odf) ("xls" odf) ("xlsx" odf)
+                   ("ppt" odf) ("pps" odf) ("pptx" odf))))))
 	(content-types
 	 (save-excursion
 	   (goto-char (point-min))
------------------------------------------------------------
revno: 116976
committer: Juanma Barranquero <lekktu@gmail.com>
branch nick: trunk
timestamp: Mon 2014-04-14 17:38:43 +0200
message:
  lisp/faces.el (face-set-after-frame-default): Remove unused local variable.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2014-04-12 19:38:06 +0000
+++ lisp/ChangeLog	2014-04-14 15:38:43 +0000
@@ -1,3 +1,7 @@
+2014-04-14  Juanma Barranquero  <lekktu@gmail.com>
+
+	* faces.el (face-set-after-frame-default): Remove unused local variable.
+
 2014-04-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* progmodes/grep.el: Use lexical-binding.

=== modified file 'lisp/faces.el'
--- lisp/faces.el	2014-04-12 19:24:17 +0000
+++ lisp/faces.el	2014-04-14 15:38:43 +0000
@@ -2059,17 +2059,16 @@
 settings, X resources, and `face-new-frame-defaults'.
 Finally, apply any relevant face attributes found amongst the
 frame parameters in PARAMETERS."
-  (let ((window-system-p (memq (window-system frame) '(x w32))))
-    ;; The `reverse' is so that `default' goes first.
-    (dolist (face (nreverse (face-list)))
-      (condition-case ()
-	  (progn
-	    ;; Initialize faces from face spec and custom theme.
-	    (face-spec-recalc face frame)
-	    ;; Apply attributes specified by face-new-frame-defaults
-	    (internal-merge-in-global-face face frame))
-	;; Don't let invalid specs prevent frame creation.
-	(error nil))))
+  ;; The `reverse' is so that `default' goes first.
+  (dolist (face (nreverse (face-list)))
+    (condition-case ()
+	(progn
+	  ;; Initialize faces from face spec and custom theme.
+	  (face-spec-recalc face frame)
+	  ;; Apply attributes specified by face-new-frame-defaults
+	  (internal-merge-in-global-face face frame))
+      ;; Don't let invalid specs prevent frame creation.
+      (error nil)))
 
   ;; Apply attributes specified by frame parameters.
   (let ((face-params '((foreground-color default :foreground)
------------------------------------------------------------
revno: 116975
fixes bug: http://debbugs.gnu.org/17258
committer: Paul Eggert <eggert@cs.ucla.edu>
branch nick: trunk
timestamp: Sun 2014-04-13 22:35:45 -0700
message:
  * autogen.sh: Use autoreconf's -f option.
diff:
=== modified file 'ChangeLog'
--- ChangeLog	2014-04-14 05:23:31 +0000
+++ ChangeLog	2014-04-14 05:35:45 +0000
@@ -1,5 +1,7 @@
 2014-04-14  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* autogen.sh: Use autoreconf's -f option (Bug#17258).
+
 	Clean up configure-time library handling a bit.
 	This patch was inspired by emacs-24 bzr 116961, which fixed
 	a bug due to sloppy library handling in 'configure'.

=== modified file 'autogen.sh'
--- autogen.sh	2014-02-10 01:34:22 +0000
+++ autogen.sh	2014-04-14 05:35:45 +0000
@@ -202,7 +202,8 @@
 
 
 ## Let autoreconf figure out what, if anything, needs doing.
-autoreconf -i -I m4 || exit $?
+## Use autoreconf's -f option in case autoreconf itself has changed.
+autoreconf -f -i -I m4 || exit $?
 
 ## Create a timestamp, so that './autogen.sh; make' doesn't
 ## cause 'make' to needlessly run 'autoheader'.