From 883764ae9a6cd2f690c00434ad668f8ab2d24c00 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Oct 15 2004 03:02:08 +0000 Subject: - do not setup frame-title-format in default.el, since it will override setting by users (Henrik Bakken, 134520) - emacs-el no longer requires emacs for -nox users (Lars Hupfeldt Nielsen, 134479) - condition calling global-font-lock-mode in default .emacs in case xemacs loads it --- diff --git a/default.el b/default.el index 7ee7281..1e87f10 100644 --- a/default.el +++ b/default.el @@ -11,9 +11,6 @@ ;; enable wheelmouse support by default (mwheel-install) ;; make switching frames works properly under the default click-to-focus - (setq focus-follows-mouse nil) - ;; default to better frame titles - (setq frame-title-format - (concat "%b - emacs@" system-name))) + (setq focus-follows-mouse nil)) (auto-compression-mode t) diff --git a/dotemacs.el b/dotemacs.el index 9180e94..ade6d41 100644 --- a/dotemacs.el +++ b/dotemacs.el @@ -4,7 +4,12 @@ ;; (setq inhibit-default-init t) ;; turn on font-lock mode -(global-font-lock-mode t) +(when (fboundp 'global-font-lock-mode) + (global-font-lock-mode t)) ;; enable visual feedback on selections ;(setq transient-mark-mode t) + +;; default to better frame titles +(setq frame-title-format + (concat "%b - emacs@" system-name)) diff --git a/emacs.spec b/emacs.spec index 7d82315..53a26dc 100644 --- a/emacs.spec +++ b/emacs.spec @@ -5,7 +5,7 @@ Summary: GNU Emacs text editor Name: emacs Version: 21.3 -Release: 15 +Release: 16 License: GPL URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -97,7 +97,6 @@ This package contains all the common files needed by emacs or emacs-nox. %package el Summary: Emacs Lisp source files included with Emacs. Group: Applications/Editors -Requires: emacs = %{version} %description el Emacs-el contains the emacs-elisp sources for many of the elisp @@ -330,6 +329,14 @@ fi %defattr(-,root,root) %changelog +* Fri Oct 15 2004 Jens Petersen - 21.3-16 +- do not setup frame-title-format in default.el, since it will override + setting by users (Henrik Bakken, 134520) +- emacs-el no longer requires emacs for the sake of -nox users + (Lars Hupfeldt Nielsen, 134479) +- condition calling of global-font-lock-mode in default .emacs + in case xemacs should happen to load it + * Wed Sep 29 2004 Jens Petersen - 21.3-15 - cleanup and update .desktop file - make emacs not appear in the desktop menu (Seth Nickell,132567)