# HG changeset patch # User Dominique Corbex # Date 1250932556 -7200 # Node ID 4cf5da7c32ac17b9b19e09fcbda1672a7fcd97b5 # Parent 6aae08641f1eb2aa8de48b3c155ef50ba02de88f emacs 23.1: small adjustments diff -r 6aae08641f1e -r 4cf5da7c32ac emacs-pkg-lua-mode/receipt --- a/emacs-pkg-lua-mode/receipt Fri Aug 21 21:49:57 2009 +0200 +++ b/emacs-pkg-lua-mode/receipt Sat Aug 22 11:15:56 2009 +0200 @@ -32,3 +32,13 @@ cp stuff/*.el $fs/usr/share/emacs/site-lisp/site-start.d status } + +post_install() +{ + tazpkg reconfigure emacs +} + +post_remove() +{ + tazpkg reconfigure emacs +} diff -r 6aae08641f1e -r 4cf5da7c32ac emacs-pkg-lua-mode/stuff/90-lua-mode.el --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/emacs-pkg-lua-mode/stuff/90-lua-mode.el Sat Aug 22 11:15:56 2009 +0200 @@ -0,0 +1,18 @@ +;; lua-mode start file for SliTaz +;; Last update: 2009-08-22 +;; +;; To set up Emacs to automatically edit files ending in .lua using Lua-mode + +(setq auto-mode-alist (cons '("\\.lua$" . lua-mode) auto-mode-alist)) +(autoload 'lua-mode "lua-mode" "Lua editing mode." t) + +;; If you want colorization, turn on global-font-lock or add this: + +(add-hook 'lua-mode-hook 'turn-on-font-lock) + +;; If you want to use hideshow, turn on hs-minor-mode or add this: + +(add-hook 'lua-mode-hook 'hs-minor-mode) + +;; + diff -r 6aae08641f1e -r 4cf5da7c32ac emacs-pkg-lua-mode/stuff/lua-mode-start.el --- a/emacs-pkg-lua-mode/stuff/lua-mode-start.el Fri Aug 21 21:49:57 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -;; lua-mode start file for SliTaz -;; -;; (C) GNU gpl v3 - SliTaz GNU/Linux 2009. -;; -;; To set up Emacs to automatically edit files ending in .lua using Lua-mode - -(setq auto-mode-alist (cons '("\\.lua$" . lua-mode) auto-mode-alist)) -(autoload 'lua-mode "lua-mode" "Lua editing mode." t) - -;; If you want colorization, turn on global-font-lock or add this: - -(add-hook 'lua-mode-hook 'turn-on-font-lock) - -;; If you want to use hideshow, turn on hs-minor-mode or add this: - -(add-hook 'lua-mode-hook 'hs-minor-mode) diff -r 6aae08641f1e -r 4cf5da7c32ac emacs/receipt --- a/emacs/receipt Fri Aug 21 21:49:57 2009 +0200 +++ b/emacs/receipt Sat Aug 22 11:15:56 2009 +0200 @@ -1,7 +1,5 @@ # SliTaz package receipt. -PACKED_SIZE="16.0M" -UNPACKED_SIZE="57.6M" PACKAGE="emacs" VERSION="23.1" CATEGORY="development" @@ -112,7 +110,7 @@ XPM_DIR=" images images/custom images/ezimage images/gnus images/gud images/mail images/smilies \ images/smilies/grayscale images/smilies/medium images/tree-widget/default images/tree-widget/folder" for dir in $XPM_DIR; do - echo -n "Copying $dir files" + echo -n "Copying $dir xpm files" mkdir -p $fs/usr/share/$PACKAGE/$VERSION/etc/$dir && \ cp $_pkg/usr/share/$PACKAGE/$VERSION/etc/$dir/*.xpm $fs/usr/share/$PACKAGE/$VERSION/etc/$dir && \ for file in COPYING README TODO; do @@ -122,6 +120,12 @@ done status done + PNG_DIR=" images images/gnus images/tree-widget/default images/tree-widget/folder" + for dir in $PNG_DIR; do + echo -n "Copying $dir png files" + cp $_pkg/usr/share/$PACKAGE/$VERSION/etc/$dir/*.png $fs/usr/share/$PACKAGE/$VERSION/etc/$dir && \ + status + done # Licence GNU_FILES="AUTHORS BABYL CENSORSHIP COPYING DISTRIB FTP GNU ORDERS SERVICE copying.paper" echo -n "Copying License files" @@ -133,7 +137,8 @@ echo -n "Installing specific SliTaz file" mkdir -p $fs/usr/share/$PACKAGE/site-lisp/site-start.d && \ cp -a $_pkg/usr/share/$PACKAGE/site-lisp $fs/usr/share/$PACKAGE && \ - cp -a stuff/slitaz.el $fs/usr/share/$PACKAGE/site-lisp/site-start.d && \ + cp -a stuff/default.el $fs/usr/share/$PACKAGE/site-lisp && \ + cp -a stuff/90-slitaz.el $fs/usr/share/$PACKAGE/site-lisp/site-start.d status # Install desktop files for emacs echo -n "Installing emacs menu" @@ -152,6 +157,25 @@ ln -s ../site-lisp site-lisp } +post_install() +{ + cd /usr/share/emacs/site-lisp + cat <<-EOF >site-start.el + ;; site-start.el for SliTaz -*- no-byte-compile: t -*- + ;; + ;; (C) GNU gpl v3 - SliTaz GNU/Linux 2009. + ;; + ;; This default site startup file for Emacs was created by tazpkg + ;; reconfigure emacs. You may modify this file, replace it by your + ;; own site initialisation, or even remove it completely. + ;; + EOF + START_FILES=`ls site-start.d/ | sort` + for file in $START_FILES; do + cat site-start.d/$file >> site-start.el + done +} + post_remove() { rm -rf /usr/share/emacs diff -r 6aae08641f1e -r 4cf5da7c32ac emacs/stuff/90-slitaz.el --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/emacs/stuff/90-slitaz.el Sat Aug 22 11:15:56 2009 +0200 @@ -0,0 +1,9 @@ +;; SliTaz start mode for emacs +;; Last update: 2009-08-22 +;; +;; Set font size to fit a 1024x768 screen + +(set-default-font "-*-*-*-*-*--12-*-*-*-*-*-*-*") + +;; + diff -r 6aae08641f1e -r 4cf5da7c32ac emacs/stuff/default.el --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/emacs/stuff/default.el Sat Aug 22 11:15:56 2009 +0200 @@ -0,0 +1,59 @@ +;; Emacs default file for SliTaz +;; (C) GNU gpl v3 - SliTaz GNU/Linux 2009 +;; Last update: 2009-08-22 +;; +;; Add support for SliTaz receipt files +;; force emacs in shell-script-mode +(setq auto-mode-alist (cons '("receipt" . shell-script-mode) auto-mode-alist)) + +;; Force emacs to use tabs +;; from Scott Hurring's HOWTO +;; turn on tabs +(setq indent-tabs-mode t) +(setq-default indent-tabs-mode t) + +;; bind the TAB key +(global-set-key (kbd "TAB") 'self-insert-command) + +;; set the tab width +(setq default-tab-width 4) +(setq tab-width 4) +(setq c-basic-indent 4) + + +;; Following lines has been grabbed from dot emacs file for Maemo (nokia tablets): +;; christof sietchtabr at gmail +;; +;; the dired, list-directory, and gzip fixes all come from the +;; packager of the emacs deb and responses from other maemo community members +;; http://danielsz.freeshell.org/code/mine/emacs-for-maemo/index.shtml +;; +;; make dired work +;; --dired option is not supported on busybox ls command +(setq dired-use-ls-dired nil) + +;; make list-directory work +;; -F not supported by busybox ls command +(setq list-directory-brief-switches "-C") + + +;; we *REALLY* don't want to spew file backups all over the fs. +;; code to place all backups in one location +(when (not (file-directory-p "~/.backup")) + (make-directory "~/.backup")) +(if (file-directory-p "~/.backup") + (setq backup-directory-alist '(("." . "~/.backup")))) + +;; custom variable setting to make info work using busybox gzip + +(custom-set-variables + ;; custom-set-variables was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(jka-compr-compression-info-list (quote (["\\.Z\\(~\\|\\.~[0-9]+~\\)?\\'" "compressing" "compress" ("-c") "u\ +ncompressing" "uncompress" ("-c") nil t "^_\x9d"] ["\\.bz2\\(~\\|\\.~[0-9]+~\\)?\\'" "bzip2ing" "bzip2" nil "b\ +unzip2ing" "bzip2" ("-d") nil t "BZh"] ["\\.tbz\\'" "bzip2ing" "bzip2" nil "bunzip2ing" "bzip2" ("-d") nil nil\ + "BZh"] ["\\.tgz\\'" "compressing" "gzip" ("-c") "uncompressing" "gzip" ("-c" "-q" "-d") t nil "^_\x8b"] ["\\.\ +g?z\\(~\\|\\.~[0-9]+~\\)?\\'" "compressing" "gzip" ("-c") "uncompressing" "gzip" ("-c" "-d") t t "^_\x8b"] ["\\ +\.dz\\'" nil nil nil "uncompressing" "gzip" ("-c" "-d") nil t "^_\x8b"])))) diff -r 6aae08641f1e -r 4cf5da7c32ac emacs/stuff/slitaz.el --- a/emacs/stuff/slitaz.el Fri Aug 21 21:49:57 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ -;; SilTaz Emacs site file -;; -;; Last update: 2009-08-15 -;; -;; Add support for SliTaz receipt files -;; force emacs in shell-script-mode -(setq auto-mode-alist (cons '("receipt" . shell-script-mode) auto-mode-alist)) - -;; Force emacs to use tabs -;; from Scott Hurring's HOWTO -;; turn on tabs -(setq indent-tabs-mode t) -(setq-default indent-tabs-mode t) - -;; bind the TAB key -(global-set-key (kbd "TAB") 'self-insert-command) - -;; set the tab width -(setq default-tab-width 4) -(setq tab-width 4) -(setq c-basic-indent 4) - - -;; Following lines has been grabbed from dot emacs file for Maemo (nokia tablets): -;; christof sietchtabr at gmail -;; -;; the dired, list-directory, and gzip fixes all come from the -;; packager of the emacs deb and responses from other maemo community members -;; http://danielsz.freeshell.org/code/mine/emacs-for-maemo/index.shtml -;; -;; make dired work -;; --dired option is not supported on busybox ls command -(setq dired-use-ls-dired nil) - -;; make list-directory work -;; -F not supported by busybox ls command -(setq list-directory-brief-switches "-C") - - -;; we *REALLY* don't want to spew file backups all over the fs. -;; code to place all backups in one location -(when (not (file-directory-p "~/.backup")) - (make-directory "~/.backup")) -(if (file-directory-p "~/.backup") - (setq backup-directory-alist '(("." . "~/.backup")))) - -;; custom variable setting to make info work using busybox gzip - -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(jka-compr-compression-info-list (quote (["\\.Z\\(~\\|\\.~[0-9]+~\\)?\\'" "compressing" "compress" ("-c") "u\ -ncompressing" "uncompress" ("-c") nil t "^_\x9d"] ["\\.bz2\\(~\\|\\.~[0-9]+~\\)?\\'" "bzip2ing" "bzip2" nil "b\ -unzip2ing" "bzip2" ("-d") nil t "BZh"] ["\\.tbz\\'" "bzip2ing" "bzip2" nil "bunzip2ing" "bzip2" ("-d") nil nil\ - "BZh"] ["\\.tgz\\'" "compressing" "gzip" ("-c") "uncompressing" "gzip" ("-c" "-q" "-d") t nil "^_\x8b"] ["\\.\ -g?z\\(~\\|\\.~[0-9]+~\\)?\\'" "compressing" "gzip" ("-c") "uncompressing" "gzip" ("-c" "-d") t t "^_\x8b"] ["\\ -\.dz\\'" nil nil nil "uncompressing" "gzip" ("-c" "-d") nil t "^_\x8b"]))))