OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/emacs?expand=0&rev=32

dot.gnu-emacs

@@ -21,6 +21,12 @@
 ;;; Author: Werner Fink, <werner@suse.de> 1993-2001
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
+;; No splash screen at all
+;; -----------------------
+(if (and (file-exists-p "~/.inhibit-splash-screen")
+	 (boundp 'inhibit-splash-screen))
+  (setq-default inhibit-splash-screen t))
+;;
 ;; Debuging only
 ;; -------------
 ;  (open-dribble-file "~/.dribble")
@@ -131,8 +137,10 @@
 ;; ----------------------
   (setq default-major-mode 'text-mode)
   (line-number-mode 1)
+  (global-set-key "\e\?" 'goto-line)
   (column-number-mode 1)
   (setq-default inhibit-eol-conversion t)
+  (setq-default require-final-newline "ask")
 ;;
 ;; Specials for X Window System
 ;; -------------------------
@@ -307,10 +315,10 @@
 ;;
 ;; Common to all C modes
 ;; ---------------------
-(add-hook 'c-mode-common-hook
+;(add-hook 'c-mode-common-hook
-   '(lambda () (c-set-style "linux")
+;   '(lambda () (c-set-style "linux")
-	(c-set-offset 'case-label 4)
+;	(c-set-offset 'case-label 4)
-	(setq c-basic-offset 4)))
+;	(setq c-basic-offset 4)))
 
 ;;
 ;; Auto fill mode
@@ -325,18 +333,25 @@
 ;;
 ;; AUC-TeX
 ;; ----------------------------
-(if  (local-variable-p 'TeX-master)
+(if (or (local-variable-p 'TeX-master)
+	(boundp 'AUCTeX-version))
  (progn
-  (setq-default TeX-master nil)
+  (if  (local-variable-p 'TeX-master)
-  ; Users private libaries 
+    (setq-default TeX-master nil))
+; ; Users private libaries 
+; (if (boundp 'AUCTeX-version)
+;   (progn
 ;     (setq TeX-macro-private '("~/lib/tex-lib/"))
 ;     (setq TeX-style-private   "~/lib/site-lisp/auctex/style/")   ; AUC-TeX-Macros
-; (setq TeX-auto-private    "~/lib/site-lisp/auctex/auto/")    ; Autom. Auc-TeX-Macros
+;     (setq TeX-auto-private    "~/lib/site-lisp/auctex/auto/"))   ; Autom. Auc-TeX-Macros
   (if (and window-system (featurep 'font-lock))
       (progn
 	(add-hook 'latex-mode-hook 'turn-on-font-lock)
+	(if (boundp 'AUCTeX-version)
+	  (progn
 	    (add-hook 'LaTeX-mode-hook 'turn-on-font-lock)
-	(add-hook 'after-init-hook '(lambda () (load "auctex/font-latex" nil t)))))
+	    (add-hook 'LaTeX-mode-hook 'LaTeX-math-mode)
+	    (add-hook 'after-init-hook '(lambda () (load "auctex/font-latex" nil t)))))))
 ))
 
 ;;
@@ -417,19 +432,61 @@
 ;;
   (if (and (= emacs-major-version 19) (= emacs-minor-version 29))
     (define-key key-translation-map [f1] nil)) ; 19.29+
-;;(global-set-key [f1]    'find-file)    ; `Help'
+  (global-set-key [S-f1]  'find-file)
+  (global-set-key [M-f1]  'find-file)
   (global-set-key [f1]    'help-for-help)    ; `Help'
   (global-set-key [pause] 'toggle-read-only) ; `HoldScreen'
 ;;
-  (global-set-key [f2]  'split-window)
+  (if (global-key-binding [f2])
-  (global-set-key [f3]  'isearch-forward)
+    (progn
-  (global-set-key [f4]  'query-replace-regexp)
+      (global-set-key [S-f2]  'split-window)
-  (global-set-key [f5]  'save-buffer)
+      (global-set-key [M-f2]  'split-window))
-  (global-set-key [f6]  'find-file)
+    (global-set-key [f2]  'split-window))
-  (global-set-key [f7]  'buffer-menu)
+  (if (global-key-binding [f2])
-  (global-set-key [f8]  'repeat-complex-command)
+    (progn
-  (global-set-key [f9]  'execute-extended-command)
+      (global-set-key [S-f2]  'split-window)
-  (global-set-key [f10] 'eval-expression)
+      (global-set-key [M-f2]  'split-window))
+    (global-set-key [f2]  'split-window))
+  (if (global-key-binding [f3])
+    (progn
+      (global-set-key [S-f3]  'isearch-forward)
+      (global-set-key [M-f3]  'isearch-forward))
+    (global-set-key [f3]  'isearch-forward))
+  (if (global-key-binding [f4])
+    (progn
+      (global-set-key [S-f4]  'query-replace-regexp)
+      (global-set-key [M-f4]  'query-replace-regexp))
+    (global-set-key [f4]  'query-replace-regexp))
+  (if (global-key-binding [f5])
+    (progn
+      (global-set-key [S-f5]  'save-buffer)
+      (global-set-key [M-f5]  'save-buffer))
+    (global-set-key [f5]  'save-buffer))
+  (if (global-key-binding [f6])
+    (progn
+      (global-set-key [S-f6]  'find-file)
+      (global-set-key [M-f6]  'find-file))
+    (global-set-key [f6]  'find-file))
+  (if (global-key-binding [f7])
+    (progn
+      (global-set-key [S-f7]  'buffer-menu)
+      (global-set-key [M-f7]  'buffer-menu))
+    (global-set-key [f7]  'buffer-menu))
+  (if (global-key-binding [f8])
+    (progn
+      (global-set-key [S-f8]  'repeat-complex-command)
+      (global-set-key [M-f8]  'repeat-complex-command))
+    (global-set-key [f8]  'repeat-complex-command))
+  (if (global-key-binding [f9])
+    (progn
+      (global-set-key [S-f9]  'execute-extended-command)
+      (global-set-key [M-f9]  'execute-extended-command))
+    (global-set-key [f9]  'execute-extended-command))
+  (if (global-key-binding [f10])
+    (progn
+      (global-set-key [S-f10] 'eval-expression)
+      (global-set-key [M-f10] 'eval-expression))
+    (global-set-key [f10] 'eval-expression))
 ;;
 ;;(global-set-key [f11] [?\e]) ; Escape
   (global-set-key [f11] esc-map) ; Escape

emacs.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct 29 12:10:41 CET 2008 - werner@suse.de
+
+- Do not overwrite common emacs settings (bnc#438601)
+
 -------------------------------------------------------------------
 Fri Oct 17 14:39:25 CEST 2008 - werner@suse.de
 

emacs.spec

@@ -24,7 +24,7 @@ Url:            http://www.gnu.org/software/emacs/
 License:        GPL v2 or later
 Group:          Productivity/Editors/Emacs
 Version:        22.3
-Release:        3
+Release:        4
 Obsoletes:      ge_exec ge_site emac_nox emacmisc emacsbin emacsger emacs-url Mule-UCS emacs-calc erc
 Requires:       emacs-info = %{version}
 Requires:       emacs_program = %{version}-%{release}
@@ -3296,6 +3296,8 @@ done
 /usr/share/emacs/%{version}/lisp/xt-mouse.el.gz
 
 %changelog
+* Wed Oct 29 2008 werner@suse.de
+- Do not overwrite common emacs settings (bnc#438601)
 * Fri Oct 17 2008 werner@suse.de
 - Enforce the correct binary version
 * Wed Oct 01 2008 ro@suse.de
@@ -3541,7 +3543,7 @@ done
   terminal-coding-system again.
 * Thu Apr 24 2003 ro@suse.de
 - fix install_info --delete call and move from preun to postun
-* Tue Mar 04 2003 schwab@suse.de
+* Mon Mar 03 2003 schwab@suse.de
 - Use %%install_info.
 * Thu Feb 27 2003 werner@suse.de
 - Encodings: do it the same as for xemacs
@@ -3556,7 +3558,7 @@ done
 - Make fill-column in ~/.gnu-emacs work for emacs 21.x
 * Wed Nov 20 2002 schwab@suse.de
 - Add AC_CONFIG_LIBOBJ_DIR.
-* Sun Oct 20 2002 schwab@suse.de
+* Sat Oct 19 2002 schwab@suse.de
 - Use BuildRoot and make it build non-privileged.
 - Use predefined targets in lisp/Makefile.
 * Thu Oct 17 2002 werner@suse.de
@@ -3567,7 +3569,7 @@ done
 - Remove obsolete site-lisp files.
 * Wed Sep 11 2002 kukuk@suse.de
 - Provide splitaliasing for updating from old ge_exec
-* Wed Sep 11 2002 adrian@suse.de
+* Tue Sep 10 2002 adrian@suse.de
 - remove obsoleting of itself
 * Sat Aug 17 2002 schwab@suse.de
 - Ported to PPC64.
@@ -3677,11 +3679,11 @@ done
 * Sat Jan 20 2001 violiet@suse.de
 - changed bdf printing patch to patch also loaddefs.el, because
   the default for the bdf-directory list comes from loaddefs.el
-* Sat Jan 20 2001 violiet@suse.de
+* Fri Jan 19 2001 violiet@suse.de
 - improved ps-mule.el (use gulim font for Korean bdf printing)
 * Wed Jan 17 2001 mfabian@suse.de
 - some further tuning of app-defaults
-* Wed Jan 17 2001 mfabian@suse.de
+* Tue Jan 16 2001 mfabian@suse.de
 - added patches for dired.el:
   M-x set-language-environment RET Japanese RET M-x dired
   and
@@ -3731,7 +3733,7 @@ done
 - don't build etags and ctags, it's not in the filelist
 	- rename gctags to gnuctags (has no efect)
 	- in lib-src: use regex and getopt from glibc
-* Thu Jan 20 2000 werner@suse.de
+* Wed Jan 19 2000 werner@suse.de
 - The system is ${RPM_ARCH}-suse-linux even for sparc ;^)
 	- /usr/man -> /usr/share/man
 	- /usr/info -> /usr/share/info
@@ -3753,7 +3755,7 @@ done
 - fixed neededforbuild
 * Mon Sep 27 1999 bs@suse.de
 - fixed requirements for sub packages
-* Sat Sep 25 1999 werner@suse.de
+* Fri Sep 24 1999 werner@suse.de
 - Add new and forgotten dif
 * Fri Sep 24 1999 werner@suse.de
 - Merging BETA and STABLE package
@@ -3828,11 +3830,11 @@ done
 - Add a changed ispell.el for new ispell dictionaries
   ... make sure that menu bar is rebuild.
 	- Add missing setsid in callproc.c
-* Tue Nov 11 1997 werner@suse.de
+* Mon Nov 10 1997 werner@suse.de
 - ready for autobuild
 * Mon Jun 02 1997 bs@suse.de
 - removed usr/bin/ctags & usr/man/man1/ctags.1.gz (included in package ctags)
-* Sun May 25 1997 werner@suse.de
+* Sat May 24 1997 werner@suse.de
 - some changes in keycode under TERM=xterm (term/xterm.el)
 	- fix system-type: `rms' uses gnu/linux :-((
   now dired-chown.program should work again.