Joseph Wright avatar Joseph Wright committed 7e0e9b5

Allow for xkeyval keys processing (fixes #236)

The code here was slightly wrong even for keyval, as it did not restore
the apppropriate command. That is fixed, and the xkeyval error routine is also
suppressed.

Comments (0)

Files changed (1)

base/beamerbaseoptions.sty

   \fi
   \edef\@tempa{%
     \noexpand\setkeys{\@currname}{\@tempa\@ptionlist{\@currname.\@currext}}}%
-  \let\beamer@origkverr\KV@err%
-  \ifx\@currext\@clsextension\let\KV@errx=\@gobble\fi% never mind
+  \let\beamer@origkverr\KV@errx%
+  \let\beamer@origxkverr\XKV@err%
+  \ifx\@currext\@clsextension\else\let\KV@errx=\@gobble\fi% never mind
+  \ifx\@currext\@clsextension\else\let\XKV@err=\@gobble\fi% never mind
   \@tempa%
-  \let\KV@err\beamer@origkverr%
+  \let\KV@errx\beamer@origkverr%
+  \let\XKV@err\beamer@origxkverr%
   \AtEndOfPackage{\let\@unprocessedoptions\relax}}
 
 \def\ExecuteOptionsBeamer#1{%
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.