rpms/xemacs/devel default.el, 1.1, 1.2 dotxemacs-init.el, 1.1, 1.2 xemacs-sitestart.el, 1.7, 1.8 xemacs.desktop, 1.3, 1.4 xemacs.spec, 1.37, 1.38

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32718

Modified Files:
	default.el dotxemacs-init.el xemacs-sitestart.el 
	xemacs.desktop xemacs.spec 
Log Message:
* Sat Jun 30 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.28-4
- Turn on syntax highlighting with lazy-lock by default.
- Drop Application and X-Fedora categories and Encoding from desktop entry.
- Move diff-switches default from skeleton init.el to site-start.el.



Index: default.el
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/default.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default.el	1 Mar 2005 22:11:36 -0000	1.1
+++ default.el	30 Jun 2007 11:06:10 -0000	1.2
@@ -1,11 +1,11 @@
 ;;; default.el - loaded at startup after "~/.xemacs/init.el" by default
 ;;;
-;;; Setting `inhibit-default-init' non-nil in "~/.xemacs/init.el"
+;;; Setting `inhibit-default-init' to non-nil in "~/.xemacs/init.el"
 ;;; prevents loading of this file.  The "-q" option to xemacs
 ;;; prevents "~/.xemacs/init.el" *and* this file from being loaded
 ;;; at startup.
 
-;; enable wheelmouse support by default
+;; enable wheel mouse support by default
 (when window-system
   (mwheel-install))
 
@@ -14,3 +14,15 @@
 
 ;; use terminfo by default
 (defvar system-uses-terminfo t)
+
+;; turn on syntax highlighting by default
+(require 'font-lock)
+(when (fboundp 'turn-on-lazy-lock)
+  ;; use lazy-lock by default if lazy-shot is not enabled
+  (remove-hook 'font-lock-mode-hook 'turn-on-lazy-lock)
+  (add-hook 'font-lock-mode-hook
+            (function
+             (lambda ()
+               (unless (and (boundp 'lazy-shot-mode) lazy-shot-mode)
+                 (turn-on-lazy-lock))))
+            t))


Index: dotxemacs-init.el
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/dotxemacs-init.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dotxemacs-init.el	1 Mar 2005 22:11:36 -0000	1.1
+++ dotxemacs-init.el	30 Jun 2007 11:06:10 -0000	1.2
@@ -1,7 +1,4 @@
-;;; .xemacs/init.el
+;;; ~/.xemacs/init.el
 
 ;;; uncomment this line to disable loading of "default.el" at startup
-;; (setq inhibit-default-init t)
-
-;; default to unified diffs
-(setq diff-switches "-u")
+;(setq inhibit-default-init t)


Index: xemacs-sitestart.el
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs-sitestart.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xemacs-sitestart.el	24 Jan 2007 16:50:04 -0000	1.7
+++ xemacs-sitestart.el	30 Jun 2007 11:06:10 -0000	1.8
@@ -14,6 +14,12 @@
 ;; default to non-kerberos ftp
 (setq efs-ftp-program-name "/usr/bin/ftp")
 
+;; default to unified diffs
+(setq-default diff-switches "-u")
+
+;; decrease lazy-lock default threshold
+(setq-default lazy-lock-minimum-size (* 2 1024))
+
 ;; load .el files in "site-start.d/"
 (let ((files (directory-files
               "/usr/share/xemacs/site-packages/lisp/site-start.d" t "\\.el$")))


Index: xemacs.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xemacs.desktop	23 Apr 2006 18:05:29 -0000	1.3
+++ xemacs.desktop	30 Jun 2007 11:06:10 -0000	1.4
@@ -29,6 +29,5 @@
 Icon=xemacs
 Type=Application
 Terminal=false
-Categories=Application;Development;TextEditor;
-Encoding=UTF-8
+Categories=Development;TextEditor;
 StartupWMClass=XEmacs


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xemacs.spec	24 Jun 2007 09:54:09 -0000	1.37
+++ xemacs.spec	30 Jun 2007 11:06:10 -0000	1.38
@@ -20,7 +20,7 @@
 
 Name:           xemacs
 Version:        21.5.28
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -350,11 +350,8 @@
 rm -f $RPM_BUILD_ROOT%{_infodir}/termcap*
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
-desktop-file-install \
-    --vendor=fedora \
-    --mode=644 \
+desktop-file-install --vendor=fedora --mode=644 \
     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-    --add-category=X-Fedora \
     %{SOURCE2}
 
 # lockdir
@@ -532,6 +529,11 @@
 
 
 %changelog
+* Sat Jun 30 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.28-4
+- Turn on syntax highlighting with lazy-lock by default.
+- Drop Application and X-Fedora categories and Encoding from desktop entry.
+- Move diff-switches default from skeleton init.el to site-start.el.
+
 * Sun Jun 24 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.28-3
 - Apply upstream fix for #245017.