[emacs] Use custom-set-variables for customizable variables in .emacs (#716440). Move frame-title-format def
Ville Skyttä
scop at fedoraproject.org
Wed Jun 29 21:04:15 UTC 2011
commit 0f6ddf4817445cce45ca01e9ed4d1f21a8f397d9
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Thu Jun 30 00:03:59 2011 +0300
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ä <ville.skytta at iki.fi> - 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íč <kklic at redhat.com> - 1:23.3-6
- Enumerate binaries in emacs-common to avoid packaging single binary
multiple times by accident
More information about the scm-commits
mailing list