diff --git a/emacs-help-update.patch b/emacs-help-update.patch new file mode 100644 index 0000000..b0aa0ce --- /dev/null +++ b/emacs-help-update.patch @@ -0,0 +1,40 @@ +diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 +index 4f7f8d2..50d8038 100644 +--- a/doc/man/emacs.1 ++++ b/doc/man/emacs.1 +@@ -61,6 +61,9 @@ The following options are of general interest: + Edit + .IR file . + .TP ++.BI \-\-chdir " directory\fR\fP " ++Change to directory ++.TP + .BI \-\-file " file\fR,\fP " \-\-find-file " file\fR,\fP " \-\-visit " file" + The same as specifying + .I file +@@ -82,9 +85,15 @@ and + .BR \-q ", " \-\-no\-init\-file + Do not load an init file. + .TP ++.BR \-nl ", " \-\-no\-shared\-memory ++Do not use shared memory ++.TP + .B \-\-no\-site\-file + Do not load the site-wide startup file. + .TP ++.BR \-nsl ", " \-\-no\-site\-list ++Do not add site-lisp directories to load-path ++.TP + .B \-\-no\-desktop + Do not load a saved desktop. + .TP +@@ -325,6 +334,9 @@ in iconified state. + .BR \-nbc ", " \-\-no\-blinking\-cursor + Disable blinking cursor. + .TP ++.BR \-\-parent-id " xid\fR\fP " ++Set parent window ++.TP + .BR \-nw ", " \-\-no\-window\-system + Tell + .I Emacs diff --git a/emacs.spec b/emacs.spec index ccc7cf9..43683a0 100644 --- a/emacs.spec +++ b/emacs.spec @@ -3,7 +3,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 24.2 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -28,6 +28,8 @@ Patch10: emacs-style-change-cb.patch Patch11: emacs-bell-dont-work.patch # Fix for emacs bug #929353 Patch12: emacs-gtk-warning.patch +# Fix for emacs bug #948838 +Patch13: emacs-help-update.patch # Fix for emacs bug #13460. Patch100: emacs-24.2-hunspell.patch # Fix for emacs bug #827033. @@ -171,6 +173,7 @@ packages that add functionality to Emacs. %patch10 -p1 -b .style-change-cb.patch %patch11 -p1 -b .bell-dont-work.patch %patch12 -p1 -b .gtk-warning.patch +%patch13 -p1 -b .help-update.patch %patch100 -p1 -b .hunspell %patch101 -p1 -b .hunspell.2 @@ -452,6 +455,9 @@ update-desktop-database &> /dev/null || : %dir %{_datadir}/emacs/site-lisp/site-start.d %changelog +* Wed Apr 10 2013 Petr Hracek - 1:24.2-18 +- Help and manpage corrections (#948838) + * Mon Apr 08 2013 Petr Hracek - 1:24.2-17 - Spell checking broken by non-default dictionary (#827033)