From 9b9b571430e0e9d96a7c880376421c50ae420b73 Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Thu, 10 Mar 2011 13:54:22 +0100 Subject: [PATCH 01/10] New upstream release --- emacs-23.2-m17ncheck.patch | 14 -------------- emacs-23.2-spacing.patch | 26 -------------------------- emacs.spec | 13 +++++-------- 3 files changed, 5 insertions(+), 48 deletions(-) delete mode 100644 emacs-23.2-m17ncheck.patch delete mode 100644 emacs-23.2-spacing.patch diff --git a/emacs-23.2-m17ncheck.patch b/emacs-23.2-m17ncheck.patch deleted file mode 100644 index 28e1f60..0000000 --- a/emacs-23.2-m17ncheck.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up emacs-23.2/src/ftfont.c.m17ncheck emacs-23.2/src/ftfont.c ---- emacs-23.2/src/ftfont.c.m17ncheck 2010-05-11 11:22:19.977753842 +0200 -+++ emacs-23.2/src/ftfont.c 2010-05-11 11:22:44.545753979 +0200 -@@ -1578,8 +1578,8 @@ ftfont_otf_capability (font) - - #ifdef HAVE_M17N_FLT - --#if ((LIBOTF_MAJOR_VERSION > 1) || (LIBOTF_RELEASE_NUMBER >= 10) \ -- && (M17NLIB_MAJOR_VERSION > 1) || (M17NLIB_MINOR_VERSION >= 6)) -+#if (((LIBOTF_MAJOR_VERSION > 1) || (LIBOTF_RELEASE_NUMBER >= 10)) \ -+ && ((M17NLIB_MAJOR_VERSION > 1) || (M17NLIB_MINOR_VERSION >= 6))) - /* We can use the new feature of libotf and m17n-flt to handle the - character encoding scheme introduced in Unicode 5.1 and 5.2 for - some Agian scripts. */ diff --git a/emacs-23.2-spacing.patch b/emacs-23.2-spacing.patch deleted file mode 100644 index ac8fd8f..0000000 --- a/emacs-23.2-spacing.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/ftfont.c b/src/ftfont.c -index 4ebc4be..bac9a4f 100644 ---- a/src/ftfont.c -+++ b/src/ftfont.c -@@ -1262,7 +1262,7 @@ ftfont_open (f, entity, pixel_size) - spacing = XINT (AREF (entity, FONT_SPACING_INDEX)); - else - spacing = FC_PROPORTIONAL; -- if (spacing != FC_PROPORTIONAL) -+ if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL) - font->min_width = font->average_width = font->space_width - = (scalable ? ft_face->max_advance_width * size / upEM - : ft_face->size->metrics.max_advance >> 6); -diff --git a/src/xftfont.c b/src/xftfont.c -index 82701ce..e74ce31 100644 ---- a/src/xftfont.c -+++ b/src/xftfont.c -@@ -418,7 +418,7 @@ xftfont_open (f, entity, pixel_size) - ascii_printable[i] = ' ' + i; - } - BLOCK_INPUT; -- if (spacing != FC_PROPORTIONAL) -+ if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL) - { - font->min_width = font->average_width = font->space_width - = xftfont->max_advance_width; diff --git a/emacs.spec b/emacs.spec index 7c8a5bd..bf4f61b 100644 --- a/emacs.spec +++ b/emacs.spec @@ -2,8 +2,8 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 -Version: 23.2 -Release: 18%{?dist} +Version: 23.3 +Release: 1%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -28,13 +28,9 @@ Patch1: rpm-spec-mode.patch Patch3: rpm-spec-mode-utc.patch # Upstream implemented the change in revno. 101105 Patch4: emacs-23.1-xdg.patch -# Accepted by upstream. -Patch5: emacs-23.2-m17ncheck.patch # Fix rhbz#595546 # Upstream: http://emacsbugs.donarmstrong.com/cgi/bugreport.cgi?bug=6158 Patch6: emacs-23.2-hideshow-comment.patch -# Reported upstream http://debbugs.gnu.org/cgi/bugreport.cgi?bug=4129 -Patch7: emacs-23.2-spacing.patch BuildRequires: atk-devel, cairo-devel, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel BuildRequires: libXpm-devel, ncurses-devel, xorg-x11-proto-devel, zlib-devel @@ -149,9 +145,7 @@ packages that add functionality to Emacs. %patch0 -p1 -b .glibc-open-macro %patch4 -p1 -b .xdg -%patch5 -p1 -b .m17ncheck %patch6 -p0 -b .hideshow-comment -%patch7 -p1 -b .spacing # Install site-lisp files cp %SOURCE7 %SOURCE9 %SOURCE10 site-lisp @@ -438,6 +432,9 @@ update-desktop-database &> /dev/null || : %dir %{_datadir}/emacs/site-lisp/site-start.d %changelog +* Thu Mar 10 2011 Karel Klic - 1:23.3-1 +- New upstream release + * Tue Feb 08 2011 Fedora Release Engineering - 1:23.2-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 0af5c91529762e32e10ea4daf31321faad072873 Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Thu, 10 Mar 2011 14:07:17 +0100 Subject: [PATCH 02/10] Added new source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f7f521a..fdbfbe3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ emacs-23.2.tar.bz2 +/emacs-23.3.tar.bz2 diff --git a/sources b/sources index 0f8c363..241a082 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -057a0379f2f6b85fb114d8c723c79ce2 emacs-23.2.tar.bz2 +a673c163b4714362b94ff6096e4d784a emacs-23.3.tar.bz2 From 77da56c5c10d5948903cca27f4702092280707e4 Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Thu, 10 Mar 2011 14:21:22 +0100 Subject: [PATCH 03/10] Depend on util-linux directly, as the package no longer provides setarch --- emacs.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/emacs.spec b/emacs.spec index bf4f61b..09781f7 100644 --- a/emacs.spec +++ b/emacs.spec @@ -43,7 +43,7 @@ BuildRequires: desktop-file-utils # brp-python-bytecompile script BuildRequires: python2-devel python3-devel %ifarch %{ix86} -BuildRequires: setarch +BuildRequires: util-linux %endif Requires: desktop-file-utils Requires: emacs-common = %{epoch}:%{version}-%{release} @@ -434,6 +434,7 @@ update-desktop-database &> /dev/null || : %changelog * Thu Mar 10 2011 Karel Klic - 1:23.3-1 - New upstream release +- Depend on util-linux directly, as the package no longer provides setarch * Tue Feb 08 2011 Fedora Release Engineering - 1:23.2-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From be557ba83882b7b0e510b7c35b14f3bc6cc49316 Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Tue, 15 Mar 2011 18:45:17 +0100 Subject: [PATCH 04/10] fix the handling of alternatives (#684447) --- emacs.spec | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/emacs.spec b/emacs.spec index 09781f7..b563bc4 100644 --- a/emacs.spec +++ b/emacs.spec @@ -3,7 +3,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 23.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -46,6 +46,8 @@ BuildRequires: python2-devel python3-devel BuildRequires: util-linux %endif Requires: desktop-file-utils +Requires(preun): %{_sbindir}/alternatives +Requires(posttrans): %{_sbindir}/alternatives Requires: emacs-common = %{epoch}:%{version}-%{release} Provides: emacs(bin) = %{epoch}:%{version}-%{release} @@ -78,6 +80,8 @@ This package provides an emacs binary with support for X windows. %package nox Summary: GNU Emacs text editor without X support Group: Applications/Editors +Requires(preun): %{_sbindir}/alternatives +Requires(posttrans): %{_sbindir}/alternatives Requires: emacs-common = %{epoch}:%{version}-%{release} Provides: emacs(bin) = %{epoch}:%{version}-%{release} @@ -94,8 +98,8 @@ on a terminal. Summary: Emacs common files Group: Applications/Editors Requires(preun): /sbin/install-info, dev -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives +Requires(preun): %{_sbindir}/alternatives +Requires(posttrans): %{_sbindir}/alternatives Requires(post): /sbin/install-info, dev Requires: %{name}-filesystem @@ -232,8 +236,6 @@ cat > macros.emacs << EOF EOF %install -rm -rf %{buildroot} - cd build-gtk make install INSTALL="%{__install} -p" DESTDIR=%{buildroot} cd .. @@ -331,7 +333,9 @@ touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi -%{_sbindir}/update-alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version} 80 + +%preun +%{_sbindir}/alternatives --remove emacs %{_bindir}/emacs-%{version} %postun update-desktop-database &> /dev/null || : @@ -339,17 +343,15 @@ touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi -if [ $1 -eq 0 ] ; then - %{_sbindir}/update-alternatives --remove emacs %{_bindir}/emacs-%{version} -fi -%post nox -%{_sbindir}/update-alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-nox 70 +%posttrans +%{_sbindir}/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version} 80 -%postun nox -if [ $1 -eq 0 ] ; then - %{_sbindir}/update-alternatives --remove emacs %{_bindir}/emacs-%{version}-nox -fi +%preun nox +%{_sbindir}/alternatives --remove emacs %{_bindir}/emacs-%{version}-nox + +%posttrans nox +%{_sbindir}/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-nox 70 %post common for f in %{info_files}; do @@ -357,7 +359,7 @@ for f in %{info_files}; do done %preun common -alternatives --remove emacs.etags %{_bindir}/etags.emacs || : +%{_sbindir}/alternatives --remove emacs.etags %{_bindir}/etags.emacs if [ "$1" = 0 ]; then for f in %{info_files}; do /sbin/install-info --delete %{_infodir}/$f %{_infodir}/dir 2> /dev/null || : @@ -365,7 +367,7 @@ if [ "$1" = 0 ]; then fi %posttrans common -alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \ +%{_sbindir}/alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \ --slave %{_mandir}/man1/etags.1.gz emacs.etags.man %{_mandir}/man1/etags.emacs.1.gz %post terminal @@ -432,6 +434,10 @@ update-desktop-database &> /dev/null || : %dir %{_datadir}/emacs/site-lisp/site-start.d %changelog +* Tue Mar 15 2011 Karel Klic - 1:23.3-2 +- Another attempt to fix the handling of alternatives (rhbz#684447) +- Removed 'rm -rf %%{buildroot}' from %%install section + * Thu Mar 10 2011 Karel Klic - 1:23.3-1 - New upstream release - Depend on util-linux directly, as the package no longer provides setarch From 06191dca9644882ac18c060f91d6b4061d33b787 Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Tue, 15 Mar 2011 18:58:43 +0100 Subject: [PATCH 05/10] more details about the alternatives change --- emacs.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/emacs.spec b/emacs.spec index b563bc4..f178400 100644 --- a/emacs.spec +++ b/emacs.spec @@ -436,6 +436,9 @@ update-desktop-database &> /dev/null || : %changelog * Tue Mar 15 2011 Karel Klic - 1:23.3-2 - Another attempt to fix the handling of alternatives (rhbz#684447) + The current process loses alternatives preference on every upgrade, + but there seems to be no elegant way how to prevent this while + having versioned binaries (/bin/emacs-%%{version}) at the same time. - Removed 'rm -rf %%{buildroot}' from %%install section * Thu Mar 10 2011 Karel Klic - 1:23.3-1 From b50677584ed3bd47d57fcac63c076c2069b70b1a Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Tue, 15 Mar 2011 20:56:39 +0100 Subject: [PATCH 06/10] Use UTC timestamps in rpm-spec-mode changelog entries by default; Consider *.elc in addition to *.el when loading files from site-start.d --- emacs.spec | 6 +++++- rpm-spec-mode-init.el | 1 + site-start.el | 10 +++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/emacs.spec b/emacs.spec index f178400..f99374e 100644 --- a/emacs.spec +++ b/emacs.spec @@ -3,7 +3,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 23.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -434,6 +434,10 @@ update-desktop-database &> /dev/null || : %dir %{_datadir}/emacs/site-lisp/site-start.d %changelog +* Tue Mar 15 2011 Ville Skyttä - 1:23.3-3 +- Use UTC timestamps in rpm-spec-mode changelog entries by default (rhbz#672350) +- Consider *.elc in addition to *.el when loading files from site-start.d (rhbz#672324) + * Tue Mar 15 2011 Karel Klic - 1:23.3-2 - Another attempt to fix the handling of alternatives (rhbz#684447) The current process loses alternatives preference on every upgrade, diff --git a/rpm-spec-mode-init.el b/rpm-spec-mode-init.el index 48ed0bf..057d3c8 100644 --- a/rpm-spec-mode-init.el +++ b/rpm-spec-mode-init.el @@ -2,3 +2,4 @@ (autoload 'rpm-spec-mode "rpm-spec-mode" "RPM spec mode." t) (add-to-list 'auto-mode-alist '("\\.spec\\(\\.in\\)?$" . rpm-spec-mode)) +(setq-default rpm-change-log-uses-utc t) diff --git a/site-start.el b/site-start.el index 102a442..efbb75b 100644 --- a/site-start.el +++ b/site-start.el @@ -1,5 +1,9 @@ ;;; loaded before user's ".emacs" file and default.el -;; load ".el" files in "/usr/share/emacs/site-lisp/site-start.d/" on startup -(mapc 'load - (directory-files "/usr/share/emacs/site-lisp/site-start.d" t "\\.el\\'")) +;; load *.el and *.elc in /usr/share/emacs/site-lisp/site-start.d on startup +(mapc + 'load + (delete-dups + (mapcar 'file-name-sans-extension + (directory-files + "/usr/share/emacs/site-lisp/site-start.d" t "\\.elc?\\'")))) From 87b1c2347229ea25321639b8e0c20f801599a439 Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Tue, 22 Mar 2011 12:41:13 +0100 Subject: [PATCH 07/10] Rebuild --- emacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/emacs.spec b/emacs.spec index f99374e..85388a1 100644 --- a/emacs.spec +++ b/emacs.spec @@ -3,7 +3,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 23.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -434,6 +434,9 @@ update-desktop-database &> /dev/null || : %dir %{_datadir}/emacs/site-lisp/site-start.d %changelog +* Tue Mar 22 2011 Karel Klic - 1:23.3-4 +- Rebuild to fix an RPM issue (rhbz689182) + * Tue Mar 15 2011 Ville Skyttä - 1:23.3-3 - Use UTC timestamps in rpm-spec-mode changelog entries by default (rhbz#672350) - Consider *.elc in addition to *.el when loading files from site-start.d (rhbz#672324) From 4d43322cc4e5e84cc0462f23514eccea9ef56b10 Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Mon, 23 May 2011 16:25:09 +0200 Subject: [PATCH 08/10] Removed %%dir %%{_libexecdir}/emacs and similar from emacs and emacs-nox packages --- emacs.spec | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/emacs.spec b/emacs.spec index 85388a1..cf9ba0a 100644 --- a/emacs.spec +++ b/emacs.spec @@ -3,7 +3,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 23.3 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -377,12 +377,8 @@ update-desktop-database &> /dev/null || : update-desktop-database &> /dev/null || : %files -%defattr(-,root,root) %{_bindir}/emacs-%{version} %attr(0755,-,-) %ghost %{_bindir}/emacs -%dir %{_libexecdir}/emacs -%dir %{_libexecdir}/emacs/%{version} -%dir %{emacs_libexecdir} %{_datadir}/applications/emacs.desktop %{_datadir}/applications/emacsclient.desktop %{_datadir}/icons/hicolor/*/apps/emacs.png @@ -391,15 +387,10 @@ update-desktop-database &> /dev/null || : %{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document.svg %files nox -%defattr(-,root,root) %{_bindir}/emacs-%{version}-nox %attr(0755,-,-) %ghost %{_bindir}/emacs -%dir %{_libexecdir}/emacs -%dir %{_libexecdir}/emacs/%{version} -%dir %{emacs_libexecdir} %files -f common-filelist common -%defattr(-,root,root) %config(noreplace) %{_sysconfdir}/skel/.emacs %config(noreplace) %{_sysconfdir}/rpm/macros.emacs %doc etc/NEWS BUGS README etc/COPYING @@ -417,23 +408,26 @@ update-desktop-database &> /dev/null || : %attr(0644,root,root) %config %{_datadir}/emacs/site-lisp/site-start.el %files -f el-filelist el -%defattr(-,root,root) %{pkgconfig}/emacs.pc %doc etc/COPYING %dir %{_datadir}/emacs/%{version} %files terminal -%defattr(-,root,root) %{_bindir}/emacs-terminal %{_datadir}/applications/emacs-terminal.desktop %files filesystem -%defattr(-,root,root) %dir %{_datadir}/emacs %dir %{_datadir}/emacs/site-lisp %dir %{_datadir}/emacs/site-lisp/site-start.d %changelog +* Mon May 23 2011 Karel Klíč - 1:23.3-5 +- Removed %%defattr from %%files sections, as RPM no longer needs it +- Removed %%dir %%{_libexecdir}/emacs and similar from emacs and + emacs-nox packages, as the directories are used and present only in + emacs-common (rhbz#704067) + * Tue Mar 22 2011 Karel Klic - 1:23.3-4 - Rebuild to fix an RPM issue (rhbz689182) From 9c6ebc699529e4e198a0958ab07e4a876a3aac89 Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Thu, 26 May 2011 14:49:54 +0200 Subject: [PATCH 09/10] Enumerate binaries in emacs-common to avoid packaging single binary multiple times by accident --- emacs.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/emacs.spec b/emacs.spec index cf9ba0a..141ac2f 100644 --- a/emacs.spec +++ b/emacs.spec @@ -3,7 +3,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 23.3 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -394,9 +394,13 @@ update-desktop-database &> /dev/null || : %config(noreplace) %{_sysconfdir}/skel/.emacs %config(noreplace) %{_sysconfdir}/rpm/macros.emacs %doc etc/NEWS BUGS README etc/COPYING -%exclude %{_bindir}/emacs-* -%{_bindir}/* -%exclude %{_bindir}/emacs +%{_bindir}/b2m +%{_bindir}/ebrowse +%{_bindir}/emacsclient +%{_bindir}/etags.emacs +%{_bindir}/gctags +%{_bindir}/grep-changelog +%{_bindir}/rcs-checkin %{_mandir}/*/* %{_infodir}/* %dir %{_datadir}/emacs/%{version} @@ -422,6 +426,10 @@ update-desktop-database &> /dev/null || : %dir %{_datadir}/emacs/site-lisp/site-start.d %changelog +* Thu May 26 2011 Karel Klíč - 1:23.3-6 +- Enumerate binaries in emacs-common to avoid packaging single binary + multiple times by accident + * Mon May 23 2011 Karel Klíč - 1:23.3-5 - Removed %%defattr from %%files sections, as RPM no longer needs it - Removed %%dir %%{_libexecdir}/emacs and similar from emacs and From 0f6ddf4817445cce45ca01e9ed4d1f21a8f397d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 30 Jun 2011 00:03:59 +0300 Subject: [PATCH 10/10] Use custom-set-variables for customizable variables in .emacs (#716440). Move frame-title-format default from .emacs to default.el (#716443). --- default.el | 2 ++ dotemacs.el | 19 +++++++------------ emacs.spec | 6 +++++- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/default.el b/default.el index 1d0df43..b6a7591 100644 --- a/default.el +++ b/default.el @@ -4,3 +4,5 @@ ;;; prevents loading of this file. Also the "-q" option to emacs ;;; prevents both "~/.emacs" and this file from being loaded at startup. +;; default to better frame titles +(setq-default frame-title-format (concat "%b - emacs@" (system-name))) diff --git a/dotemacs.el b/dotemacs.el index daa7462..e1bee17 100644 --- a/dotemacs.el +++ b/dotemacs.el @@ -1,17 +1,12 @@ ;; .emacs -;;; uncomment this line to disable loading of "default.el" at startup -;; (setq inhibit-default-init t) - -;; default to better frame titles -(setq frame-title-format - (concat "%b - emacs@" (system-name))) - -;; default to unified diffs -(setq diff-switches "-u") - -;; always end a file with a newline -;(setq require-final-newline 'query) +(custom-set-variables + ;; uncomment to always end a file with a newline + ;'(require-final-newline t) + ;; uncomment to disable loading of "default.el" at startup + ;'(inhibit-default-init t) + ;; default to unified diffs + '(diff-switches "-u")) ;;; uncomment for CJK utf-8 support for non-Asian users ;; (require 'un-define) diff --git a/emacs.spec b/emacs.spec index 141ac2f..6ebb11d 100644 --- a/emacs.spec +++ b/emacs.spec @@ -3,7 +3,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 23.3 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -426,6 +426,10 @@ update-desktop-database &> /dev/null || : %dir %{_datadir}/emacs/site-lisp/site-start.d %changelog +* Thu Jun 30 2011 Ville Skyttä - 1:23.3-7 +- Use custom-set-variables for customizable variables in .emacs (#716440). +- Move frame-title-format default from .emacs to default.el (#716443). + * Thu May 26 2011 Karel Klíč - 1:23.3-6 - Enumerate binaries in emacs-common to avoid packaging single binary multiple times by accident