Mercurial Commits
add picture support for bbdb 3.0
File modified: emacs/bbdb/Makefile emacs/bbdb/bbdb-picture.el emacs/bbdb/bbdb.el emacs/bbdb/copy-from-git.sh
Change929 at Thu Nov 10 15:25:23 2011 +0100 by Ivan Kanis <ivan@tao>
diff -r 74fad258843d -r 747e07b6906c emacs/bbdb/copy-from-git.sh
--- a/emacs/bbdb/copy-from-git.sh Thu Nov 10 13:55:14 2011 +0100
+++ b/emacs/bbdb/copy-from-git.sh Thu Nov 10 15:25:23 2011 +0100
@@ -1,16 +1,23 @@
#!/bin/sh
-for file in \
- bbdb-anniv.el \
- bbdb-com.el \
- bbdb.el \
- bbdb-gnus.el \
- bbdb-message.el \
- bbdb-migrate.el \
- bbdb-mua.el \
- bbdb-print.el \
- bbdb-rmail.el ; do
- cp ~/src/bbdb/lisp/${file} .
+file="
+bbdb-anniv.el
+bbdb-com.el
+bbdb.el
+bbdb-gnus.el
+bbdb-message.el
+bbdb-migrate.el
+bbdb-mua.el
+bbdb-print.el
+bbdb-picture.el
+bbdb-rmail.el"
+
+for f in ${file} ; do
+ if test $0 = --from ; then
+ cp ~/src/bbdb/lisp/${f} .
+ else
+ cp ${f} ~/src/bbdb/lisp
+ fi
done
grepk kills with signal 9
File modified: bin/grepk.sh
Change928 at Thu Nov 10 13:55:14 2011 +0100 by Ivan Kanis <ivan@tao>
diff -r f68c27feea68 -r 74fad258843d bin/grepk.sh
--- a/bin/grepk.sh Thu Nov 10 13:54:08 2011 +0100
+++ b/bin/grepk.sh Thu Nov 10 13:55:14 2011 +0100
@@ -14,7 +14,7 @@
read grepk_answer
if test -z "${grepk_answer}" ; then
for grepk_pid in `printf "${grepk_list}" | awk '{print $1}'` ; do
- kill ${grepk_pid}
+ kill -9 ${grepk_pid}
done
fi
run autogen, extraclean and bootstrap
File modified: bin/bootstrap-emacs.sh
Change927 at Thu Nov 10 13:54:08 2011 +0100 by Ivan Kanis <ivan@tao>
diff -r 189d51ab7f76 -r f68c27feea68 bin/bootstrap-emacs.sh
--- a/bin/bootstrap-emacs.sh Tue Nov 08 20:04:41 2011 +0100
+++ b/bin/bootstrap-emacs.sh Thu Nov 10 13:54:08 2011 +0100
@@ -9,14 +9,16 @@
fn_cd ${HOME}/src/emacs-bzr/trunk
-#make extraclean
-#fn_chacke "Clean failed"
+make extraclean
+fn_check "Clean failed"
+
+./autogen.sh
+fn_check "Auto generate failed"
./configure --prefix=${be_path}
fn_check "Configure failed"
-#make bootstrap
-make
+make bootstrap
fn_check "Boostrap failed"
if test -d ${be_path} ; then
fix compilation error
File modified: emacs/init/ivan-elim.el
Change926 at Tue Nov 08 20:04:41 2011 +0100 by Ivan Kanis <ivan@tao>
diff -r 4adecc3aa809 -r 189d51ab7f76 emacs/init/ivan-elim.el
--- a/emacs/init/ivan-elim.el Tue Nov 08 20:03:47 2011 +0100
+++ b/emacs/init/ivan-elim.el Tue Nov 08 20:04:41 2011 +0100
@@ -10,11 +10,11 @@
;;; Code:
+(require 'ivan-load)
(require 'elim)
(eval-when-compile
(defvar buffer)
- (require 'ivan-load)
(require 'garak))
(defun elim-command ()
run elim outside of /media/portable
File modified: emacs/init/ivan-elim.el
Change925 at Tue Nov 08 20:03:47 2011 +0100 by Ivan Kanis <ivan@tao>
diff -r 42be173368c6 -r 4adecc3aa809 emacs/init/ivan-elim.el
--- a/emacs/init/ivan-elim.el Tue Nov 08 11:45:56 2011 +0100
+++ b/emacs/init/ivan-elim.el Tue Nov 08 20:03:47 2011 +0100
@@ -10,11 +10,16 @@
;;; Code:
+(require 'elim)
+
(eval-when-compile
(defvar buffer)
(require 'ivan-load)
(require 'garak))
+(defun elim-command ()
+ (format "%s 2>> %s/elim.$$.stderr" elim-executable ivan-var-tmp-dir))
+
(defun ivan-elim ()
"Start elim."
(interactive)
fix pop-to-buffer argumentes for emacs 24
File modified: emacs/init/ivan-elim.el
Change924 at Tue Nov 08 11:45:56 2011 +0100 by Ivan Kanis <ivan@yan>
diff -r bd69cb534630 -r 42be173368c6 emacs/init/ivan-elim.el
--- a/emacs/init/ivan-elim.el Tue Nov 08 11:31:41 2011 +0100
+++ b/emacs/init/ivan-elim.el Tue Nov 08 11:45:56 2011 +0100
@@ -25,7 +25,7 @@
(defun ivan-elim-pop-buffer ()
"Pop buffer on incoming messages."
- (pop-to-buffer buffer t nil nil)
+ (pop-to-buffer buffer)
(raise-frame))
(setq
add emacs bootstrap script
File modified: bin/bootstrap-emacs.sh
Change923 at Tue Nov 08 11:31:41 2011 +0100 by Ivan Kanis <ivan@yan>
diff -r 20c1f4430139 -r bd69cb534630 bin/bootstrap-emacs.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/bootstrap-emacs.sh Tue Nov 08 11:31:41 2011 +0100
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+cur_dir=`dirname ${0}`
+cur_dir=`cd ${cur_dir} ; pwd`
+
+be_path=${HOME}/emacs-bzr
+
+. ${cur_dir}/function.sh
+
+fn_cd ${HOME}/src/emacs-bzr/trunk
+
+#make extraclean
+#fn_chacke "Clean failed"
+
+./configure --prefix=${be_path}
+fn_check "Configure failed"
+
+#make bootstrap
+make
+fn_check "Boostrap failed"
+
+if test -d ${be_path} ; then
+ rm -r ${be_path}
+ fn_check "Failed to remove ${be_path}"
+fi
+
+make install
+fn_check "Install failed"
+
+# Local Variables:
+# compile-command: "sh bootstrap-emacs.sh"
+# End:
+
+# vim:et:sw=4:ts=4:
show scroll
File modified: emacs/nterm/nterm.el
Change922 at Sat Nov 05 12:26:35 2011 +0100 by Ivan Kanis <ivan@tao>
diff -r ec0fb2d46295 -r 20c1f4430139 emacs/nterm/nterm.el
--- a/emacs/nterm/nterm.el Sat Nov 05 11:58:26 2011 +0100
+++ b/emacs/nterm/nterm.el Sat Nov 05 12:26:35 2011 +0100
@@ -120,6 +120,9 @@
(defvar nterm-width 80
"Terminal width in characters.")
+(defvar nterm-show-scroll t
+ "When t display scroll. It runs slower when enabled.")
+
(defvar nterm-double-width-alist
(let ((char ?!)
(unicode ?\uff01)
@@ -463,7 +466,8 @@
(insert "\n")
(funcall line-draw-function)
(nterm-cursor-position-set up-pos)
- (nterm-vt100-unify-face)))
+ (when nterm-show-scroll
+ (sit-for 0.01))))
(defun nterm-scroll-down (top bottom line-draw-function)
"Scroll screen down from TOP to BOTTOM.
@@ -481,7 +485,9 @@
(nterm-cursor-position-set (cons top 0))
(insert "\n")
(funcall line-draw-function)
- (nterm-cursor-position-set down-pos)))
+ (nterm-cursor-position-set down-pos)
+ (when nterm-show-scroll
+ (sit-for 0.01))))
(defun nterm-send-string (string)
"Send STRING to host."
check 5th element of timer-idle-list is a symbol
File modified: emacs/nterm/nterm.el
Change921 at Sat Nov 05 11:58:26 2011 +0100 by Ivan Kanis <ivan@tao>
diff -r b735f5923c01 -r ec0fb2d46295 emacs/nterm/nterm.el
--- a/emacs/nterm/nterm.el Fri Nov 04 19:21:08 2011 +0100
+++ b/emacs/nterm/nterm.el Sat Nov 05 11:58:26 2011 +0100
@@ -346,9 +346,11 @@
(let ((suf-list timer-idle-list)
(suf-found nil))
(while suf-list
- (when (string= "nterm-vt100-unify-face"
- (symbol-name (aref (car suf-list) 5)))
- (setq suf-found t))
+ (let ((suf-symbol (aref (car suf-list) 5)))
+ (when (and (symbolp suf-symbol)
+ (string= "nterm-vt100-unify-face"
+ (symbol-name suf-symbol)))
+ (setq suf-found t)))
(setq suf-list (cdr suf-list)))
(when (not suf-found)
(run-with-idle-timer 1 nil 'nterm-vt100-unify-face))))
@@ -460,7 +462,8 @@
(nterm-cursor-position-set (cons bottom 0))
(insert "\n")
(funcall line-draw-function)
- (nterm-cursor-position-set up-pos)))
+ (nterm-cursor-position-set up-pos)
+ (nterm-vt100-unify-face)))
(defun nterm-scroll-down (top bottom line-draw-function)
"Scroll screen down from TOP to BOTTOM.
update from git
File modified: emacs/bbdb/bbdb-com.el emacs/bbdb/bbdb-mua.el emacs/bbdb/bbdb-print.el emacs/bbdb/bbdb.el emacs/bbdb/copy-from-git.sh
Change920 at Fri Nov 04 19:21:08 2011 +0100 by Ivan Kanis <ivan@tao>
diff -r b70bff369c4a -r b735f5923c01 emacs/bbdb/copy-from-git.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emacs/bbdb/copy-from-git.sh Fri Nov 04 19:21:08 2011 +0100
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+for file in \
+ bbdb-anniv.el \
+ bbdb-com.el \
+ bbdb.el \
+ bbdb-gnus.el \
+ bbdb-message.el \
+ bbdb-migrate.el \
+ bbdb-mua.el \
+ bbdb-print.el \
+ bbdb-rmail.el ; do
+ cp ~/src/bbdb/lisp/${file} .
+done
+
+
+# Copyright (C) 2011 Ivan Kanis
+# Author: Ivan Kanis
+#
+# This program is free software ; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation ; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY ; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program ; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# vi:et:sw=4:ts=4:
+# Local Variables:
+# compile-command: "sh copy-from-git.sh"
+# End:
...
unify face per line
This is to avoid white line stretching over display larger than 80
characters. I simplifies the algorithm greatly as well.
File modified: emacs/nterm/nterm.el
Change919 at Thu Oct 13 19:15:58 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r c36ed1915dbf -r b70bff369c4a emacs/nterm/nterm.el
--- a/emacs/nterm/nterm.el Tue Oct 11 21:13:47 2011 +0200
+++ b/emacs/nterm/nterm.el Thu Oct 13 19:15:58 2011 +0200
@@ -1010,36 +1010,28 @@
the input noticeably."
(with-current-buffer nterm-buffer-name
(when (not nterm-dwl-exist)
- (let* ((uf-point-begin (point-min))
- (uf-point-index uf-point-begin)
- (uf-line 0)
- (uf-col 0)
- (uf-attr-line (cdr (assq 'attr (nth uf-line nterm-memory)))))
+ (let ((uf-point-begin (point-min))
+ (uf-point-index (point-min))
+ (uf-line 0)
+ (uf-col 0)
+ uf-attr-line)
(while (< uf-line nterm-height)
- (while (< uf-col nterm-width)
+ (setq uf-attr-line (cdr (assq 'attr (nth uf-line nterm-memory))))
+ (while (< uf-col (1- nterm-width))
(when (not (nterm-compare-vector-array
(aref uf-attr-line uf-col)
- (if (not (= uf-col (- nterm-width 1)))
- (aref uf-attr-line (1+ uf-col))
- (if (= uf-line (- nterm-height 1))
- ;; last line on last character, do nothing
- []
- ;; compare with first char of next row
- (setq
- uf-attr-line
- (cdr (assq 'attr
- (nth (1+ uf-line) nterm-memory))))
- (aref uf-attr-line 0)))))
+ (aref uf-attr-line (1+ uf-col))))
(nterm-put-text-property
- uf-line uf-col (1+ uf-point-begin) uf-point-index)
+ uf-line uf-col uf-point-begin uf-point-index)
(setq uf-point-begin (1+ uf-point-index)))
(setq uf-point-index (1+ uf-point-index)
uf-col (1+ uf-col)))
...
fix dictionary with bzr emacs
File modified: emacs/dictionary/dictionary.el
Change918 at Tue Oct 11 21:13:47 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 8df5974acc09 -r c36ed1915dbf emacs/dictionary/dictionary.el
--- a/emacs/dictionary/dictionary.el Tue Oct 11 21:03:12 2011 +0200
+++ b/emacs/dictionary/dictionary.el Tue Oct 11 21:13:47 2011 +0200
@@ -330,7 +330,6 @@
(make-local-variable 'dictionary-default-dictionary)
(make-local-variable 'dictionary-default-strategy)
- (make-local-hook 'kill-buffer-hook)
(add-hook 'kill-buffer-hook 'dictionary-close t t)
(run-hooks 'dictionary-mode-hook))
fix line drawing when emacs is wider than 80 characters
File modified: emacs/nterm/nterm.el
Change917 at Tue Oct 11 21:03:12 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r d5fb1dd1d8ee -r 8df5974acc09 emacs/nterm/nterm.el
--- a/emacs/nterm/nterm.el Tue Oct 11 20:50:59 2011 +0200
+++ b/emacs/nterm/nterm.el Tue Oct 11 21:03:12 2011 +0200
@@ -56,8 +56,9 @@
;; - Unicode characters
;; - Directory tracking
;; - Handle multiple instance
+;; - Set nterm-dwl-exist to nil at an appropriate time
;; - Look for TBD in this file for other things...
-
+;;
;; I think nterm is easier to maintain than term. One look at term's
;; term-emulate-terminal function should convince anyone that term
;; cannot be maintained anymore. Compare with nterm equivalent
@@ -1030,7 +1031,7 @@
(nth (1+ uf-line) nterm-memory))))
(aref uf-attr-line 0)))))
(nterm-put-text-property
- uf-line uf-col uf-point-begin uf-point-index)
+ uf-line uf-col (1+ uf-point-begin) uf-point-index)
(setq uf-point-begin (1+ uf-point-index)))
(setq uf-point-index (1+ uf-point-index)
uf-col (1+ uf-col)))
fix unit testing vttest-2-14
File modified: emacs/nterm/nterm-ut.el
Change916 at Tue Oct 11 20:50:59 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 6bdda8a865bc -r d5fb1dd1d8ee emacs/nterm/nterm-ut.el
--- a/emacs/nterm/nterm-ut.el Tue Oct 11 20:29:44 2011 +0200
+++ b/emacs/nterm/nterm-ut.el Tue Oct 11 20:50:59 2011 +0200
@@ -491,7 +491,7 @@
(ert-deftest nterm-vttest-2-14 ()
(should (nterm-ut
-"8c26f608afa218d6d30c77e11625727b" "2f37168f73de511effd3f6d40b7b0e63"
+"ce3aea5309f491d35936ceefffca9b81" "2f37168f73de511effd3f6d40b7b0e63"
(concat
"[?5l[2J[8;12Hnormal[8;24Hb"
"old[8;36Hunderscored[8;48Hblinking[8;60Hreversed[10;1Hst"
bump version number and added some doc
File modified: emacs/nterm/nterm.el
Change915 at Tue Oct 11 20:29:44 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 40e90f4d0441 -r 6bdda8a865bc emacs/nterm/nterm.el
--- a/emacs/nterm/nterm.el Mon Oct 10 08:30:10 2011 +0200
+++ b/emacs/nterm/nterm.el Tue Oct 11 20:29:44 2011 +0200
@@ -3,10 +3,10 @@
;; Copyright (C) 2009, 2010, 2011 Ivan Kanis
-;; Author: Ivan Kanis <look-for-me@your-favorite-search.engine>
-;; Maintainer: Ivan Kanis <look-for-me@your-favorite-search.engine>
+;; Author: Ivan Kanis <ivan.kanis@googlemail.com>
+;; Maintainer: Ivan Kanis <ivan.kanis@googlemail.com>
;; Created: 1 Oct 2009
-;; Version: 0.4
+;; Version: 0.5
;; Keywords: terminal shell
;; This file is not part of GNU Emacs.
@@ -21,7 +21,7 @@
;; table of functions for each character coming in. I have been in the
;; terminal emulation business for seven years so I ought to know.
-;; Nterm is meant to be a full vt100 compatible terminal emulator. It
+;; Nterm is a full vt100 compatible terminal emulator. It
;; has the following features:
;; - G0 G1 switching with shift in and shift out
@@ -35,15 +35,25 @@
;; - Double width character
;; - Double height character
+;; Ultimately I would like to use nterm instead of xterm. There's a
+;; lot of work left to be done though.
+
+;; Drawing character are hard coded to be used with a 12x24 font. If
+;; you are a bit of an artist have a look at nterm-gr.el and submit an
+;; alternate graphic font that works for you, I will include it...
+
+;; I use the following font on Ubuntu:
+;; "-unknown-DejaVu Sans Mono-normal-normal-*-20-*-*-*-m-0-iso10646-1"
+
;; TODO
...
fix bugs in unify face function
File modified: emacs/nterm/nterm.el
Change914 at Mon Oct 10 08:30:10 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r b46d257baef7 -r 40e90f4d0441 emacs/nterm/nterm.el
--- a/emacs/nterm/nterm.el Sun Oct 09 10:40:21 2011 +0200
+++ b/emacs/nterm/nterm.el Mon Oct 10 08:30:10 2011 +0200
@@ -999,11 +999,11 @@
the input noticeably."
(with-current-buffer nterm-buffer-name
(when (not nterm-dwl-exist)
- (let ((uf-point-begin (point-min))
- (uf-point-index (point-min))
- (uf-line 0)
- (uf-col 0)
- (uf-attr-line cdr (assq 'attr (nth uf-line nterm-memory))))
+ (let* ((uf-point-begin (point-min))
+ (uf-point-index uf-point-begin)
+ (uf-line 0)
+ (uf-col 0)
+ (uf-attr-line (cdr (assq 'attr (nth uf-line nterm-memory)))))
(while (< uf-line nterm-height)
(while (< uf-col nterm-width)
(when (not (nterm-compare-vector-array
@@ -1017,8 +1017,8 @@
(setq
uf-attr-line
(cdr (assq 'attr
- (nth (1+ uf-line) nterm-memory)))))
- (aref uf-attr-line 0))))
+ (nth (1+ uf-line) nterm-memory))))
+ (aref uf-attr-line 0)))))
(nterm-put-text-property
uf-line uf-col uf-point-begin uf-point-index)
(setq uf-point-begin (1+ uf-point-index)))
disable undo in memory dump
File modified: emacs/nterm/nterm.el
Change913 at Sun Oct 09 10:40:21 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 8034e63b19d4 -r b46d257baef7 emacs/nterm/nterm.el
--- a/emacs/nterm/nterm.el Sun Oct 09 10:38:10 2011 +0200
+++ b/emacs/nterm/nterm.el Sun Oct 09 10:40:21 2011 +0200
@@ -409,7 +409,7 @@
(with-current-buffer nterm-buffer-name
(set (make-local-variable 'nterm-argument) "")
(setq truncate-lines t)
- (buffer-disable-undo nil))
+ (buffer-disable-undo))
(nterm-init)
(nterm-vt52-init)
(nterm-vt100-init)
@@ -2566,6 +2566,7 @@
(interactive)
(run-at-time nil nterm-mem-time 'nterm-mem-display-timer)
(with-current-buffer (get-buffer-create nterm-mem-buffer)
+ (buffer-disable-undo)
(nterm-mem-dump))
(pop-to-buffer nterm-mem-buffer)
(nterm-mem-mode))
unify face, it enhances typing speed significantly
File modified: emacs/nterm/nterm.el
Change912 at Sun Oct 09 10:38:10 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r f3e0fb49d45b -r 8034e63b19d4 emacs/nterm/nterm.el
--- a/emacs/nterm/nterm.el Sat Oct 08 14:06:23 2011 +0200
+++ b/emacs/nterm/nterm.el Sun Oct 09 10:38:10 2011 +0200
@@ -327,7 +327,20 @@
(funcall emulate-dispatch emulate-char)
(if nterm-debug-emulator
(message "received 0x%x not handled" emulate-char))))
- (setq emulate-index (+ emulate-index 1))))))
+ (setq emulate-index (+ emulate-index 1))))
+ (nterm-setup-unify-face)))
+
+(defun nterm-setup-unify-face ()
+ "Setup unify face idle timer if it doesn't exist."
+ (let ((suf-list timer-idle-list)
+ (suf-found nil))
+ (while suf-list
+ (when (string= "nterm-vt100-unify-face"
+ (symbol-name (aref (car suf-list) 5)))
+ (setq suf-found t))
+ (setq suf-list (cdr suf-list)))
+ (when (not suf-found)
+ (run-with-idle-timer 1 nil 'nterm-vt100-unify-face))))
(defun nterm-init ()
(setq nterm-state
@@ -628,8 +641,6 @@
]
"List of meanings of vt100 modes.")
-
-
(defvar nterm-vt100-charset-normal-table
'(nterm-vt100-charset-normal
nterm-vt100-charset-normal-double
@@ -848,7 +859,7 @@
?A nterm-vt100-scs-g3
?B nterm-vt100-scs-g3))
-;; Drawing routine
+;;; Drawing routine
(defun nterm-vt100-char-insert (char &optional replace)
...
add documentation
File modified: emacs/nterm/nterm.el
Change911 at Sat Oct 08 14:06:23 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r a44603d3fbd4 -r f3e0fb49d45b emacs/nterm/nterm.el
--- a/emacs/nterm/nterm.el Thu Sep 29 17:29:50 2011 +0200
+++ b/emacs/nterm/nterm.el Sat Oct 08 14:06:23 2011 +0200
@@ -902,7 +902,7 @@
(cons (nth index table) (> index 0))))
(defun nterm-vt100-char-insert-blink (attribute line-attr)
- "TBD document"
+ "Handle insertion of a character with blink attribute."
(if (aref attribute nterm-vt100-char-blink)
(progn
(aset line-attr nterm-vt100-line-blink t)
kill global variable nterm-process
File modified: emacs/nterm/nterm.el
Change910 at Thu Sep 29 17:29:50 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 8b0be5b805f5 -r a44603d3fbd4 emacs/nterm/nterm.el
--- a/emacs/nterm/nterm.el Thu Sep 29 09:47:22 2011 +0200
+++ b/emacs/nterm/nterm.el Thu Sep 29 17:29:50 2011 +0200
@@ -83,7 +83,6 @@
(require 'cl)
;; Placate compiler
(defvar nterm-dispatch)
- (defvar nterm-process)
(defvar nterm-argument)
(defvar nterm-vt100-primary-dispatch)
(defvar nterm-vt100-escape-dispatch)
@@ -392,8 +391,6 @@
(when (not nterm-unit-testing)
(pop-to-buffer nterm-buffer-name)
(kill-all-local-variables)
- (set (make-local-variable 'nterm-process)
- (get-buffer-process (current-buffer)))
(setq mode-name "nterm")
(setq major-mode 'nterm-mode))
(with-current-buffer nterm-buffer-name
@@ -461,7 +458,7 @@
(defun nterm-send-string (string)
"Send STRING to host."
- (process-send-string nterm-process string))
+ (process-send-string (get-buffer-process (current-buffer)) string))
;;; ANSI
(defvar nterm-ansi-mode (make-bool-vector 21 nil))
add import org-import-icalendar
File modified: emacs/misc/Makefile emacs/misc/org-import-icalendar.el
Change909 at Thu Sep 29 09:47:22 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r d2151755aeb7 -r 8b0be5b805f5 emacs/misc/org-import-icalendar.el
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emacs/misc/org-import-icalendar.el Thu Sep 29 09:47:22 2011 +0200
@@ -0,0 +1,223 @@
+;;; org-import-icalendar.el --- Copy snippet to kill-ring for text/calendar part
+
+;; Copyright (C) 2010 Vagn Johansen
+
+;; Author: Vagn Johansen <gonz808@hotmail.com>
+;; Keywords: gnus, org
+;; URL: http://ozymandias.dk/emacs/emacs.html
+
+
+;; This file is NOT part of Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License
+;; as published by the Free Software Foundation; either version 2
+;; of the License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program; if not, write to the Free Software
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; Installation:
+;;
+;; (require 'org-import-icalendar)
+;;
+;; Probably requires Emacs 23
+;;
+;; NOTE! Sets gnus-article-mime-part-function. Make sure it not set to
+;; something you use first.
+
...
map C-h to backward char in C-s
File modified: emacs/init/ivan-keymap.el
Change908 at Sat Sep 24 18:18:50 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 4a41940a6cd6 -r d2151755aeb7 emacs/init/ivan-keymap.el
--- a/emacs/init/ivan-keymap.el Sat Sep 24 18:07:23 2011 +0200
+++ b/emacs/init/ivan-keymap.el Sat Sep 24 18:18:50 2011 +0200
@@ -198,6 +198,8 @@
(define-key function-key-map [f6] 'event-apply-meta-modifier)
(define-key function-key-map [f7] 'event-apply-shift-modifier)
+(define-key isearch-mode-map (kbd "C-h") 'isearch-other-control-char)
+
(provide 'ivan-keymap)
;; Copyright (C) 2007 Ivan Kanis
fix e-mail language depending on recipient completion
File modified: emacs/init/ivan-message.el
Change907 at Sat Sep 24 18:07:23 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 4b634c2dfa78 -r 4a41940a6cd6 emacs/init/ivan-message.el
--- a/emacs/init/ivan-message.el Sat Sep 24 18:07:05 2011 +0200
+++ b/emacs/init/ivan-message.el Sat Sep 24 18:07:23 2011 +0200
@@ -64,7 +64,7 @@
"Hook to run just after completion of a unique e-mail
address. If the sender matches a specific bbdb note entry the
input method will toggle to french"
- (let ((language (ivan-bbdb-note (car match-recs))))
+ (let ((language (ivan-bbdb-note one-record)))
(cond ((eq language 'french)
(ivan-message-setup-french))
((eq language 'japanese)
@@ -73,7 +73,7 @@
(ivan-message-setup-english))))
(ivan-message-replace-signature))
-(add-hook 'bbdb-complete-name-hooks 'ivan-message-send)
+(add-hook 'bbdb-complete-mail-hook 'ivan-message-send)
(defun ivan-message-setup ()
"Setup language in a message"
don't require missing file
File modified: emacs/bbdb/bbdb.el
Change906 at Sat Sep 24 18:07:05 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r e02bb46a966e -r 4b634c2dfa78 emacs/bbdb/bbdb.el
--- a/emacs/bbdb/bbdb.el Sat Sep 24 17:17:54 2011 +0200
+++ b/emacs/bbdb/bbdb.el Sat Sep 24 18:07:05 2011 +0200
@@ -3386,7 +3386,6 @@
See also `bbdb-mua-auto-update-init'. The latter is a separate function
as this allows one to initialize the auto update feature for some MUAs only,
for example only for outgoing messages."
- (require 'bbdb-autoloads)
(dolist (mua muas)
(let ((init (assq mua bbdb-init-forms)))
(if init
sync with git
File modified: emacs/bbdb/bbdb-anniv.el emacs/bbdb/bbdb-com.el emacs/bbdb/bbdb-message.el emacs/bbdb/bbdb.el
Change905 at Sat Sep 24 17:17:54 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r fb9cc52ec453 -r e02bb46a966e emacs/bbdb/bbdb.el
--- a/emacs/bbdb/bbdb.el Sat Sep 24 17:01:53 2011 +0200
+++ b/emacs/bbdb/bbdb.el Sat Sep 24 17:17:54 2011 +0200
@@ -64,7 +64,7 @@
(defvar gnus-article-buffer)) ;; gnus-art.el
(defconst bbdb-version "3.02")
-(defconst bbdb-version-date "$Date: 2011/05/11 14:11:26 $")
+(defconst bbdb-version-date "$Date: 2011/09/22 15:25:37 $")
;; Custom groups
@@ -667,6 +667,7 @@
(const :tag "annotate all messages" create)
(function :tag "User-defined function")))
+;;; Fixme: This docstring is too confusing!
(defcustom bbdb-mua-update-interactive-p '(search . query)
"Return values for function `bbdb-mua-update-interactive-p' (see there).
It is a cons pair (WITHOUT-PREFIX . WITH-PREFIX).
@@ -855,7 +856,7 @@
(defcustom bbdb-notice-mail-hook nil
"Hook run each time a mail address of a record is \"noticed\" in a message.
This means that the mail address in a message belongs to an existing BBDB record
-or it is a record BBDB has created for the mail address.
+or to a record BBDB has created for the mail address.
Run with one argument, the record. It is up to the hook function
to determine which MUA is used and to act appropriately.
@@ -1246,41 +1247,14 @@
:type '(choice (const :tag "No digits required" nil)
(string :tag "Dial this first" "1")))
-(defcustom bbdb-sound-player nil
- "The program to be used to play the sounds for the touch-tone digits."
+(defcustom bbdb-dial-function nil
+ "If non-nil this should be a function used for dialing phone numbers.
+This function is used by `bbdb-dial-number'. It requires one
+argument which is a string for the number that is dialed.
+If nil then `bbdb-dial-number' uses the tel URI syntax passed to `browse-url'
+to make the call."
...
fix google maps on emacs
File modified: emacs/google-maps/google-maps.el
Change904 at Sat Sep 24 17:01:53 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 22aab0bc1009 -r fb9cc52ec453 emacs/google-maps/google-maps.el
--- a/emacs/google-maps/google-maps.el Sat Sep 24 16:58:00 2011 +0200
+++ b/emacs/google-maps/google-maps.el Sat Sep 24 17:01:53 2011 +0200
@@ -43,6 +43,7 @@
(buffer-substring-no-properties
(region-beginning) (region-end))
(read-string "Location: " nil 'google-maps-history))))
+ (require 'cl) ;; load cl or else things will break...
(let ((location (if no-geocoding
location
(let ((location (google-maps-geocode-location location)))
fix code coloring with muse
File modified: emacs/init/ivan-muse.el emacs/muse/Makefile
Change903 at Sat Sep 24 16:58:00 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r c41ac2049ab8 -r 22aab0bc1009 emacs/muse/Makefile
--- a/emacs/muse/Makefile Fri Sep 23 19:58:13 2011 +0200
+++ b/emacs/muse/Makefile Sat Sep 24 16:58:00 2011 +0200
@@ -1,4 +1,5 @@
SRC = \
+htmlize.el \
muse-backlink.el \
muse-blosxom.el \
muse-book.el \
put a semi colon after the date in a blog
File modified: emacs/init/ivan-muse.el
Change902 at Fri Sep 23 19:58:13 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r d8edc9e0cbec -r c41ac2049ab8 emacs/init/ivan-muse.el
--- a/emacs/init/ivan-muse.el Thu Sep 22 19:56:17 2011 +0200
+++ b/emacs/init/ivan-muse.el Fri Sep 23 19:58:13 2011 +0200
@@ -70,7 +70,7 @@
(find-file (concat ivan-var-web-dir muse ".muse"))
(goto-line 1)
(forward-line 2)
- (insert (format-time-string "* %Y%m%d "))
+ (insert (format-time-string "* %Y%m%d: "))
(save-excursion
(insert "\n\n"))))
make a list of japanese words looked up
most recent entries go to the top of the list
write entry in a file set by variable ivan-lookup-file
File modified: emacs/init/ivan-lookup.el
Change901 at Thu Sep 22 19:56:17 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r a493aa2f01ac -r d8edc9e0cbec emacs/init/ivan-lookup.el
--- a/emacs/init/ivan-lookup.el Thu Sep 22 18:04:32 2011 +0200
+++ b/emacs/init/ivan-lookup.el Thu Sep 22 19:56:17 2011 +0200
@@ -11,14 +11,36 @@
(require 'lookup)
(require 'lookup-entry))
+(defvar ivan-lookup-file (concat ivan-var-keel-dir "lookup.txt")
+ "File where looked up words are stored.")
+
(defun ivan-lookup (number)
"Lookup word within a dictionary.
When called interactively lookup region"
(interactive "P")
(require 'lookup)
- (if number
- (lookup-region (region-beginning) (region-end))
- (ivan-lookup-word-insist (lookup-current-word))))
+ (let (il-word)
+ (if number
+ (progn
+ (setq il-word (buffer-substring-no-properties
+ (region-beginning) (region-end)))
+ (lookup-word il-word))
+ (setq il-word (car (last (ivan-lookup-shorter (lookup-current-word))))))
+ (save-window-excursion
+ (find-file ivan-lookup-file)
+ (save-excursion
+ (goto-char (point-min))
+ (insert il-word "\n")))))
+
+(defun ivan-lookup-shorter (word)
+ "Keep shortening word till we find a match.
+The function is recursive"
+ (cond ((= (length word) 0) nil)
+ ((condition-case nil
+ (lookup-word word)
+ (error nil)) (list word))
+ (t (cons word (ivan-lookup-shorter
+ (substring word 0 (- (length word) 1)))))))
...
add bitmap drawing to single width character
fix regression test vttest 2-14 and 3-1
File modified: emacs/nterm/nterm-ut.el emacs/nterm/nterm.el
Change900 at Thu Sep 22 18:04:32 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 7493c0154b19 -r a493aa2f01ac emacs/nterm/nterm.el
--- a/emacs/nterm/nterm.el Thu Sep 22 17:32:53 2011 +0200
+++ b/emacs/nterm/nterm.el Thu Sep 22 18:04:32 2011 +0200
@@ -930,10 +930,16 @@
line draw-index draw-dwl)))
(if draw-dwl
(nterm-vt100-line-draw-dwl res)
- (insert (cdr (assq 'char res)))
- (remove-text-properties (- (point) 1) (point) '(face))
- (put-text-property (- (point) 1) (point) 'face
- (cdr (assq 'face res)))))
+ (let ((draw-char (cdr (assq 'char res))))
+ (if (stringp draw-char)
+ (nterm-insert-image
+ draw-char 12 24
+ (cdr (assq 'background res))
+ (cdr (assq 'foreground res)))
+ (insert draw-char)
+ (remove-text-properties (- (point) 1) (point) '(face))
+ (put-text-property (- (point) 1) (point) 'face
+ (cdr (assq 'face res)))))))
(setq draw-index (+ draw-index 1))))
(insert "\n")
(nterm-cursor-position-set draw-cur))))
@@ -957,7 +963,7 @@
(if (and (aref draw-attribute nterm-vt100-char-blink)
(cdr (assq 'blink nterm-vt100-state)))
(setq draw-face (nterm-vt100-face-default)
- draw-char (if draw-dwl (aref draw-char-table 32) " ")))
+ draw-char (if draw-dwl (aref draw-char-table 32) ?\s)))
(if (aref draw-attribute nterm-vt100-char-bright)
(nterm-face-bright draw-face draw-foreground))
(if (aref draw-attribute nterm-vt100-char-reverse)
regroup vt100 drawing routines, no code change
File modified: emacs/nterm/nterm.el
Change899 at Thu Sep 22 17:32:53 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 42e127afcc3d -r 7493c0154b19 emacs/nterm/nterm.el
--- a/emacs/nterm/nterm.el Thu Sep 22 09:08:39 2011 +0200
+++ b/emacs/nterm/nterm.el Thu Sep 22 17:32:53 2011 +0200
@@ -851,6 +851,134 @@
?A nterm-vt100-scs-g3
?B nterm-vt100-scs-g3))
+;; Drawing routine
+(defun nterm-vt100-char-insert (char &optional replace)
+ "Insert character, with face property."
+ (let* ((insert-line (nterm-cursor-line-get))
+ (insert-col (nterm-cursor-col-get))
+ (insert-line-attribute
+ (cdr (assq 'line-attr
+ (nth insert-line nterm-memory))))
+ (insert-mem-char (cdr (assq 'char (nth insert-line nterm-memory))))
+ (insert-mem-attribute
+ (cdr (assq 'attr (nth insert-line nterm-memory))))
+ (insert-attribute (cdr (assq 'attribute nterm-vt100-state)))
+ (insert-table (nterm-vt100-char-insert-table insert-attribute))
+ (insert-char-table (eval (car insert-table)))
+ (insert-width (if (cdr insert-table) 24 12))
+ (insert-char (if (< char (length insert-char-table))
+ (aref insert-char-table char))))
+ (if insert-char
+ (progn
+ (nterm-cursor-position-set (cons insert-line insert-col))
+ (aset insert-mem-char insert-col char)
+ (aset insert-mem-attribute insert-col
+ (copy-sequence insert-attribute))
+ (if replace
+ (delete-char 1))
+ (cond ((stringp insert-char)
+ (nterm-insert-image
+ insert-char insert-width 24
+ (cdr (assq 'background nterm-vt100-state))
+ (cdr (assq 'foreground nterm-vt100-state))))
+ ((characterp insert-char)
+ (insert (char-to-string insert-char))
+ (put-text-property (- (point) 1) (point) 'face
+ (cdr (assq 'face nterm-vt100-state)))))
...
move info to keel
File modified: emacs/init/ivan-info.el info/Makefile info/bbdb.texinfo info/coreutils.info info/coreutils.info-1 info/coreutils.info-2 info/coreutils.info-3 info/dir info/emacs-w3m.info-1 info/emacs-w3m.info-2 info/emacs-w3m.texi info/emms.texinfo info/fdl.texi info/find.info info/find.texi info/getdate.texi info/magit.texi info/make-stds.texi info/make.texi info/muse.texi info/org-git info/perm.texi info/regexprops.texi info/sicp.texi2 info/slime.info info/stumpwm.info info/zsh.info info/zsh.info-1 info/zsh.info-2 info/zsh.info-3 info/zsh.info-4 info/zsh.info-5 info/zsh.info-6 info/zsh.texi
Change898 at Thu Sep 22 09:08:39 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 542235dc6ffa -r 42e127afcc3d info/zsh.texi
--- a/info/zsh.texi Mon Sep 19 12:37:50 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35005 +0,0 @@
-
-\input texinfo.tex
-@c %**start of header
-@iftex
-@afourpaper
-@setchapternewpage off
-@end iftex
-@setfilename zsh.info
-@settitle zsh
-@c %**end of header
-
-@ifinfo
-@set dsq '@:'
-@set dsbq `@:`
-@end ifinfo
-@iftex
-@set dsq '{}'
-@set dsbq `{}`
-@end iftex
-@ifinfo
-@dircategory Utilities
-@direntry
- * ZSH: (zsh). The Z Shell Manual.
-@end direntry
-@end ifinfo
-
-@iftex
-@finalout
-@end iftex
-@titlepage
-@title The Z Shell Manual
-@subtitle Version 4.3.12
-@subtitle Updated May 31, 2011
-@author Original documentation by Paul Falstad
-@page
-This is a texinfo version of the documentation for the Z Shell, originally by
-Paul Falstad.
...
script that plays audio file to alert after a long command
File modified: bin/bong.sh bin/bong.wav bin/setup.sh conf/zshrc
Change897 at Mon Sep 19 12:37:50 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r b56a54f45200 -r 542235dc6ffa conf/zshrc
--- a/conf/zshrc Sat Sep 17 18:24:47 2011 +0200
+++ b/conf/zshrc Mon Sep 19 12:37:50 2011 +0200
@@ -29,10 +29,11 @@
fi
# eventual local setting
-setup_local=${HOME}/keep/local.sh
-if test -f ${setup_local} ; then
- source ${setup_local}
-fi
+for setup_local in ${HOME}/keep/local.sh ${HOME}/bob/shell.sh ; do
+ if test -f ${setup_local} ; then
+ source ${setup_local}
+ fi
+done
# Use emacs keybindings even if our EDITOR is set to vi
bindkey -e
fix double width insertion
File modified: emacs/nterm/nterm.el
Change896 at Sat Sep 17 18:24:47 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 24cdaa1c8500 -r b56a54f45200 emacs/nterm/nterm.el
--- a/emacs/nterm/nterm.el Sat Sep 17 14:59:51 2011 +0200
+++ b/emacs/nterm/nterm.el Sat Sep 17 18:24:47 2011 +0200
@@ -995,8 +995,9 @@
(insert-mem-attribute
(cdr (assq 'attr (nth insert-line nterm-memory))))
(insert-attribute (cdr (assq 'attribute nterm-vt100-state)))
- (insert-char-table (eval (nterm-vt100-char-insert-table
- insert-attribute)))
+ (insert-table (nterm-vt100-char-insert-table insert-attribute))
+ (insert-char-table (eval (car insert-table)))
+ (insert-width (if (cdr insert-table) 24 12))
(insert-char (if (< char (length insert-char-table))
(aref insert-char-table char))))
(if insert-char
@@ -1009,7 +1010,7 @@
(delete-char 1))
(cond ((stringp insert-char)
(nterm-insert-image
- insert-char 12 24
+ insert-char insert-width 24
(cdr (assq 'background nterm-vt100-state))
(cdr (assq 'foreground nterm-vt100-state))))
((characterp insert-char)
@@ -1033,7 +1034,7 @@
((aref i-t-attr nterm-vt100-line-decdwl-top) 2)
((aref i-t-attr nterm-vt100-line-decdwl-bottom) 3)
(t 0))) 0)))
- (nth index table)))
+ (cons (nth index table) (> index 0))))
(defun nterm-vt100-char-insert-blink (attribute line-attr)
"TBD document"
@@ -1500,7 +1501,8 @@
"TBD document me."
(let* ((draw-attribute
(aref (cdr (assq 'attr (nth line nterm-memory))) draw-index))
- (draw-char-table (eval (nterm-vt100-char-insert-table draw-attribute)))
+ (draw-char-table
+ (eval (car (nterm-vt100-char-insert-table draw-attribute))))
(char (aref (cdr (assq 'char (nth line nterm-memory))) draw-index))
...
all single width speciall characters are now bitmaps
File modified: emacs/nterm/nterm-gr.el emacs/nterm/nterm.el
Change895 at Sat Sep 17 14:59:51 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 51ad2a119b6d -r 24cdaa1c8500 emacs/nterm/nterm.el
--- a/emacs/nterm/nterm.el Thu Sep 15 19:43:46 2011 +0200
+++ b/emacs/nterm/nterm.el Sat Sep 17 14:59:51 2011 +0200
@@ -1,7 +1,7 @@
;; -*-coding: utf-8 -*-
;;; nterm.el --- New TERMinal emulator
-;; Copyright (C) 2009, 2010 Ivan Kanis
+;; Copyright (C) 2009, 2010, 2011 Ivan Kanis
;; Author: Ivan Kanis <look-for-me@your-favorite-search.engine>
;; Maintainer: Ivan Kanis <look-for-me@your-favorite-search.engine>
@@ -631,108 +631,7 @@
]
"List of meanings of vt100 modes.")
-(defvar nterm-vt100-c0
- [ ?\x00 ; NUL
- nil
- nil
- ?\x03 ; ETX
- ?\x04 ; EOT
- ?\x05 ; ENQ
- nil
- ?\x07 ; BEL
- ?\x08 ; BS
- ?\x09 ; HT
- ?\x0a ; LF
- ?\x0b ; VT
- ?\x0c ; FF
- ?\x0d ; CR
- ?\x0e ; SO
- ?\x0f ; SI
- nil
- ?\x11 ; DC1 (XON)
- nil
- ?\x13 ; DC2 (XOFF)
- nil
- nil
- nil
- nil
...
remove anything, never used it
File modified: emacs/init/init.el emacs/init/ivan-anything.el emacs/init/ivan-keymap.el emacs/misc/Makefile emacs/misc/anything.el
Change894 at Thu Sep 15 19:43:46 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 258ad8c21dc3 -r 51ad2a119b6d emacs/misc/anything.el
--- a/emacs/misc/anything.el Sat Sep 10 15:05:06 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6074 +0,0 @@
-;;;; anything.el --- open anything / QuickSilver-like candidate-selection framework
-
-;; Copyright (C) 2007 Tamas Patrovics
-;; 2008, 2009, 2010 rubikitch <rubikitch@ruby-lang.org>
-
-;; Author: Tamas Patrovics
-;; Maintainer: rubikitch <rubikitch@ruby-lang.org>
-;; Keywords: files, frames, help, matching, outlines, processes, tools, convenience, anything
-;; URL: http://www.emacswiki.org/cgi-bin/wiki/download/anything.el
-;; Site: http://www.emacswiki.org/cgi-bin/emacs/Anything
-(defvar anything-version nil)
-(setq anything-version "1.287")
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;;
-;; Start with M-x anything, narrow the list by typing some pattern,
-;; select with up/down/pgup/pgdown/C-p/C-n/C-v/M-v, choose with enter,
-;; left/right moves between sources. With TAB actions can be selected
-;; if the selected candidate has more than one possible action.
-;;
...
reset blink in nterm-vt100-state
File modified: emacs/nterm/nterm.el
Change893 at Sat Sep 10 15:05:06 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 3fce35969d57 -r 258ad8c21dc3 emacs/nterm/nterm.el
--- a/emacs/nterm/nterm.el Sat Sep 10 14:49:13 2011 +0200
+++ b/emacs/nterm/nterm.el Sat Sep 10 15:05:06 2011 +0200
@@ -987,13 +987,14 @@
(nterm-vt100-line-draw blink-index)
(setq blink-exist t)))
(setq blink-index (+ blink-index 1)))
- (if (not blink-exist)
- (let ((list timer-list))
- (while list
- (let ((elt (pop list)))
- (when (equal (symbol-name (aref elt 5))
- "nterm-vt100-blink-screen")
- (cancel-timer elt)))))))))
+ (when (not blink-exist)
+ (setcdr (assq 'blink-timer nterm-vt100-state) nil)
+ (let ((list timer-list))
+ (while list
+ (let ((elt (pop list)))
+ (when (equal (symbol-name (aref elt 5))
+ "nterm-vt100-blink-screen")
+ (cancel-timer elt)))))))))
(defun nterm-vt100-bracket-start (char)
"Escape bracket dispatch"
fix double width blinking character
File modified: emacs/nterm/nterm.el
Change892 at Sat Sep 10 14:49:13 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r b22c936e1c5b -r 3fce35969d57 emacs/nterm/nterm.el
--- a/emacs/nterm/nterm.el Sat Sep 10 14:19:52 2011 +0200
+++ b/emacs/nterm/nterm.el Sat Sep 10 14:49:13 2011 +0200
@@ -1614,7 +1614,7 @@
(if (and (aref draw-attribute nterm-vt100-char-blink)
(cdr (assq 'blink nterm-vt100-state)))
(setq draw-face (nterm-vt100-face-default)
- draw-char (if draw-dwl ?\s " ")))
+ draw-char (if draw-dwl (aref draw-char-table 32) " ")))
(if (aref draw-attribute nterm-vt100-char-bright)
(nterm-face-bright draw-face draw-foreground))
(if (aref draw-attribute nterm-vt100-char-reverse)
remove incf in code that can be ran from a timer
File modified: emacs/nterm/nterm.el
Change891 at Sat Sep 10 14:19:52 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r f0be9da2002c -r b22c936e1c5b emacs/nterm/nterm.el
--- a/emacs/nterm/nterm.el Sat Sep 10 08:40:39 2011 +0200
+++ b/emacs/nterm/nterm.el Sat Sep 10 14:19:52 2011 +0200
@@ -117,8 +117,8 @@
(while (<= char ?~)
(if (not (eq char ?\s))
(setq list (cons (cons char unicode) list)))
- (incf char)
- (incf unicode))
+ (setq char (+ char 1))
+ (setq unicode (+ unicode 1)))
list)
"Map single width character to unicode double width equivalent.")
@@ -200,7 +200,7 @@
result-list
(list (nterm-argument-default
(nth bracket-index bracket-list) default))))
- (incf bracket-index)))
+ (setq bracket-index (+ bracket-index 1))))
result-list))
(defun nterm-argument-default (number default)
@@ -242,11 +242,11 @@
(let ((reset-index 0))
(while (< reset-index nterm-height)
(setcar (nthcdr reset-index nterm-memory) (nterm-mem-line char))
- (incf reset-index))
+ (setq reset-index (+ reset-index 1)))
(setq reset-index 0)
(while (< reset-index nterm-height)
(nterm-vt100-line-draw reset-index)
- (incf reset-index))))
+ (setq reset-index (+ reset-index 1)))))
(defun nterm-cursor-position-get ()
"Return CONS of cursor-position (line . col)."
@@ -328,7 +328,7 @@
(funcall emulate-dispatch emulate-char)
(if nterm-debug-emulator
(message "received 0x%x not handled" emulate-char))))
...
remove comments
File modified: emacs/init/ivan-lookup.el
Change890 at Sat Sep 10 08:40:39 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 75a1ad031382 -r f0be9da2002c emacs/init/ivan-lookup.el
--- a/emacs/init/ivan-lookup.el Sat Sep 10 08:40:22 2011 +0200
+++ b/emacs/init/ivan-lookup.el Sat Sep 10 08:40:39 2011 +0200
@@ -2,9 +2,6 @@
;;; COMMENT
-;; I added a key to add entries in a flash card program. Just press "a"
-;; to add the entry.
-
(eval-when-compile
(require 'cl)
(require 'ivan-face)
don't launch deluge with stumpwm
File modified: conf/stumpwmrc
Change889 at Sat Sep 10 08:40:22 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r dbb3094428d0 -r 75a1ad031382 conf/stumpwmrc
--- a/conf/stumpwmrc Thu Sep 08 18:13:19 2011 +0200
+++ b/conf/stumpwmrc Sat Sep 10 08:40:22 2011 +0200
@@ -21,5 +21,4 @@
;; stand alone tray for network manager, skype, etc...
(run-shell-command "stalonetray")
-(run-shell-command "deluge")
remove anki + some dead functions in lookup
File modified: emacs/init/Makefile emacs/init/init.el emacs/init/ivan-anki.el emacs/init/ivan-lookup.el emacs/misc/Makefile emacs/misc/anki.el
Change888 at Thu Sep 08 18:13:19 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 995cfca937c8 -r dbb3094428d0 emacs/misc/anki.el
--- a/emacs/misc/anki.el Sat Sep 03 11:55:53 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,719 +0,0 @@
-;;; anki.el --- an emacs interface for anki/emacs.py
-
-;; Copyright (C) 2006 Damien Elmes <emacs@repose.cx>
-
-;; Author: Damien Elmes <damien@repose.cx>
-;; Keywords: flashcard
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;;; Code:
-
-;; User vars
-
-(defvar anki-path "/home/resolve/Lib/code/libanki"
- "*The path to the anki library directory.")
-
-(defvar anki-server-cmd "from anki.emacs import Server; Server().mainLoop()"
- "*The command to start the server.")
-
-(defvar anki-default-lang 'en
- "*The default interface language to use.
-Currently `en' and `ja' are supported.")
...
add auto complete
File modified: emacs/Makefile emacs/auto-complete/Makefile emacs/auto-complete/auto-complete-config.el emacs/auto-complete/auto-complete.el emacs/auto-complete/fuzzy.el emacs/auto-complete/popup.el emacs/init/Makefile emacs/init/init.el emacs/init/ivan-auto-complete.el emacs/init/ivan-load.el
Change887 at Sat Sep 03 11:55:53 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 05567a4c4499 -r 995cfca937c8 emacs/init/ivan-load.el
--- a/emacs/init/ivan-load.el Sat Sep 03 11:54:45 2011 +0200
+++ b/emacs/init/ivan-load.el Sat Sep 03 11:55:53 2011 +0200
@@ -62,6 +62,7 @@
(ivan-load-path
'(
("auctex" t)
+ ("auto-complete" t)
("bbdb" t)
("dictionary" t)
("elim" t)
add kanji stroke lookup
File modified: emacs/init/ivan-japanese.el emacs/init/ivan-keymap.el
Change886 at Sat Sep 03 11:54:45 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r bb1d2a535721 -r 05567a4c4499 emacs/init/ivan-keymap.el
--- a/emacs/init/ivan-keymap.el Wed Aug 31 15:05:30 2011 +0200
+++ b/emacs/init/ivan-keymap.el Sat Sep 03 11:54:45 2011 +0200
@@ -100,7 +100,8 @@
;;; Japanese
(ivan-keymap-prefix
ivan-keymap-japanese-map
- "i" ivan-japanese-input)
+ "i" ivan-japanese-input
+ "s" ivan-japanese-kanji-stroke-order)
;;; Music player
(ivan-keymap-prefix
put a space befor long break indicator
File modified: emacs/ivan/pomodoro.el
Change885 at Wed Aug 31 15:05:30 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 8e2aac91ebdb -r bb1d2a535721 emacs/ivan/pomodoro.el
--- a/emacs/ivan/pomodoro.el Wed Aug 31 14:48:05 2011 +0200
+++ b/emacs/ivan/pomodoro.el Wed Aug 31 15:05:30 2011 +0200
@@ -89,7 +89,7 @@
(defvar pomodoro-break-format " B%d-%d "
"String displayed in the modeline for a break.")
-(defvar pomodoro-long-break-format "LB-%d "
+(defvar pomodoro-long-break-format " LB-%d "
"String displayed in the modeline for a long break.")
(defvar pomodoro-display-string "")
fix diary import of warn time
File modified: emacs/misc/appt.el
Change884 at Wed Aug 31 14:48:05 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 0db7e6b034ce -r 8e2aac91ebdb emacs/misc/appt.el
--- a/emacs/misc/appt.el Wed Aug 31 14:12:38 2011 +0200
+++ b/emacs/misc/appt.el Wed Aug 31 14:48:05 2011 +0200
@@ -618,14 +618,11 @@
;; Get the whole string for this appointment.
(appt-time-string
(substring time-string beg end))
- ;; FIXME why the list? It makes the first
- ;; element (MINUTES) rather than MINUTES.
- (appt-time (list (appt-convert-time only-time)))
- ;; TODO add warntime in diary
+ (appt-time (appt-convert-time only-time))
(time-msg `((minutes . ,appt-time)
(string . ,appt-time-string)
(flag . nil)
- (warntime . nil))))
+ (warntime . ,warntime))))
;; Add this appointment to appt-time-msg-list.
(setq appt-time-msg-list
(nconc appt-time-msg-list (list time-msg))
use associated list
File modified: emacs/misc/appt.el
Change883 at Wed Aug 31 14:12:38 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 8925811d36d2 -r 0db7e6b034ce emacs/misc/appt.el
--- a/emacs/misc/appt.el Wed Aug 31 11:41:26 2011 +0200
+++ b/emacs/misc/appt.el Wed Aug 31 14:12:38 2011 +0200
@@ -172,24 +172,18 @@
(defconst appt-buffer-name "*appt-buf*"
"Name of the appointments buffer.")
-;; TODO Turn this into an alist? It would be easier to add more
-;; optional elements.
-;; Why is the first element (MINUTES) rather than just MINUTES?
-;; It may just inherit from diary-entries-list, where we have
-;; ((MONTH DAY YEAR) ENTRY)
(defvar appt-time-msg-list nil
"The list of appointments for today.
Use `appt-add' and `appt-delete' to add and delete appointments.
-The original list is generated from today's `diary-entries-list', and
-can be regenerated using the function `appt-check'.
-Each element of the generated list has the form
-\((MINUTES) STRING [FLAG] [WARNTIME])
-where MINUTES is the time in minutes of the appointment after midnight,
-and STRING is the description of the appointment.
-FLAG and WARNTIME are not always present. A non-nil FLAG
-indicates that the element was made with `appt-add', so calling
-`appt-make-list' again should preserve it. If WARNTIME is non-nil,
-it is an integer to use in place of `appt-message-warning-time'.")
+The original list is generated from today's `diary-entries-list',
+and can be regenerated using the function `appt-check'. Each
+element of the generated list is an associated list containing
+MINUTES STRING FLAG and WARNTIME where MINUTES is the time in
+minutes of the appointment after midnight, and STRING is the
+description of the appointment. A non-nil FLAG indicates that the
+element was made with `appt-add', so calling `appt-make-list'
+again should preserve it. If WARNTIME is non-nil, it is an
+integer to use in place of `appt-message-warning-time'.")
(defconst appt-max-time (1- (* 24 60))
"11:59pm in minutes - number of minutes in a day minus 1.")
@@ -361,9 +355,10 @@
;; FIXME how can there be any such entries, given that this
;; function removes entries when they hit zero minutes,
;; and appt-make-list doesn't add any in the past in the first place?
...
revert appt.el to bzr
File modified: emacs/misc/appt.el
Change882 at Wed Aug 31 11:41:26 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 104aec1f1721 -r 8925811d36d2 emacs/misc/appt.el
--- a/emacs/misc/appt.el Wed Aug 31 11:26:39 2011 +0200
+++ b/emacs/misc/appt.el Wed Aug 31 11:41:26 2011 +0200
@@ -1,11 +1,12 @@
;;; appt.el --- appointment notification functions
-;; Copyright (C) 1989, 1990, 1994, 1998, 2001, 2002, 2003, 2004, 2005,
-;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1989-1990, 1994, 1998, 2001-2011
+;; Free Software Foundation, Inc.
;; Author: Neil Mager <neilm@juliet.ll.mit.edu>
;; Maintainer: Glenn Morris <rgm@gnu.org>
;; Keywords: calendar
+;; Package: calendar
;; This file is part of GNU Emacs.
@@ -61,15 +62,10 @@
;; `appt-check' reads.
;;
;; You can change the way the appointment window is created/deleted by
-;; setting the variables
-;;
-;; appt-disp-window-function
-;; and
-;; appt-delete-window-function
-;;
-;; For instance, these variables could be set to functions that display
-;; appointments in pop-up frames, which are lowered or iconified after
-;; `appt-display-interval' minutes.
+;; setting the variables `appt-disp-window-function' and
+;; `appt-delete-window-function'. For instance, you could be set them
+;; to functions that display appointments in pop-up frames, which are
+;; lowered or iconified after `appt-display-interval' minutes.
;;
;;; Code:
@@ -82,20 +78,22 @@
:prefix "appt-"
:group 'calendar)
...
prettify list
File modified: bin/setup.sh
Change881 at Wed Aug 31 11:26:39 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r cd6aa6b82195 -r 104aec1f1721 bin/setup.sh
--- a/bin/setup.sh Wed Aug 31 11:23:50 2011 +0200
+++ b/bin/setup.sh Wed Aug 31 11:26:39 2011 +0200
@@ -359,64 +359,65 @@
# prefer fink over MacPorts
path () {
- do_path "PATH" "${PATH}" "\
-${HOME}/hg/bin \
-${HOME}/bob \
-${local_path}/Adobe/Reader9/bin \
-${local_path}/cxoffice/bin \
-${local_path}/jdk/bin \
-${local_path}/rplayer \
-/bin \
-/opt/SUNWut/bin \
-/opt/SUNWut/sbin \
-/opt/SUNWvts/bin \
-/opt/csw/apache2/bin \
-/opt/csw/apache2/sbin \
-/opt/csw/bin \
-/opt/csw/gcc3/bin \
-_/opt/local/bin \
-_/opt/local/sbin \
-_/sw/bin \
-_/sw/sbin \
-/sbin \
-/usr/X11/bin \
-/usr/bin \
-/usr/bin/X11 \
-/usr/ccs/bin \
-/usr/local/bin \
-/usr/local/bin \
-/usr/local/sbin \
-/usr/openwin/bin \
-/usr/openwin/demo \
-/usr/sbin \
-_${HOME}/keep \
-_${local_path}/bin \
-_${HOME}/emacs/bin \
-"
...
add stand alone tray
File modified: bin/setup.sh
Change880 at Wed Aug 31 11:23:50 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r e7d272176499 -r cd6aa6b82195 bin/setup.sh
--- a/bin/setup.sh Wed Aug 31 09:35:19 2011 +0200
+++ b/bin/setup.sh Wed Aug 31 11:23:50 2011 +0200
@@ -255,82 +255,84 @@
}
apt_install () {
- apt_get_install \
- aspell-en \
- aspell-fr \
- aptitude \
- autoconf \
- automake \
- bzip2 \
- bzr \
- cl-clx-sbcl \
- cl-ppcre \
- diff \
- dnsutils \
- eblook \
- expat \
- exuberant-ctags \
- fetchmail \
- git \
- gkrellm \
- gnupg \
- gnutls-bin \
- gv \
- gzip \
- hashcash \
- imagemagick \
- kakasi \
- k3b \
- less \
- lftp \
- libdbus-1-dev \
- libgif-dev \
- libgnutls-dev \
- libgtk2.0-dev \
- libjpeg62-dev \
- liblockfile-dev \
...
remove from field in e-mail and set random signature
File modified: emacs/init/ivan-message.el
Change879 at Wed Aug 31 09:35:19 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r f8eb47a008af -r e7d272176499 emacs/init/ivan-message.el
--- a/emacs/init/ivan-message.el Wed Aug 31 08:57:08 2011 +0200
+++ b/emacs/init/ivan-message.el Wed Aug 31 09:35:19 2011 +0200
@@ -149,7 +149,18 @@
message-send-mail-function 'smtpmail-send-it
;; do not prompt to split large e-mail
- message-send-mail-partially-limit nil)
+ message-send-mail-partially-limit nil
+
+ ;; remove the header "From" when composing an e-mail. This is
+ ;; required since I query this value just before sending the
+ ;; message. Using the default value would send the wrong header.
+ message-required-mail-headers
+ '(Subject Date (optional . In-Reply-To) Message-ID (optional . User-Agent))
+ message-required-headers '((optional . References))
+
+ ;; Random signature
+ message-signature 'ivan-message-quote)
+
(provide 'ivan-message)
bump nterm version
File modified: emacs/nterm/nterm.el
Change878 at Wed Aug 31 08:57:08 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 2e6845a13bf0 -r f8eb47a008af emacs/nterm/nterm.el
--- a/emacs/nterm/nterm.el Wed Aug 31 08:55:22 2011 +0200
+++ b/emacs/nterm/nterm.el Wed Aug 31 08:57:08 2011 +0200
@@ -6,7 +6,7 @@
;; Author: Ivan Kanis <look-for-me@your-favorite-search.engine>
;; Maintainer: Ivan Kanis <look-for-me@your-favorite-search.engine>
;; Created: 1 Oct 2009
-;; Version: 0.3
+;; Version: 0.4
;; Keywords: terminal shell
;; This file is not part of GNU Emacs.
@@ -15,10 +15,11 @@
;; Copyright is at the bottom of this file
;; Disclaimer: nterm is *alpha* software. It will blow up. Don't blame
-;; me, I warned you! A good terminal emulator architecture has display
-;; memory and a table of functions for each character coming in. I
-;; have been in the terminal emulation business for seven years so I
-;; ought to know.
+;; me, I warned you!
+
+;; A good terminal emulator architecture has display memory and a
+;; table of functions for each character coming in. I have been in the
+;; terminal emulation business for seven years so I ought to know.
;; Nterm is meant to be a full vt100 compatible terminal emulator. It
;; has the following features:
remove emacs fullscreen
File modified: emacs/init/ivan-fun.el emacs/init/ivan-keymap.el
Change877 at Wed Aug 31 08:55:22 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 47b22dc71ce6 -r 2e6845a13bf0 emacs/init/ivan-keymap.el
--- a/emacs/init/ivan-keymap.el Tue Aug 30 18:26:33 2011 +0200
+++ b/emacs/init/ivan-keymap.el Wed Aug 31 08:55:22 2011 +0200
@@ -85,7 +85,6 @@
"a" anything
"c" ivan-compile
"e" vc-dir
- "f" ivan-fun-full-screen
"g" ivan-grep
"h" help-command
"k" ivan-fun-portable-dired
fix tea time
File modified: emacs/misc/tea-time.el
Change876 at Tue Aug 30 18:26:33 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 82a1e8a5d262 -r 47b22dc71ce6 emacs/misc/tea-time.el
--- a/emacs/misc/tea-time.el Tue Aug 30 18:06:00 2011 +0200
+++ b/emacs/misc/tea-time.el Tue Aug 30 18:26:33 2011 +0200
@@ -62,18 +62,18 @@
(setq global-mode-string
(append global-mode-string '(tea-time-display-string))))
(setq tea-time-minute minute
- tea-time-timer (run-at-time t 60 'tea-time-timer))
+ tea-time-timer (run-at-time t 60 'tea-time-every-minute))
(tea-time-update-modeline))
(defun tea-time-update-modeline ()
"Update the modeline."
(setq tea-time-display-string
- (format "T%d" tea-time-minute))
+ (format tea-time-format tea-time-minute))
(force-mode-line-update))
-(defun tea-time-timer ()
+(defun tea-time-every-minute ()
"Function called every minute."
- (decf tea-time-minute)
+ (setq tea-time-minute (- tea-time-minute 1))
(tea-time-update-modeline)
(when (<= tea-time-minute 0)
(when tea-time-raise-frame
new "misc" prefix keymap M-k m
M-k m f mark-defun
M-k m m woman
M-k m p mark-paragraph
File modified: emacs/init/ivan-keymap.el
Change875 at Tue Aug 30 18:06:00 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 6f3fdaf0a53b -r 82a1e8a5d262 emacs/init/ivan-keymap.el
--- a/emacs/init/ivan-keymap.el Tue Aug 30 18:04:54 2011 +0200
+++ b/emacs/init/ivan-keymap.el Tue Aug 30 18:06:00 2011 +0200
@@ -80,7 +80,6 @@
"C-l" recenter-top-bottom
"M-k" kill-this-buffer
"M-r" ivan-compile-recompile
- "M-h" mark-paragraph
"M-l" downcase-word
"K" kill-sentence
"a" anything
@@ -91,7 +90,7 @@
"h" help-command
"k" ivan-fun-portable-dired
"l" find-library
- "m" woman
+ "m" ivan-keymap-misc
"o" ivan-keymap-outline-map
"p" ivan-keymap-player-map
"r" query-replace
@@ -115,6 +114,13 @@
"r" ivan-emms-random-album
"t" emms-add-directory-tree)
+;;; Miscellaneous
+(ivan-keymap-prefix
+ ivan-keymap-misc
+ "f" mark-defun
+ "m" woman
+ "p" mark-paragraph)
+
;;; outline
(ivan-keymap-prefix
ivan-keymap-outline-map
@@ -157,6 +163,7 @@
"C-h" backward-char
"C-l" open-line
"C-o" other-window
+ "C-M-h" backward-sexp
"M-#" calc-dispatch
"M-0" delete-window
...
update for bbdb v3.0, remove late loading
File modified: emacs/init/ivan-bbdb.el
Change874 at Tue Aug 30 18:04:54 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 0fccb78f487c -r 6f3fdaf0a53b emacs/init/ivan-bbdb.el
--- a/emacs/init/ivan-bbdb.el Tue Aug 30 18:03:56 2011 +0200
+++ b/emacs/init/ivan-bbdb.el Tue Aug 30 18:04:54 2011 +0200
@@ -9,8 +9,7 @@
(require 'ivan-fun)
(require 'ivan-load)
(require 'ivan-var)
- (require 'bbdb-com)
- (require 'bbdb-picture))
+ (require 'bbdb-com))
(defvar ivan-bbdb-french-email-match ""
"Regexp that matches french e-mail address")
@@ -22,28 +21,10 @@
"Ivan BBDB prefix keymap")
(ivan-keymap-prefix ivan-bbdb-map
- "b" ivan-bbdb
- "i" ivan-bbdb-create)
+ "b" bbdb
+ "i" bbdb-create)
-(defun ivan-bbdb (string elidep)
- "Like function bbdb with late binding."
- (interactive
- (list (bbdb-search-prompt "Search records %m regexp: ")
- current-prefix-arg))
- (ivan-bbdb-late-bind)
- (bbdb string elidep))
-
-(defun ivan-bbdb-create (record)
- "Like function bbdb-create with late binding."
- (interactive (list (bbdb-read-new-record)))
- (ivan-bbdb-late-bind)
- (bbdb-create record))
-
-(defun ivan-bbdb-late-bind ()
- (unless (fboundp 'advertized-bbdb-delete-current-field-or-record)
- (bbdb-initialize 'gnus 'message)
- (require 'bbdb-com)
- (require 'bbdb-picture)))
...
run emacs with en_US.UTF8
File modified: bin/bgn.sh
Change873 at Tue Aug 30 18:03:56 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 064cba1a160e -r 0fccb78f487c bin/bgn.sh
--- a/bin/bgn.sh Tue Aug 30 18:03:20 2011 +0200
+++ b/bin/bgn.sh Tue Aug 30 18:03:56 2011 +0200
@@ -123,8 +123,8 @@
bgn_private --post
${SHELL}
else
+ export LANG=en_US.UTF-8
emacs.sh --wait ${bgn_start_emacs} &
- export LANG=en_US.UTF-8
screen ${0} --background
fi
run deluge and stalonetray with stump
File modified: conf/stumpwmrc
Change872 at Tue Aug 30 18:03:20 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 7641b46f9c80 -r 064cba1a160e conf/stumpwmrc
--- a/conf/stumpwmrc Tue Aug 30 15:54:26 2011 +0200
+++ b/conf/stumpwmrc Tue Aug 30 18:03:20 2011 +0200
@@ -19,3 +19,7 @@
(run-or-raise "xterm" '(:instance "xterm")))
(define-key *root-map* (kbd "s") "xterm")
+;; stand alone tray for network manager, skype, etc...
+(run-shell-command "stalonetray")
+(run-shell-command "deluge")
+
don't late bind bbdb
File modified: emacs/init/ivan-message.el
Change871 at Tue Aug 30 15:54:26 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r f4efdedc967d -r 7641b46f9c80 emacs/init/ivan-message.el
--- a/emacs/init/ivan-message.el Tue Aug 30 15:45:20 2011 +0200
+++ b/emacs/init/ivan-message.el Tue Aug 30 15:54:26 2011 +0200
@@ -77,7 +77,6 @@
(defun ivan-message-setup ()
"Setup language in a message"
- (ivan-bbdb-late-bind)
(if (not (string= var-init-user "ivan"))
(ivan-message-setup-french)
(let ((string (message-fetch-field "to"))
bump bbdb to version 3.0
File modified: emacs/bbdb/Makefile emacs/bbdb/Makefile.in emacs/bbdb/bbdb-anniv.el emacs/bbdb/bbdb-com.el emacs/bbdb/bbdb-ftp.el emacs/bbdb/bbdb-gnus.el emacs/bbdb/bbdb-gui.el emacs/bbdb/bbdb-hooks.el emacs/bbdb/bbdb-merge.el emacs/bbdb/bbdb-message.el emacs/bbdb/bbdb-mhe.el emacs/bbdb/bbdb-migrate.el emacs/bbdb/bbdb-mua.el emacs/bbdb/bbdb-print.el emacs/bbdb/bbdb-reportmail.el emacs/bbdb/bbdb-rmail.el emacs/bbdb/bbdb-sc.el emacs/bbdb/bbdb-snarf.el emacs/bbdb/bbdb-srv.el emacs/bbdb/bbdb-vm.el emacs/bbdb/bbdb-w3.el emacs/bbdb/bbdb-whois.el emacs/bbdb/bbdb-xemacs.el emacs/bbdb/bbdb.el emacs/bbdb/loadpath.el
Change870 at Tue Aug 30 15:45:20 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 4ff8ffdab3ff -r f4efdedc967d emacs/bbdb/loadpath.el
--- a/emacs/bbdb/loadpath.el Mon Aug 29 15:58:07 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-(setq load-path (append (list
-(expand-file-name ".")
-) load-path))
map C-j s to xterm and C-j w to firefox
File modified: conf/stumpwmrc
Change869 at Mon Aug 29 15:58:07 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 03e373684c10 -r 4ff8ffdab3ff conf/stumpwmrc
--- a/conf/stumpwmrc Mon Aug 29 15:47:45 2011 +0200
+++ b/conf/stumpwmrc Mon Aug 29 15:58:07 2011 +0200
@@ -5,3 +5,17 @@
;; change the prefix key to something else
(set-prefix-key (kbd "C-j"))
(define-key *root-map* (kbd "l") "windowlist")
+
+;; Web browser
+(defcommand firefox () ()
+ "Start Firefox or switch to it, if it is already running."
+ (run-or-raise "firefox" '(:class "Firefox")))
+
+(define-key *root-map* (kbd "w") "firefox")
+
+;; xterm
+(defcommand xterm () ()
+ "Start an xterm instance or switch to it, if it is already running."
+ (run-or-raise "xterm" '(:instance "xterm")))
+(define-key *root-map* (kbd "s") "xterm")
+
use stalonetray with stumpwm to access network-manager
File modified: bin/bgn.sh bin/emacs.sh conf/stalonetrayrc
Change868 at Mon Aug 29 15:47:45 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 3fd8c7ed0953 -r 03e373684c10 conf/stalonetrayrc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/stalonetrayrc Mon Aug 29 15:47:45 2011 +0200
@@ -0,0 +1,1 @@
+window_type normal
fix org style time stamp detection
File modified: emacs/init/ivan-french.el
Change867 at Mon Aug 29 14:25:07 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r f8b6b8af029b -r 3fd8c7ed0953 emacs/init/ivan-french.el
--- a/emacs/init/ivan-french.el Mon Aug 29 09:49:14 2011 +0200
+++ b/emacs/init/ivan-french.el Mon Aug 29 14:25:07 2011 +0200
@@ -100,7 +100,7 @@
Places to avoid are the ERC prompt, e-mail headers and the
timestamp in org mode."
(not (or (ivan-french-match '("ERC> " "cc" "to" "bcc"))
- (eq (ivan-french-search -1) (ivan-french-search 1)))))
+ (ivan-french-in-timestamp))))
(defun ivan-french-match (list)
"Return t if text preceding the cursor matches LIST."
@@ -116,12 +116,21 @@
(setq ret t list nil))
(setq list (cdr list)))) ret))
-(defun ivan-french-search (way)
- "Search for match, return nil or line number."
+(defun ivan-french-in-timestamp ()
+ "See if cursor is in an org style timestamp."
+ (let ((line-number (line-number-at-pos))
+ (line-previous (ivan-french-in-timestamp-ex -1))
+ (line-next (ivan-french-in-timestamp-ex 1)))
+ (and line-previous (= line-previous line-number)
+ line-next (= line-next line-number))))
+
+(defun ivan-french-in-timestamp-ex (way)
+ "Return line position of timestamp character."
(save-excursion
- (when (if (> way 0)
- (search-forward ">" nil t)
- (search-backward "<" nil t))
+ (when
+ (if (> way 0)
+ (search-forward ">" nil t)
+ (search-backward "<" nil t))
(line-number-at-pos))))
(ivan-french-insert-space "question" "?")
...
M-h K kill sentence (by default it's M-k)
File modified: emacs/init/ivan-keymap.el
Change866 at Mon Aug 29 09:49:14 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r f3497de6dc4c -r f8b6b8af029b emacs/init/ivan-keymap.el
--- a/emacs/init/ivan-keymap.el Mon Aug 29 08:28:54 2011 +0200
+++ b/emacs/init/ivan-keymap.el Mon Aug 29 09:49:14 2011 +0200
@@ -82,6 +82,7 @@
"M-r" ivan-compile-recompile
"M-h" mark-paragraph
"M-l" downcase-word
+ "K" kill-sentence
"a" anything
"c" ivan-compile
"e" vc-dir
nohup emacs
File modified: bin/bgn.sh
Change865 at Mon Aug 29 08:28:54 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 0f69a2e6b7c0 -r f3497de6dc4c bin/bgn.sh
--- a/bin/bgn.sh Mon Aug 29 08:22:56 2011 +0200
+++ b/bin/bgn.sh Mon Aug 29 08:28:54 2011 +0200
@@ -117,7 +117,7 @@
fn_check "compilation error"
misc_stuff
build_bzr_emacs
- emacs.sh &
+ nohup emacs -q &
bgn_private --post
${SHELL}
else
load w3m for french dictionary
File modified: emacs/init/ivan-french.el
Change864 at Mon Aug 29 08:22:56 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r f2d1415133ce -r 0f69a2e6b7c0 emacs/init/ivan-french.el
--- a/emacs/init/ivan-french.el Sat Aug 27 18:04:31 2011 +0200
+++ b/emacs/init/ivan-french.el Mon Aug 29 08:22:56 2011 +0200
@@ -15,6 +15,7 @@
(defun ivan-french-dictionary ()
(interactive)
+ (require 'w3m)
(w3m
(concat "http://atilf.atilf.fr/dendien/scripts/fast.exe?mot="
(w3m-url-encode-string
Use time stamp instead of schedule.
File modified: emacs/init/ivan-org.el
Change863 at Sat Aug 27 18:04:31 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r e3142167347b -r f2d1415133ce emacs/init/ivan-org.el
--- a/emacs/init/ivan-org.el Sat Aug 27 10:31:46 2011 +0200
+++ b/emacs/init/ivan-org.el Sat Aug 27 18:04:31 2011 +0200
@@ -92,7 +92,7 @@
"d" ivan-org-agenda-done
"f" org-attach
"o" org-agenda-open-link
- "s" org-agenda-schedule
+ "s" ivan-org-agenda-schedule
"w" ivan-org-agenda-wait)
(ivan-keymap-define org-agenda-mode-map
@@ -127,7 +127,7 @@
"n" ivan-org-sparse-next
"p" ivan-org-publish
"r" org-refile
- "s" org-schedule
+ "s" ivan-org-schedule
"w" ivan-org-sparse-wait)
(ivan-keymap-define org-mode-map
@@ -180,6 +180,23 @@
(buffer-local-value 'w3m-current-url orig-buf)
v-a))
+(defun ivan-org-schedule (arg)
+ "Use time stamp instead of schedule."
+ (interactive "P")
+ (org-back-to-heading)
+ (if (search-forward
+ "<" (save-excursion (outline-end-of-subtree) (point)) t)
+ (forward-char 10)
+ (end-of-line)
+ (insert " "))
+ (org-time-stamp arg))
+
+(defun ivan-org-agenda-schedule (arg)
+ "Use time stamp instead of schedule."
+ (interactive "P")
+ (org-agenda-goto)
+ (ivan-org-schedule arg))
...
add shift modifier on f7
File modified: emacs/init/ivan-keymap.el
Change862 at Sat Aug 27 10:31:46 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r bc2e9e7f9bd4 -r e3142167347b emacs/init/ivan-keymap.el
--- a/emacs/init/ivan-keymap.el Sat Aug 27 10:29:26 2011 +0200
+++ b/emacs/init/ivan-keymap.el Sat Aug 27 10:31:46 2011 +0200
@@ -189,6 +189,7 @@
(define-key function-key-map [f5] 'event-apply-control-modifier)
(define-key function-key-map [f6] 'event-apply-meta-modifier)
+(define-key function-key-map [f7] 'event-apply-shift-modifier)
(provide 'ivan-keymap)
remove standard backward motion key binding
File modified: emacs/init/ivan-keymap.el
Change861 at Sat Aug 27 10:29:26 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r d03559966df0 -r bc2e9e7f9bd4 emacs/init/ivan-keymap.el
--- a/emacs/init/ivan-keymap.el Sat Aug 27 10:29:04 2011 +0200
+++ b/emacs/init/ivan-keymap.el Sat Aug 27 10:29:26 2011 +0200
@@ -152,6 +152,7 @@
"<kp-insert>" ivan-lookup
"<select>" end-of-buffer
"C-\\" nil
+ "C-b" nil
"C-h" backward-char
"C-l" open-line
"C-o" other-window
@@ -159,6 +160,7 @@
"M-0" delete-window
"M-1" delete-other-windows
"M-2" split-window-vertically
+ "M-b" nil
"M-h" backward-word
"M-i" ivan-keymap-map-m-i
"M-k" ivan-keymap-map-m-k
Don't insert non breaking space on ERC prompt, e-mail headers and the
timestamp in org mode
File modified: emacs/init/ivan-french.el
Change860 at Sat Aug 27 10:29:04 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 2c614a19250b -r d03559966df0 emacs/init/ivan-french.el
--- a/emacs/init/ivan-french.el Sat Aug 27 10:27:56 2011 +0200
+++ b/emacs/init/ivan-french.el Sat Aug 27 10:29:04 2011 +0200
@@ -85,11 +85,43 @@
space if it exists. This useful after expanding an abbreviation."
`(defun ,(intern (concat "ivan-french-" symbol)) ()
(interactive)
- (let* ((point (point))
- (end (if (> point 0) (- point 1))))
- (if (re-search-backward " " end t)
- (delete-char 1)))
- (insert ,(concat "Â " char))))
+ (if (ivan-french-insert-space-ok)
+ (progn
+ (let* ((point (point))
+ (end (if (> point 0) (- point 1))))
+ (if (re-search-backward " " end t)
+ (delete-char 1)))
+ (insert ,(concat "Â " char)))
+ (insert ,char))))
+
+(defun ivan-french-insert-space-ok ()
+ "Return t when it's OK to insert non breaking space.
+Places to avoid are the ERC prompt, e-mail headers and the
+timestamp in org mode."
+ (not (or (ivan-french-match '("ERC> " "cc" "to" "bcc"))
+ (eq (ivan-french-search -1) (ivan-french-search 1)))))
+
+(defun ivan-french-match (list)
+ "Return t if text preceding the cursor matches LIST."
+ (let ((point (point))
+ (ret nil))
+ (while list
+ (let* ((string (car list))
+ (length (length string))
+ (start (- point length)))
+ (and (> point length)
+ (= start (line-beginning-position))
+ (string= (buffer-substring start point) string)
+ (setq ret t list nil))
+ (setq list (cdr list)))) ret))
...
add multi processors to abcde configuration
File modified: conf/abcde.conf
Change859 at Sat Aug 27 10:27:56 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 35a3925a5004 -r 2c614a19250b conf/abcde.conf
--- a/conf/abcde.conf Fri Aug 26 14:52:18 2011 +0200
+++ b/conf/abcde.conf Sat Aug 27 10:27:56 2011 +0200
@@ -4,6 +4,7 @@
WAVOUTPUTDIR=${HOME}/tmp
OUTPUTFORMAT='${ARTISTFILE}/${ALBUMFILE}/${TRACKNUM} - ${TRACKFILE}'
EJECTCD=y
+MAXPROCS=4
mungefilename ()
{
fix emacs url
File modified: emacs/init/ivan-erc.el
Change858 at Fri Aug 26 14:52:18 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 9471bf1f0dee -r 35a3925a5004 emacs/init/ivan-erc.el
--- a/emacs/init/ivan-erc.el Fri Aug 26 14:51:52 2011 +0200
+++ b/emacs/init/ivan-erc.el Fri Aug 26 14:52:18 2011 +0200
@@ -107,13 +107,13 @@
(let* ((list (ivan-erc-my-lisp-list))
(library (completing-read "Library to publish: " list))
(vc (car (last (split-string ivan-var-vc-dir "/") 2))))
- (insert (concat "http://kanis.fr/" vc "/lisp/emacs.d/ivan-"
+ (insert (concat "http://kanis.fr/" vc "/emacs/init/ivan-"
library ".el"))))
(defun ivan-erc-my-lisp-list ()
"Return list of my customized lisp files"
(let ((list (directory-files
- (concat ivan-var-vc-dir "lisp/emacs.d")))
+ (concat ivan-var-vc-dir "emacs/init")))
(ret nil)
el)
(while list
attempt bootstrap if regular make failed
spawn screen with setup english local
File modified: bin/bgn.sh
Change857 at Fri Aug 26 14:51:52 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 6a68a63b7d24 -r 9471bf1f0dee bin/bgn.sh
--- a/bin/bgn.sh Fri Aug 26 14:50:13 2011 +0200
+++ b/bin/bgn.sh Fri Aug 26 14:51:52 2011 +0200
@@ -3,18 +3,21 @@
build_bzr_emacs () {
bbe_src=${HOME}/src/emacs-bzr/trunk
bbe_pwd=`pwd`
- bbe_cmd=make
if test -d ${bbe_src} ; then
cd ${bbe_src}
bzr pull
case `hostname -s` in
- tao) bbe_cmd="${bbe_cmd} -j4" ;;
- yan) bbe_cmd="${bbe_cmd} -j2" ;;
+ tao) bbe_make="make -j4" ;;
+ yan) bbe_make="make -j2" ;;
esac
- ${bbe_cmd}
+ ${bbe_make}
+ if test $? -ne 0 ; then
+ ${bbe_make} bootstrap
+ fn_check "error building bzr emacs"
+ fi
make install
- fn_check "error building bzr emacs"
+ fn_check "error installing bzr emacs"
cd ${bbe_pwd}
fi
}
@@ -119,7 +122,8 @@
${SHELL}
else
launch_browser
- exec screen ${0} --background
+ export LANG=en_US.UTF-8
+ screen ${0} --background
fi
# Local Variables:
...
abcde config
File modified: conf/abcde.conf
Change856 at Fri Aug 26 14:50:13 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 8f1b08b5626e -r 6a68a63b7d24 conf/abcde.conf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/abcde.conf Fri Aug 26 14:50:13 2011 +0200
@@ -0,0 +1,13 @@
+OUTPUTTYPE=mp3
+PADTRACKS=y
+OUTPUTDIR=/media/portable/music
+WAVOUTPUTDIR=${HOME}/tmp
+OUTPUTFORMAT='${ARTISTFILE}/${ALBUMFILE}/${TRACKNUM} - ${TRACKFILE}'
+EJECTCD=y
+
+mungefilename ()
+{
+ echo "$@" | sed s,:,\ -,g | tr / _ | tr -d \'\"\?\[:cntrl:\]
+}
+
+
fix fn_exists with zsh
- check that build of emacs succeed
File modified: bin/bgn.sh bin/function.sh
Change855 at Thu Aug 25 18:01:52 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 7c436d2f7100 -r 8f1b08b5626e bin/function.sh
--- a/bin/function.sh Tue Aug 23 09:04:52 2011 +0200
+++ b/bin/function.sh Thu Aug 25 18:01:52 2011 +0200
@@ -425,43 +425,11 @@
done
fn_print "An e-mail has been sent\n"
rm email.txt email2.txt
-
}
-# 1 subject
-# 2 error
-# 3 VRDP port
-fn_mail_ko () {
- fmk_subject="${1}"
- fmk_error="${2}"
- fmk_port="${3}"
-
- fn_mail_subject "[build] KO ${fmk_subject}"
- fn_mail_body "The error message is:
-
-${fmk_error}
-
-You can connect to the build server with the following command:
-
-mstsc bld:${fmk_port}
-
-The full log file is available at:
-
-${fn_log}
-
-"
- grep -i error ${fn_log} | grep -v 'errorreport\|0 error' | \
-tail -n 100 > last-errors.txt
- tail -n 100 ${fn_log} > end-of-log.txt
- fn_mail_attach "last-errors.txt end-of-log.txt"
- rm last-errors.txt end-of-log.txt
- fn_check "Failed to remove last-errors.txt and end-of-log.txt"
-}
-
-
...
unbind left so that I use C-h instead
- remove primary paste function
- map f5 and f6 to contro and meta modifier
File modified: emacs/init/ivan-fun.el emacs/init/ivan-keymap.el
Change854 at Tue Aug 23 09:04:52 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r c5ff89badb96 -r 7c436d2f7100 emacs/init/ivan-keymap.el
--- a/emacs/init/ivan-keymap.el Tue Aug 23 09:01:42 2011 +0200
+++ b/emacs/init/ivan-keymap.el Tue Aug 23 09:04:52 2011 +0200
@@ -87,7 +87,7 @@
"e" vc-dir
"f" ivan-fun-full-screen
"g" ivan-grep
- "h" help-for-help
+ "h" help-command
"k" ivan-fun-portable-dired
"l" find-library
"m" woman
@@ -164,7 +164,7 @@
"M-k" ivan-keymap-map-m-k
"M-o" other-frame
"M-x" ivan-fun-execute
- "<XF86Paste>" ivan-fun-paste-primary)
+ "<left>" nil)
;;; global keymap c-x
(ivan-keymap-global-c-x
@@ -185,6 +185,9 @@
"C-x m" ivan-gnus-mail
"C-x o" nil)
+(define-key function-key-map [f5] 'event-apply-control-modifier)
+(define-key function-key-map [f6] 'event-apply-meta-modifier)
+
(provide 'ivan-keymap)
;; Copyright (C) 2007 Ivan Kanis
unbind left so that I use C-h instead
File modified: conf/zshrc
Change853 at Tue Aug 23 09:01:42 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r c1e8710ce2e1 -r c5ff89badb96 conf/zshrc
--- a/conf/zshrc Tue Aug 23 08:21:06 2011 +0200
+++ b/conf/zshrc Tue Aug 23 09:01:42 2011 +0200
@@ -44,6 +44,8 @@
bindkey '^h' backward-char
bindkey '\eh' backward-word
bindkey '\ekh' run-help
+bindkey -r '\eOD'
+bindkey -r '\e[D'
# History sharing and huge size
HISTSIZE=10000
prefix tea time format with a space
File modified: emacs/misc/tea-time.el
Change852 at Tue Aug 23 08:21:06 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 85559045258c -r c1e8710ce2e1 emacs/misc/tea-time.el
--- a/emacs/misc/tea-time.el Tue Aug 23 07:07:23 2011 +0200
+++ b/emacs/misc/tea-time.el Tue Aug 23 08:21:06 2011 +0200
@@ -24,7 +24,7 @@
;;; Usage:
;;
-;; 1. Interactively call (tea-time)
+;; 1. Interactively call M-x tea-time
;; 2. Enter period in minutes if you want to start timer
;;
;; Suggested binding:
@@ -41,7 +41,7 @@
(defvar tea-time-raise-frame t
"Non nil indicates to raise frame when tea is ready.")
-(defvar tea-time-format "T%d "
+(defvar tea-time-format " T%d "
"String used to display time in the modeline.")
(defvar tea-time-display-string ""
@@ -90,6 +90,7 @@
(run-hooks 'tea-time-hook)))
(provide 'tea-time)
+
;;; tea-time.el ends here
;; Author: Ivan Kanis
C-h moves backward in zsh
File modified: conf/zshrc
Change851 at Tue Aug 23 07:07:23 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 4e8a6f1c30f5 -r 85559045258c conf/zshrc
--- a/conf/zshrc Mon Aug 22 20:35:07 2011 +0200
+++ b/conf/zshrc Tue Aug 23 07:07:23 2011 +0200
@@ -41,6 +41,9 @@
bindkey '^w' kill-region
bindkey '^q' push-line-or-edit
bindkey '^i' expand-or-complete-prefix
+bindkey '^h' backward-char
+bindkey '\eh' backward-word
+bindkey '\ekh' run-help
# History sharing and huge size
HISTSIZE=10000
map C-h and M-h to left movement
File modified: emacs/init/ivan-keymap.el
Change850 at Mon Aug 22 20:35:07 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 6d38e71dd0a8 -r 4e8a6f1c30f5 emacs/init/ivan-keymap.el
--- a/emacs/init/ivan-keymap.el Mon Aug 22 18:38:05 2011 +0200
+++ b/emacs/init/ivan-keymap.el Mon Aug 22 20:35:07 2011 +0200
@@ -60,7 +60,6 @@
"b" ivan-bbdb-map
"c" ivan-calendar
"e" ivan-keymap-english-map
- "d" downcase-word
"f" ivan-keymap-french-map
"g" ivan-w3m-open-or-search
"i" ivan-erc
@@ -78,13 +77,17 @@
;;; M-k
(ivan-keymap-prefix
ivan-keymap-map-m-k
+ "C-l" recenter-top-bottom
"M-k" kill-this-buffer
"M-r" ivan-compile-recompile
+ "M-h" mark-paragraph
+ "M-l" downcase-word
"a" anything
"c" ivan-compile
"e" vc-dir
"f" ivan-fun-full-screen
"g" ivan-grep
+ "h" help-for-help
"k" ivan-fun-portable-dired
"l" find-library
"m" woman
@@ -149,16 +152,16 @@
"<kp-insert>" ivan-lookup
"<select>" end-of-buffer
"C-\\" nil
- "C-l" backward-char
+ "C-h" backward-char
+ "C-l" open-line
"C-o" other-window
"M-#" calc-dispatch
"M-0" delete-window
"M-1" delete-other-windows
"M-2" split-window-vertically
...
put a space before pomodoro format
File modified: emacs/ivan/pomodoro.el
Change849 at Mon Aug 22 18:38:05 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r 76ada917890e -r 6d38e71dd0a8 emacs/ivan/pomodoro.el
--- a/emacs/ivan/pomodoro.el Mon Aug 22 08:48:50 2011 +0200
+++ b/emacs/ivan/pomodoro.el Mon Aug 22 18:38:05 2011 +0200
@@ -83,10 +83,10 @@
The function take one argument that is the message to be
diplayed")
-(defvar pomodoro-work-format "W%d-%d "
+(defvar pomodoro-work-format " W%d-%d "
"String displayed in the modeline when working.")
-(defvar pomodoro-break-format "B%d-%d "
+(defvar pomodoro-break-format " B%d-%d "
"String displayed in the modeline for a break.")
(defvar pomodoro-long-break-format "LB-%d "
merg
File modified: bin/bgn.sh bin/emacs.sh
Change848 at Mon Aug 22 08:48:50 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r 36e2c2916200 -r 76ada917890e bin/emacs.sh
--- a/bin/emacs.sh Sun Aug 21 21:10:39 2011 +0200
+++ b/bin/emacs.sh Mon Aug 22 08:48:50 2011 +0200
@@ -10,7 +10,8 @@
bzr_emacs=${HOME}/emacs-bzr
if test -d ${bzr_emacs} && test x${IVAN_USER} = xivan ; then
- exec ${bzr_emacs}/bin/emacs $* > /dev/null 2>&1
+ nohup ${bzr_emacs}/bin/emacs $* > /dev/null 2>&1 &
+ exit
fi
# prevent GUI agent window popping up
add post and pre flags to private script
remove host specific functions
File modified: bin/bgn.sh
Change847 at Sun Aug 21 21:10:39 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r efbcde089da1 -r 36e2c2916200 bin/bgn.sh
--- a/bin/bgn.sh Fri Aug 05 10:57:02 2011 +0200
+++ b/bin/bgn.sh Sun Aug 21 21:10:39 2011 +0200
@@ -18,29 +18,6 @@
fi
}
-update_web () {
- uw_dest="kanis.fr:~/www/"
- uw_hg="${HOME}/tmp/hg"
-
- python ${VC_DIR}/bin/hg2rss.py
- fn_check "Failed to update RSS mercurial blog"
- python "${VC_DIR}/bin/blog-archive.py"
- fn_check "Failed to update archive blog"
- cat ${VC_DIR}/bin/function.sh ${VC_DIR}/bin/setup.sh > \
- ${WEB_DIR}/bootstrap.sh
- fn_rsync_net ${WEB_DIR}/ ${uw_dest}
- fn_rsync_net ${VC_DIR}/ ${uw_dest}hg/ --exclude=.hg
-}
-
-backup_kanis_fr () {
- server_src="ivan@kanis.fr:~/keep"
-
- for src in ${server_src}
- do
- fn_rsync_net "${src}" "${HOME}/backup/kanis-fr"
- done
-}
-
mercurial_pull () {
mp_src="${1}"
mp_dest="${2}"
@@ -67,13 +44,6 @@
fi
}
-ssh_key_password () {
- if test "x${host_name}" = "xtao" ; then
- ssh-add
- fn_check "password error with private key"
...
jump to random file in dired
File modified: emacs/init/ivan-dired.el
Change846 at Fri Aug 05 10:57:02 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 44222842c1a1 -r efbcde089da1 emacs/init/ivan-dired.el
--- a/emacs/init/ivan-dired.el Fri Aug 05 10:21:00 2011 +0200
+++ b/emacs/init/ivan-dired.el Fri Aug 05 10:57:02 2011 +0200
@@ -39,8 +39,19 @@
(turn-on-gnus-dired-mode)
(ivan-keymap-keep-global dired-mode-map)
(ivan-keymap-define dired-mode-map "M-j" ivan-dired-map-m-j)
+ (ivan-keymap-define dired-mode-map
+ "j" gnus-dired-find-file-mailcap
+ "r" ivan-dired-jump-random)
(dired-omit-mode 1))
+(defun ivan-dired-jump-random ()
+ "Move cursor to a random file."
+ (interactive)
+ (random t)
+ (goto-char (point-min))
+ (forward-line
+ (+ (random (- (count-lines (point-min) (point-max)) 2)) 2)))
+
(add-hook 'dired-mode-hook 'ivan-dired-hook)
(add-hook 'dired-mode-hook 'turn-on-gnus-dired-mode)
@@ -61,8 +72,7 @@
"c" wdired-change-to-wdired-mode
"e" ivan-emms-add-dired
"o" dired-omit-mode
- "p" ivan-emms-play-dired
- "M-j" gnus-dired-find-file-mailcap)
+ "p" ivan-emms-play-dired)
(setq
dired-dwim-target t
bind M-j ; to comment or uncomment in lisp file
File modified: emacs/init/ivan-lisp.el emacs/init/ivan-slime.el
Change845 at Fri Aug 05 10:21:00 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 6862a9d0757b -r 44222842c1a1 emacs/init/ivan-slime.el
--- a/emacs/init/ivan-slime.el Fri Aug 05 10:20:38 2011 +0200
+++ b/emacs/init/ivan-slime.el Fri Aug 05 10:21:00 2011 +0200
@@ -23,6 +23,7 @@
(defun ivan-slime-mode-hook ()
(ivan-keymap-define slime-mode-map
+ "M-j ;" comment-or-uncomment-region
"M-j d" slime-doc-map
"M-j i" slime-inspect
"M-j j" slime-eval-last-expression
let user define modeline format
File modified: emacs/ivan/pomodoro.el
Change844 at Fri Aug 05 10:20:38 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 606e79c7f888 -r 6862a9d0757b emacs/ivan/pomodoro.el
--- a/emacs/ivan/pomodoro.el Fri Aug 05 09:58:15 2011 +0200
+++ b/emacs/ivan/pomodoro.el Fri Aug 05 10:20:38 2011 +0200
@@ -83,6 +83,15 @@
The function take one argument that is the message to be
diplayed")
+(defvar pomodoro-work-format "W%d-%d "
+ "String displayed in the modeline when working.")
+
+(defvar pomodoro-break-format "B%d-%d "
+ "String displayed in the modeline for a break.")
+
+(defvar pomodoro-long-break-format "LB-%d "
+ "String displayed in the modeline for a long break.")
+
(defvar pomodoro-display-string "")
(defvar pomodoro-minute)
(defvar pomodoro-set)
@@ -153,11 +162,14 @@
"Update the modeline."
(setq pomodoro-display-string
(cond ((eq pomodoro-state 'work)
- (format "W%d-%d" pomodoro-set pomodoro-minute))
+ (format pomodoro-work-format
+ pomodoro-set pomodoro-minute))
((eq pomodoro-state 'short-break)
- (format "B%d-%d" pomodoro-set pomodoro-minute))
+ (format pomodoro-break-format
+ pomodoro-set pomodoro-minute))
(t
- (format "LB-%d" pomodoro-minute))))
+ (format pomodoro-long-break-format
+ pomodoro-minute))))
(force-mode-line-update))
(defun pomodoro-message (msg)
tea-time.el complete rewrite
File modified: emacs/misc/tea-time.el
Change843 at Fri Aug 05 09:58:15 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 6acb116d5139 -r 606e79c7f888 emacs/misc/tea-time.el
--- a/emacs/misc/tea-time.el Thu Aug 04 19:23:30 2011 +0200
+++ b/emacs/misc/tea-time.el Fri Aug 05 09:58:15 2011 +0200
@@ -3,6 +3,97 @@
;; Author: konsty <antipin.konstantin@googlemail.com>
;; Keywords: timer tea-time
+;;; Commentary:
+
+;; This package allows you to set up time intervals and after this
+;; inteval is elapsed Emacs will notify you. It could be useful if
+;; you like make a tea or if you would like to be more productive by
+;; setting time limit for a task.
+
+;;; THANKS
+;; konsty <antipin.konstantin@googlemail.com> for the orignal tea-time.el
+;; Origin comes from http://www.hack.org/mc/files/.emacs.el
+
+;;; Requirements:
+
+;;; Installation:
+
+;; Add below code in your .emacs
+;;
+;; (require 'tea-time)
+
+;;; Usage:
+;;
+;; 1. Interactively call (tea-time)
+;; 2. Enter period in minutes if you want to start timer
+;;
+;; Suggested binding:
+;; (define-key global-map "\C-ct" 'tea-time)
+
+;;; Code:
+
+(defvar tea-time-buffer-name "*tea time*"
+ "Name of the tea time buffer.")
+
+(defvar tea-time-hook nil
+ "Hook run on tea time notification.")
...
put an empty string when quitting pomodoro
File modified: emacs/ivan/pomodoro.el
Change842 at Thu Aug 04 19:23:30 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r dc068067a254 -r 6acb116d5139 emacs/ivan/pomodoro.el
--- a/emacs/ivan/pomodoro.el Thu Aug 04 19:22:44 2011 +0200
+++ b/emacs/ivan/pomodoro.el Thu Aug 04 19:23:30 2011 +0200
@@ -119,7 +119,7 @@
(interactive)
(when pomodoro-timer
(cancel-timer pomodoro-timer))
- (delq 'pomodoro-display-string global-mode-string)
+ (setq pomodoro-display-string "")
(when (get-buffer pomodoro-buffer-name)
(kill-buffer "*pomodoro*")))
fix pop up of message bufffer with elim
File modified: emacs/elim/elisp/garak.el emacs/init/ivan-elim.el
Change841 at Thu Aug 04 19:22:44 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 2579bde640b6 -r dc068067a254 emacs/init/ivan-elim.el
--- a/emacs/init/ivan-elim.el Thu Aug 04 18:46:42 2011 +0200
+++ b/emacs/init/ivan-elim.el Thu Aug 04 19:22:44 2011 +0200
@@ -23,15 +23,13 @@
(file-exists-p elim-executable)
(garak))))
-(defun ivan-elim-pop-buffer
- (process buffer ctype flags who title is-new text args)
+(defun ivan-elim-pop-buffer ()
"Pop buffer on incoming messages."
(pop-to-buffer buffer t nil nil)
(raise-frame))
(setq
elim-executable (expand-file-name "~/.emacs.d/elim/elim-client")
- garak-alert-methods '(ivan-elim-pop-buffer)
garak-icon-directory (expand-file-name "~/.emacs.d/elim/icons/")
garak-ui-buffer-name "*chat*"
tracking-mode-map
@@ -39,6 +37,8 @@
(define-key map (kbd "C-c SPC") 'tracking-next-buffer)
map))
+(add-hook 'ivan-elim-hook 'ivan-elim-pop-buffer)
+
(provide 'ivan-elim)
;; Local Variables:
fix pop up of elim buffer
File modified: emacs/init/ivan-elim.el
Change840 at Thu Aug 04 18:46:42 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 2215a11854ea -r 2579bde640b6 emacs/init/ivan-elim.el
--- a/emacs/init/ivan-elim.el Thu Aug 04 18:46:12 2011 +0200
+++ b/emacs/init/ivan-elim.el Thu Aug 04 18:46:42 2011 +0200
@@ -26,8 +26,8 @@
(defun ivan-elim-pop-buffer
(process buffer ctype flags who title is-new text args)
"Pop buffer on incoming messages."
- (pop-to-buffer buffer)
- (raise-frame (selected-frame)))
+ (pop-to-buffer buffer t nil nil)
+ (raise-frame))
(setq
elim-executable (expand-file-name "~/.emacs.d/elim/elim-client")
don't impose garak color in modeline
File modified: emacs/elim/elisp/lui.el
Change839 at Thu Aug 04 18:46:12 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 56525477cae3 -r 2215a11854ea emacs/elim/elisp/lui.el
--- a/emacs/elim/elisp/lui.el Thu Aug 04 17:58:00 2011 +0200
+++ b/emacs/elim/elisp/lui.el Thu Aug 04 18:46:12 2011 +0200
@@ -770,9 +770,7 @@
(lui-read-only)
(when (and (not not-tracked-p)
(not (get-text-property (point) 'lui-fool)))
- (tracking-add-buffer (current-buffer)
- faces)))))))
- )
+ (tracking-add-buffer (current-buffer)))))))))
(defun lui-adjust-undo-list (list old-begin shift)
"Adjust undo positions in LIST by SHIFT.
fix php mode by removing make-local-hook
File modified: emacs/misc/php-mode.el
Change838 at Thu Aug 04 17:58:00 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 455dbaa4a32f -r 56525477cae3 emacs/misc/php-mode.el
--- a/emacs/misc/php-mode.el Thu Aug 04 17:57:25 2011 +0200
+++ b/emacs/misc/php-mode.el Thu Aug 04 17:58:00 2011 +0200
@@ -211,8 +211,6 @@
(set (make-local-variable 'require-final-newline) nil)
(set (make-local-variable 'next-line-add-newlines) nil)
- ;; PEAR coding standards
- (make-local-hook 'php-mode-pear-hook)
(add-hook 'php-mode-pear-hook
(lambda nil (set (make-local-variable 'tab-width) 4)) nil t)
(add-hook 'php-mode-pear-hook
fix bbdb field name
File modified: emacs/bbdb/bbdb-gui.el
Change837 at Thu Aug 04 17:57:25 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r c2a7a6c5741a -r 455dbaa4a32f emacs/bbdb/bbdb-gui.el
--- a/emacs/bbdb/bbdb-gui.el Thu Aug 04 17:51:46 2011 +0200
+++ b/emacs/bbdb/bbdb-gui.el Thu Aug 04 17:57:25 2011 +0200
@@ -86,10 +86,6 @@
(or (bbdb-find-face 'bbdb-field-value)
(make-face 'bbdb-field-value))
-(or (bbdb-find-face 'bbdb-field-name)
- (face-differs-from-default-p (make-face 'bbdb-field-name))
- (copy-face 'bold 'bbdb-field-name))
-
;;; Extents vs. Overlays unhappiness
;;; FIXME: see if VM is around, and call its extents code instead;
;;; change bbdb-foo-extents below to vm-foo-extents, etc.
fix gradient color in org and gnus
File modified: emacs/init/ivan-face.el
Change836 at Thu Aug 04 17:51:46 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r fd7ad752c573 -r c2a7a6c5741a emacs/init/ivan-face.el
--- a/emacs/init/ivan-face.el Thu Aug 04 17:38:43 2011 +0200
+++ b/emacs/init/ivan-face.el Thu Aug 04 17:51:46 2011 +0200
@@ -65,7 +65,7 @@
(setq color-string (ivan-face-color color-string bright-background))
(ivan-face-2 face color-string color reverse))))
-(defun ivan-face-2 (face color-string color reverse)
+(defun ivan-face-2 (face color-string color reverse)
"Apply COLOR-STRING to FACE.
When REVERSE is t it indicates the foreground and background are
swapped. It checks COLOR as it might be set underline"
@@ -105,12 +105,10 @@
(let ((face (make-face
(intern
(concat face-prefix (number-to-string (1+ num)))))))
- (set-face-attribute face
- nil :foreground
- (ivan-face-hex (nth num red)
- (nth num green)
- (nth num blue))))
- (set 'num (1+ num)))))
+ (ivan-face-2 face (ivan-face-hex (nth num red)
+ (nth num green)
+ (nth num blue)) nil nil)
+ (set 'num (1+ num))))))
(custom-set-faces
;; I don't use italic...
fix switching to article if it exists in ivan-gnus
File modified: emacs/init/ivan-gnus.el
Change835 at Thu Aug 04 17:38:43 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r d7f62537e01f -r fd7ad752c573 emacs/init/ivan-gnus.el
--- a/emacs/init/ivan-gnus.el Thu Aug 04 15:49:08 2011 +0200
+++ b/emacs/init/ivan-gnus.el Thu Aug 04 17:38:43 2011 +0200
@@ -29,46 +29,54 @@
"Start Gnus or switch to buffer if it's already running"
(interactive)
(if ivan-gnus-init
- (let ((article (get-buffer "*Article*")))
- (if (and article
- (buffer-name
- (buffer-local-value 'gnus-article-current-summary article)))
- (switch-to-buffer article)
- (ivan-fun-start-or-switch 'gnus "*Group*")))
- ;; Initialize gnus
- (progn
- (setq ivan-gnus-init t)
- (run-hooks 'ivan-gnus-init-hook)
- (require 'gnus-art)
- ;; Windows layout
- (gnus-add-configuration
- '(article (vertical 1.0
- (summary .50 point)
- (article 1.0))))
+ (when (not (ivan-gnus-open-article))
+ (ivan-fun-start-or-switch 'gnus "*Group*"))
+ (setq ivan-gnus-init t)
+ (run-hooks 'ivan-gnus-init-hook)
+ (require 'gnus-art)
+ ;; Windows layout
+ (gnus-add-configuration
+ '(article (vertical 1.0
+ (summary .50 point)
+ (article 1.0))))
- ;; prevent moving cursor to colon in summary
- (defalias 'gnus-summary-position-point 'beginning-of-line)
+ ;; prevent moving cursor to colon in summary
+ (defalias 'gnus-summary-position-point 'beginning-of-line)
- ;; Fix a couple of annoyances when moving to next group
- (defadvice gnus-summary-next-group (before ivan-gnus-next-group activate)
...
fix templates
File modified: emacs/init/ivan-autoinsert.el
Change834 at Thu Aug 04 15:49:08 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 846dd3ffe6af -r d7f62537e01f emacs/init/ivan-autoinsert.el
--- a/emacs/init/ivan-autoinsert.el Thu Aug 04 14:49:58 2011 +0200
+++ b/emacs/init/ivan-autoinsert.el Thu Aug 04 15:49:08 2011 +0200
@@ -36,24 +36,24 @@
(insert "#!/usr/bin/env python
# -*- coding: utf-8 -*-\n")
(ivan-autoinsert-insert "#" ivan-autoinsert-top-comment)
- (insert "\n\nif __name__ == \"__main__\":\n ")
+ (insert "\nif __name__ == \"__main__\":\n ")
(save-excursion
(insert "\n\n")
+ (ivan-autoinsert-insert "#" ivan-autoinsert-bottom-comment)
+ (insert "\n")
(ivan-autoinsert-local-variables "#" "python")
- (ivan-autoinsert-insert "#" ivan-autoinsert-bottom-comment)
(insert "\n")))
(defun ivan-autoinsert-perl ()
"Perl template"
(insert "#!/usr/bin/env perl\n")
(ivan-autoinsert-insert "#" ivan-autoinsert-top-comment)
- (insert "\n
-use strict;
-use warnings;\n\n")
+ (insert "\nuse strict;\nuse warnings;\n\n")
(save-excursion
(insert "\n\n")
+ (ivan-autoinsert-insert "#" ivan-autoinsert-bottom-comment)
+ (insert "\n")
(ivan-autoinsert-local-variables "#" "perl")
- (ivan-autoinsert-insert "#" ivan-autoinsert-bottom-comment)
(insert "\n")))
(defun ivan-autoinsert-php ()
@@ -63,8 +63,9 @@
(insert "\n")
(save-excursion
(insert "\n\n")
+ (ivan-autoinsert-insert "//" ivan-autoinsert-bottom-comment)
+ (insert "\n")
(ivan-autoinsert-local-variables "//" "phpunit ." t)
...
Map agedan open link to M-j o
File modified: emacs/init/ivan-org.el
Change833 at Thu Aug 04 14:49:58 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 069eaff39c8c -r 846dd3ffe6af emacs/init/ivan-org.el
--- a/emacs/init/ivan-org.el Thu Aug 04 14:49:15 2011 +0200
+++ b/emacs/init/ivan-org.el Thu Aug 04 14:49:58 2011 +0200
@@ -91,6 +91,7 @@
"b" org-agenda-list-stuck-projects
"d" ivan-org-agenda-done
"f" org-attach
+ "o" org-agenda-open-link
"s" org-agenda-schedule
"w" ivan-org-agenda-wait)
fix space and add some comments
File modified: emacs/init/ivan-keymap.el
Change832 at Thu Aug 04 14:49:15 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 269092e26405 -r 069eaff39c8c emacs/init/ivan-keymap.el
--- a/emacs/init/ivan-keymap.el Thu Aug 04 14:46:51 2011 +0200
+++ b/emacs/init/ivan-keymap.el Thu Aug 04 14:49:15 2011 +0200
@@ -75,6 +75,7 @@
"v" volume
"w" ivan-w3m)
+;;; M-k
(ivan-keymap-prefix
ivan-keymap-map-m-k
"M-k" kill-this-buffer
@@ -110,9 +111,10 @@
"r" ivan-emms-random-album
"t" emms-add-directory-tree)
+;;; outline
(ivan-keymap-prefix
ivan-keymap-outline-map
- " " outline-mark-subtree
+ "SPC" outline-mark-subtree
"n" outline-next-visible-heading
"p" outline-previous-visible-heading
"i" show-children
fix outline keymap
File modified: emacs/init/ivan-keymap.el
Change831 at Thu Aug 04 14:46:51 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 1c65b0325f7f -r 269092e26405 emacs/init/ivan-keymap.el
--- a/emacs/init/ivan-keymap.el Thu Aug 04 14:32:03 2011 +0200
+++ b/emacs/init/ivan-keymap.el Thu Aug 04 14:46:51 2011 +0200
@@ -87,7 +87,7 @@
"k" ivan-fun-portable-dired
"l" find-library
"m" woman
- "o" outline-mode-prefix-map
+ "o" ivan-keymap-outline-map
"p" ivan-keymap-player-map
"r" query-replace
"s" ivan-xcscope-key-map
@@ -110,6 +110,31 @@
"r" ivan-emms-random-album
"t" emms-add-directory-tree)
+(ivan-keymap-prefix
+ ivan-keymap-outline-map
+ " " outline-mark-subtree
+ "n" outline-next-visible-heading
+ "p" outline-previous-visible-heading
+ "i" show-children
+ "s" show-subtree
+ "d" hide-subtree
+ "u" outline-up-heading
+ "f" outline-forward-same-level
+ "b" outline-backward-same-level
+ "t" hide-body
+ "a" show-all
+ "c" hide-entry
+ "e" show-entry
+ "l" hide-leaves
+ "k" show-branches
+ "q" hide-sublevels
+ "o" hide-other
+ "^" outline-move-subtree-up
+ "v" outline-move-subtree-down
+ "<M-right>" outline-promote
+ "<M-left>" outline-demote
+ "C-m" outline-insert-heading)
+
...
only update binaries files in elim
File modified: emacs/elim/Makefile
Change830 at Thu Aug 04 14:32:03 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r c8d15e980119 -r 1c65b0325f7f emacs/elim/Makefile
--- a/emacs/elim/Makefile Thu Aug 04 14:27:24 2011 +0200
+++ b/emacs/elim/Makefile Thu Aug 04 14:32:03 2011 +0200
@@ -66,8 +66,8 @@
all: $(BINARIES) TAGS
mkdir -p $(INSTALL_DIR)
- cp $(BINARIES) $(INSTALL_DIR)
- cp -r icons $(INSTALL_DIR)
+ cp -u $(BINARIES) $(INSTALL_DIR)
+ cp -ur icons $(INSTALL_DIR)
############################################################################
# test scripts/utils etc, such as there are:
fix slime
File modified: emacs/slime/Makefile
Change829 at Thu Aug 04 14:27:24 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 5f4a8d48d1a2 -r c8d15e980119 emacs/slime/Makefile
--- a/emacs/slime/Makefile Sat Jul 30 13:22:34 2011 +0200
+++ b/emacs/slime/Makefile Thu Aug 04 14:27:24 2011 +0200
@@ -6,4 +6,9 @@
INSTALL_DIR = slime
+slime: all copy-lisp
+
include ../elisp.mk
+
+copy-lisp:
+ @cp -u *.lisp ChangeLog $(BUILD_DIR)
typo
File modified: conf/zshrc
Change828 at Sat Jul 30 13:22:34 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 88a242d5faaa -r 5f4a8d48d1a2 conf/zshrc
--- a/conf/zshrc Sat Jul 30 10:01:54 2011 +0200
+++ b/conf/zshrc Sat Jul 30 13:22:34 2011 +0200
@@ -5,7 +5,7 @@
# set yellow path
# don't use colors for emacs shell
if test x${TERM} = xdumb ; then
- zhsrc_path="%~"
+ zshrc_path="%~"
else
autoload -Uz colors
colors
fix emacs shebang use ksh
File modified: emacs/init/ivan-autoinsert.el
Change827 at Sat Jul 30 10:01:54 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r efbf7a1d75a5 -r 88a242d5faaa emacs/init/ivan-autoinsert.el
--- a/emacs/init/ivan-autoinsert.el Fri Jul 29 19:58:06 2011 +0200
+++ b/emacs/init/ivan-autoinsert.el Sat Jul 30 10:01:54 2011 +0200
@@ -69,7 +69,7 @@
(defun ivan-autoinsert-shell ()
"Shell script template, auto detect Korn Shell"
- (let ((shell (if (file-exists-p "/bin/ksh") "ksh" "sh")))
+ (let ((shell "sh"))
(insert "#!/bin/" shell "\n")
(and ivan-autoinsert-top-comment
(progn
update tags
File modified: bin/TAGS
Change826 at Fri Jul 29 19:58:06 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r ba5adaef5479 -r efbf7a1d75a5 bin/TAGS
--- a/bin/TAGS Fri Jul 29 19:56:01 2011 +0200
+++ b/bin/TAGS Fri Jul 29 19:58:06 2011 +0200
@@ -1,23 +1,18 @@
-bgn.sh,687
+bgn.sh,531
build_bzr_emacs () {build_bzr_emacs3,11
update_web () {update_web21,385
-backup_kanis_fr () {backup_kanis_fr42,988
-mercurial_pull () {mercurial_pull51,1153
-set_alsa_mixer () {set_alsa_mixer63,1388
-set_xmodmap () {set_xmodmap70,1541
-ssh_key_password () {ssh_key_password77,1678
-launch_browser () {launch_browser84,1822
-mac () {mac92,2015
-tao () {tao96,2043
-tao_background () {tao_background104,2227
-yan () {yan111,2395
-yan_background () {yan_background118,2508
-function_exists () {function_exists129,2894
-host_action () {host_action134,2998
-host_background () {host_background145,3283
-mount_keel () {mount_keel151,3403
-misc_stuff () {misc_stuff158,3556
+backup_kanis_fr () {backup_kanis_fr35,823
+mercurial_pull () {mercurial_pull44,988
+set_alsa_mixer () {set_alsa_mixer56,1223
+set_xmodmap () {set_xmodmap63,1376
+ssh_key_password () {ssh_key_password70,1513
+launch_browser () {launch_browser77,1657
+function_exists () {function_exists86,1871
+host_background () {host_background91,1978
+mount_keel () {mount_keel97,2098
+misc_stuff () {misc_stuff104,2251
+bgn_private () {bgn_private111,2402
blog-archive.py,264
web_dir = os.getenv("WEB_DIR") + "/"web_dir7,68
@@ -86,7 +81,7 @@
fn_timer_stop () {fn_timer_stop485,10186
...
move tao stuff to private.sh
File modified: bin/bgn.sh
Change825 at Fri Jul 29 19:56:01 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 3af7bfb7a48f -r ba5adaef5479 bin/bgn.sh
--- a/bin/bgn.sh Fri Jul 29 10:55:45 2011 +0200
+++ b/bin/bgn.sh Fri Jul 29 19:56:01 2011 +0200
@@ -21,22 +21,15 @@
update_web () {
uw_dest="kanis.fr:~/www/"
uw_hg="${HOME}/tmp/hg"
- uw_pwd=`pwd`
- python "${VC_DIR}/bin/hg2rss.py"
+ python ${VC_DIR}/bin/hg2rss.py
fn_check "Failed to update RSS mercurial blog"
python "${VC_DIR}/bin/blog-archive.py"
fn_check "Failed to update archive blog"
cat ${VC_DIR}/bin/function.sh ${VC_DIR}/bin/setup.sh > \
${WEB_DIR}/bootstrap.sh
- fn_rsync_net "${WEB_DIR}/" "${uw_dest}"
- if test ! -d ${uw_hg}; then
- mkdir -p ${uw_hg}
- cd ${uw_hg}
- hg init
- fi
- mercurial_pull ${VC_DIR} ${uw_hg}
- fn_rsync_net ${uw_hg}/ "${uw_dest}hg/" "--exclude=.hg"
+ fn_rsync_net ${WEB_DIR}/ ${uw_dest}
+ fn_rsync_net ${VC_DIR}/ ${uw_dest}hg/ --exclude=.hg
}
backup_kanis_fr () {
@@ -89,21 +82,6 @@
fi
}
-tao () {
- # ignore secure output error generated by pulse audio
- ~/src/stumpwm/stumpwm > /dev/null 2>&1 &
- update_web
- backup_kanis_fr
- exec screen ${0} --background
-}
-
...
handle host specific stuff in ~/keep/private.sh
File modified: bin/bgn.sh
Change824 at Fri Jul 29 10:55:45 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r 3f23c33d7798 -r 3af7bfb7a48f bin/bgn.sh
--- a/bin/bgn.sh Fri Jul 29 10:53:50 2011 +0200
+++ b/bin/bgn.sh Fri Jul 29 10:55:45 2011 +0200
@@ -89,10 +89,6 @@
fi
}
-mac () {
- exec screen
-}
-
tao () {
# ignore secure output error generated by pulse audio
~/src/stumpwm/stumpwm > /dev/null 2>&1 &
@@ -108,36 +104,11 @@
${SHELL}
}
-yan () {
- exec screen ${0} --background
-}
-
-yan_background () {
- fn_rsync ${PORTABLE_DIR}/backup/lucia ~/backup
- fn_rsync ${KEEL_DIR} ~/backup
- fn_rsync ~/bob ${PORTABLE_DIR}/backup/yan
- fn_rsync_net bld:~/keep ${PORTABLE_DIR}/backup/bld --delete
- fn_rsync_net bldmac:~/keep ${PORTABLE_DIR}/backup/bldmac --delete
- fn_rsync_net zen:~/keep ${PORTABLE_DIR}/backup/zen --delete
- ${SHELL}
-}
-
# 1 name of function
function_exists () {
type "${1}" 2>&1 | grep -q "function"
}
-# do stuff depending on computer name
-host_action () {
- if test -d ${PORTABLE_DIR}/backup ; then
- fn_mac_mount_ntfs_write
...
M-i d downcase
File modified: emacs/init/ivan-keymap.el
Change823 at Fri Jul 29 10:53:50 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r 2ae603d20ca4 -r 3f23c33d7798 emacs/init/ivan-keymap.el
--- a/emacs/init/ivan-keymap.el Fri Jul 29 10:38:34 2011 +0200
+++ b/emacs/init/ivan-keymap.el Fri Jul 29 10:53:50 2011 +0200
@@ -60,6 +60,7 @@
"b" ivan-bbdb-map
"c" ivan-calendar
"e" ivan-keymap-english-map
+ "d" downcase-word
"f" ivan-keymap-french-map
"g" ivan-w3m-open-or-search
"i" ivan-erc
select to clipboard in xterm
File modified: conf/Xresources
Change822 at Fri Jul 29 10:38:34 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r 2ef7666a7fde -r 2ae603d20ca4 conf/Xresources
--- a/conf/Xresources Fri Jul 29 10:13:22 2011 +0200
+++ b/conf/Xresources Fri Jul 29 10:38:34 2011 +0200
@@ -23,6 +23,7 @@
XTerm*metaSendsEscape: true
XTerm*backarrowKeyIsErase: true
XTerm*ptyInitialErase: true
+XTerm*SelectToClipboard: true
XTerm*VT100.translations: #override \n\
<Key>Home: string(0x1b) string("[1~") \n\
<Key>End: string(0x1b) string("[4~") \n\
open line needs to be a one key shortcut M-l
File modified: emacs/init/ivan-keymap.el
Change821 at Fri Jul 29 10:13:22 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r bcc06656c8cb -r 2ef7666a7fde emacs/init/ivan-keymap.el
--- a/emacs/init/ivan-keymap.el Thu Jul 28 14:30:01 2011 +0200
+++ b/emacs/init/ivan-keymap.el Fri Jul 29 10:13:22 2011 +0200
@@ -67,7 +67,6 @@
"k" ivan-org-kb
"l" ivan-lookup
"n" ivan-gnus
- "o" open-line
"r" org-capture
;; get into the habit of using xterm
;; "s" ivan-comint-shell
@@ -131,11 +130,12 @@
"M-3" split-window-horizontally
"M-i" ivan-keymap-map-m-i
"M-k" ivan-keymap-map-m-k
+ "M-l" open-line
"M-o" other-frame
"M-x" ivan-fun-execute
"<XF86Paste>" ivan-fun-paste-primary)
-;;; Global keymap C-x
+;;; global keymap c-x
(ivan-keymap-global-c-x
"C-x 0" nil
"C-x 1" nil
turn signature.py to a shell script
File modified: bin/signature.py bin/signature.sh
Change820 at Thu Jul 28 14:30:01 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 54ef7a610caf -r bcc06656c8cb bin/signature.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/signature.sh Thu Jul 28 14:30:01 2011 +0200
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+signature_file=${HOME}/${IVAN_USER}/signature.txt
+signature_count=`grep --count -- "---" ${signature_file}`
+
+# seed random
+RANDOM=$$
+signature_pick=`expr ${RANDOM} % ${signature_count}`
+
+awk -v signature_pick=${signature_pick} '
+BEGIN {
+ count=0;
+ skip=0
+}
+
+/---/ {
+ count++;
+ skip=1;
+}
+
+{
+ if (skip) {
+ skip=0;
+ } else {
+ if (count == signature_pick) {
+ print;
+ }
+ }
+}
+
+' $signature_file
+
+# Local Variables:
+# compile-command: "sh signature.sh"
+# End:
+
+# Copyright (C) 2011 Ivan Kanis
...
refactor init-user
File modified: bin/emacs.sh emacs/init/init.el emacs/init/ivan-bbdb.el emacs/init/ivan-english.el emacs/init/ivan-erc.el emacs/init/ivan-french.el emacs/init/ivan-fun.el emacs/init/ivan-gnus.el emacs/init/ivan-load.el emacs/init/ivan-message.el emacs/init/ivan-start.el emacs/init/ivan-var.el emacs/init/ivan-w3m.el
Change819 at Thu Jul 28 13:29:41 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r cb427e17b81d -r 54ef7a610caf emacs/init/ivan-w3m.el
--- a/emacs/init/ivan-w3m.el Thu Jul 28 10:21:11 2011 +0200
+++ b/emacs/init/ivan-w3m.el Thu Jul 28 13:29:41 2011 +0200
@@ -1,7 +1,6 @@
;;; ivan-w3m.el --- browsing the web with external process
(eval-when-compile
- (defvar init-user "")
(require 'ivan-face)
(require 'ivan-fun)
(require 'ivan-keymap)
@@ -108,7 +107,7 @@
w3m-search-engine-alist
'(("google" "http://www.google.com/search?q=%s&num=100")))
-(if (eq init-user 'ivan)
+(if (string= var-init-user "ivan")
(setq w3m-profile-directory
(concat ivan-var-tmp-dir ".emacs-w3m")))
create su script that does su - or sudo -s
File modified: bin/setup.sh bin/su.sh
Change818 at Thu Jul 28 10:21:11 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 97bdb68b41cb -r cb427e17b81d bin/su.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/su.sh Thu Jul 28 10:21:11 2011 +0200
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# do su - or sudo -s
+
+if test -f /usr/bin/sudo ; then
+ sudo -s
+else
+ su -
+fi
+
+# Copyright (C) 2011 Ivan Kanis
+# Author: Ivan Kanis
+#
+# This program is free software ; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation ; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY ; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program ; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# vi:et:sw=4:ts=4:
try C-l as backward char since C-b is painful
map open line to M-i o and world clock to M-i M-o
File modified: emacs/init/ivan-keymap.el
Change817 at Thu Jul 28 08:45:27 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 7f2e42490571 -r 97bdb68b41cb emacs/init/ivan-keymap.el
--- a/emacs/init/ivan-keymap.el Wed Jul 27 10:09:40 2011 +0200
+++ b/emacs/init/ivan-keymap.el Thu Jul 28 08:45:27 2011 +0200
@@ -52,6 +52,7 @@
;;; M-i
(ivan-keymap-prefix
ivan-keymap-map-m-i
+ "M-o" display-time-world
"C" ivan-org-calendar
"K" ivan-org-keyring
"R" ivan-fun-rename-file-and-buffer
@@ -66,7 +67,7 @@
"k" ivan-org-kb
"l" ivan-lookup
"n" ivan-gnus
- "o" display-time-world
+ "o" open-line
"r" org-capture
;; get into the habit of using xterm
;; "s" ivan-comint-shell
@@ -121,7 +122,7 @@
"<kp-insert>" ivan-lookup
"<select>" end-of-buffer
"C-\\" nil
- "C-l" open-line
+ "C-l" backward-char
"C-o" other-window
"M-#" calc-dispatch
"M-0" delete-window
add gnus init hook
File modified: emacs/init/ivan-gnus.el
Change816 at Wed Jul 27 10:09:40 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r c91c5f7fd80f -r 7f2e42490571 emacs/init/ivan-gnus.el
--- a/emacs/init/ivan-gnus.el Tue Jul 26 07:04:33 2011 +0200
+++ b/emacs/init/ivan-gnus.el Wed Jul 27 10:09:40 2011 +0200
@@ -39,6 +39,7 @@
;; Initialize gnus
(progn
(setq ivan-gnus-init t)
+ (run-hooks 'ivan-gnus-init-hook)
(require 'gnus-art)
;; Windows layout
(gnus-add-configuration
don't run getmail
File modified: bin/bgn.sh
Change815 at Tue Jul 26 07:04:33 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 17693116b209 -r c91c5f7fd80f bin/bgn.sh
--- a/bin/bgn.sh Mon Jul 25 19:11:18 2011 +0200
+++ b/bin/bgn.sh Tue Jul 26 07:04:33 2011 +0200
@@ -187,7 +187,6 @@
ssh_key_password
misc_stuff
launch_browser
- getmail
build_bzr_emacs
emacs.sh &
host_action
set yellow path
File modified: conf/zshrc
Change814 at Mon Jul 25 19:11:18 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r efa6844e8d1e -r 17693116b209 conf/zshrc
--- a/conf/zshrc Mon Jul 25 14:23:24 2011 +0200
+++ b/conf/zshrc Mon Jul 25 19:11:18 2011 +0200
@@ -2,10 +2,22 @@
# Set up the prompt
+# set yellow path
+# don't use colors for emacs shell
+if test x${TERM} = xdumb ; then
+ zhsrc_path="%~"
+else
+ autoload -Uz colors
+ colors
+ zshrc_width=`expr ${COLUMNS} - 6`
+ zshrc_path="%${zshrc_width}<...<%~%<<"
+ zshrc_path="%B%{${fg[yellow]}%}${zshrc_path}%{${fg[default]}%}%b"
+fi
+
# Here the test is, reasonably enough, `%(?...'. Putting these two
# together, you can get a message which is only displayed when the exit
# status is non-zero
-PS1="%T %70<...<%~%<<
+PS1="%T ${zshrc_path}
%m%(?..(%?%))%# "
# setup environment with a script
@@ -78,12 +90,12 @@
compinit
# zed -f edit function in place, ^j quits editor
-autoload zed
+autoload -Uz zed
# This provides a way of renaming, copying and linking files based on
# patterns. The idea is that you give two arguments, a pattern to match,
# and a string which uses that pattern.
-autoload zmv
+autoload -Uz zmv
# Don't resolve symbolic links to their true values.
...
turn off shell echoes
File modified: emacs/init/ivan-comint.el
Change813 at Mon Jul 25 14:23:24 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r c7d4c7a2fffc -r efa6844e8d1e emacs/init/ivan-comint.el
--- a/emacs/init/ivan-comint.el Mon Jul 25 10:38:21 2011 +0200
+++ b/emacs/init/ivan-comint.el Mon Jul 25 14:23:24 2011 +0200
@@ -47,6 +47,9 @@
'dirtrack nil t)))
(setq
+ ;; turn off echo of the shell
+ comint-process-echoes t
+
;; don't use executable files for completion candidates (emacs)
shell-completion-execonly nil
move stuf to private.sh
File modified: bin/bgn.sh
Change812 at Mon Jul 25 10:38:21 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r 056d2200428e -r c7d4c7a2fffc bin/bgn.sh
--- a/bin/bgn.sh Mon Jul 25 10:12:43 2011 +0200
+++ b/bin/bgn.sh Mon Jul 25 10:38:21 2011 +0200
@@ -109,9 +109,6 @@
}
yan () {
- killall compiz &
- ${HOME}/src/stumpwm/stumpwm &
- skype &
exec screen ${0} --background
}
use keysim for print screen key paste
File modified: conf/xmodmap
Change811 at Mon Jul 25 10:12:43 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r a9490ae297d3 -r 056d2200428e conf/xmodmap
--- a/conf/xmodmap Sun Jul 24 11:55:30 2011 +0200
+++ b/conf/xmodmap Mon Jul 25 10:12:43 2011 +0200
@@ -25,4 +25,4 @@
!========================================
! Make print screen key paste
!========================================
-!keycode 107 = XF86Paste
+!keysym Print = XF86Paste
don't track repeat entries
File modified: emacs/init/ivan-org.el
Change810 at Sun Jul 24 11:55:30 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r fc87e16bd047 -r a9490ae297d3 emacs/init/ivan-org.el
--- a/emacs/init/ivan-org.el Sun Jul 24 11:49:24 2011 +0200
+++ b/emacs/init/ivan-org.el Sun Jul 24 11:55:30 2011 +0200
@@ -210,9 +210,7 @@
org-log-done t
org-link-frame-setup '((gnus . gnus-unplugged)
(file . find-file))
- org-highest-priority ?1
- org-default-priority ?2
- org-lowest-priority ?3
+ org-log-repeat nil
org-reverse-note-order nil
org-return-follows-link t
org-stuck-projects '("+LEVEL=2" ("next") "")
implement next in org, remove cruft
File modified: emacs/init/ivan-org.el
Change809 at Sun Jul 24 11:49:24 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 27614547f2ad -r fc87e16bd047 emacs/init/ivan-org.el
--- a/emacs/init/ivan-org.el Sun Jul 24 10:54:58 2011 +0200
+++ b/emacs/init/ivan-org.el Sun Jul 24 11:49:24 2011 +0200
@@ -44,14 +44,39 @@
(interactive)
(find-file ivan-org-todo))
+(defun ivan-org-start ()
+ (when (file-exists-p ivan-org-todo)
+ (ivan-org-agenda-list)
+ (org-agenda-to-appt)
+ (appt-activate 1)
+ (other-window 1)
+ (ivan-org)
+ (ivan-org-sparse-next)))
+
+(defun ivan-org-sparse-tree (what)
+ "Display sparse tree of WHAT"
+ (interactive)
+ (org-occur (concat "^" outline-regexp " *" what )))
+
+(defun ivan-org-sparse-next ()
+ (interactive)
+ (ivan-org-sparse-tree "next"))
+
+(defun ivan-org-sparse-cancel-and-done ()
+ (interactive)
+ (ivan-org-sparse-tree "\\(cancel\\|done\\)"))
+
+(defun ivan-org-sparse-wait ()
+ (interactive)
+ (ivan-org-sparse-tree "wait"))
+
(defun ivan-org-agenda ()
+ "Start or switch to agenda"
(interactive)
- (if (ivan-fun-start-or-switch 'ivan-org-agenda-list "*Org Agenda*")
- (progn
- (org-agenda-to-appt)
- (appt-activate 1))))
+ (ivan-fun-start-or-switch 'ivan-org-agenda-list "*Org Agenda*"))
...
replace grepk from perl to a shell script
File modified: bin/grepk bin/grepk.sh bin/setup.sh
Change808 at Sun Jul 24 10:54:58 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r eafbc944be7b -r 27614547f2ad bin/setup.sh
--- a/bin/setup.sh Sun Jul 24 09:35:41 2011 +0200
+++ b/bin/setup.sh Sun Jul 24 10:54:58 2011 +0200
@@ -548,19 +548,20 @@
print_alias() {
cat <<EOF
alias agi='sudo apt-get install'
-alias aptitude='TERM=vt100 sudo aptitude'
-alias bgn='bgn.sh'
-alias emacs='emacs.sh'
-alias excel='excel.sh'
+alias aptitude='sudo aptitude'
+alias bgn=bgn.sh
+alias emacs=emacs.sh
+alias excel=excel.sh
+alias grepk=grepk.sh
alias ifdown='sudo ifdown'
alias ifup='sudo ifup'
alias meditate=meditate.sh
alias mount='sudo mount'
-alias r='remote.sh'
-alias ssh='ssh.sh'
-alias stop='stop.sh'
+alias r=remote.sh
+alias ssh=ssh.sh
+alias stop=stop.sh
alias umount='sudo umount'
-alias word='word.sh'
+alias word=word.sh
EOF
}
fix ido
File modified: emacs/init/ivan-ido.el
Change807 at Sun Jul 24 09:35:41 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r f07b65f8dbbf -r eafbc944be7b emacs/init/ivan-ido.el
--- a/emacs/init/ivan-ido.el Sat Jul 23 19:35:11 2011 +0200
+++ b/emacs/init/ivan-ido.el Sun Jul 24 09:35:41 2011 +0200
@@ -38,9 +38,8 @@
(defun ivan-ido-late-bind ()
"Load ido after starting emacs."
- (if (not ido-mode)
- (require 'uniquify)
- (ido-mode 'both))
+ (require 'uniquify)
+ (ido-mode 'both)
(ivan-keymap-define ido-common-completion-map
"C-n" ido-next-match
"C-p" ido-prev-match
fix keyboad primary paste on emacs
File modified: emacs/init/ivan-fun.el emacs/init/ivan-keymap.el
Change806 at Sat Jul 23 19:35:11 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r c664080b23c8 -r f07b65f8dbbf emacs/init/ivan-keymap.el
--- a/emacs/init/ivan-keymap.el Sat Jul 23 19:34:34 2011 +0200
+++ b/emacs/init/ivan-keymap.el Sat Jul 23 19:35:11 2011 +0200
@@ -131,7 +131,8 @@
"M-i" ivan-keymap-map-m-i
"M-k" ivan-keymap-map-m-k
"M-o" other-frame
- "M-x" ivan-fun-execute)
+ "M-x" ivan-fun-execute
+ "<XF86Paste>" ivan-fun-paste-primary)
;;; Global keymap C-x
(ivan-keymap-global-c-x
turn off beep, map tab to expand-or-complete-prefix
File modified: conf/zshrc
Change805 at Sat Jul 23 19:34:34 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 8a6ebe8a4eab -r c664080b23c8 conf/zshrc
--- a/conf/zshrc Sat Jul 23 18:58:03 2011 +0200
+++ b/conf/zshrc Sat Jul 23 19:34:34 2011 +0200
@@ -28,6 +28,7 @@
# keybinding
bindkey '^w' kill-region
bindkey '^q' push-line-or-edit
+bindkey '^i' expand-or-complete-prefix
# History sharing and huge size
HISTSIZE=10000
@@ -69,6 +70,9 @@
# ahead; `a' for abort, don't do anything; `e' for edit
setopt correct
+# that annoying beep goes away on completion
+setopt no_beep
+
# Use modern completion system
autoload -Uz compinit
compinit
fix ido mode shortcuts
File modified: emacs/init/ivan-ido.el
Change804 at Sat Jul 23 18:58:03 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r a1548b152b5f -r 8a6ebe8a4eab emacs/init/ivan-ido.el
--- a/emacs/init/ivan-ido.el Fri Jul 22 10:10:33 2011 +0200
+++ b/emacs/init/ivan-ido.el Sat Jul 23 18:58:03 2011 +0200
@@ -38,15 +38,15 @@
(defun ivan-ido-late-bind ()
"Load ido after starting emacs."
- (unless ido-mode
+ (if (not ido-mode)
(require 'uniquify)
- (ido-mode 'both)
+ (ido-mode 'both))
(ivan-keymap-define ido-common-completion-map
"C-n" ido-next-match
"C-p" ido-prev-match
"~" ivan-ido-home)
(ivan-keymap-define ido-file-dir-completion-map
- "M-k" ivan-ido-map-m-k)))
+ "M-k" ivan-ido-map-m-k))
(defun ivan-ido-home ()
"Open home dir."
make emacs shell a little be harder to get to
File modified: emacs/init/ivan-comint.el emacs/init/ivan-keymap.el
Change803 at Fri Jul 22 10:10:33 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r abb08ecdd893 -r a1548b152b5f emacs/init/ivan-keymap.el
--- a/emacs/init/ivan-keymap.el Fri Jul 22 10:10:15 2011 +0200
+++ b/emacs/init/ivan-keymap.el Fri Jul 22 10:10:33 2011 +0200
@@ -68,7 +68,8 @@
"n" ivan-gnus
"o" display-time-world
"r" org-capture
- "s" ivan-comint-shell
+;; get into the habit of using xterm
+;; "s" ivan-comint-shell
"t" ivan-org
"v" volume
"w" ivan-w3m)
add getmail
File modified: bin/bgn.sh
Change802 at Fri Jul 22 10:10:15 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r 971739625a15 -r abb08ecdd893 bin/bgn.sh
--- a/bin/bgn.sh Fri Jul 22 09:26:51 2011 +0200
+++ b/bin/bgn.sh Fri Jul 22 10:10:15 2011 +0200
@@ -190,6 +190,7 @@
ssh_key_password
misc_stuff
launch_browser
+ getmail
build_bzr_emacs
emacs.sh &
host_action
add zmv
File modified: conf/zshrc
Change801 at Fri Jul 22 09:26:51 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r 5f7e669a3845 -r 971739625a15 conf/zshrc
--- a/conf/zshrc Thu Jul 21 21:25:50 2011 +0200
+++ b/conf/zshrc Fri Jul 22 09:26:51 2011 +0200
@@ -76,6 +76,11 @@
# zed -f edit function in place, ^j quits editor
autoload zed
+# This provides a way of renaming, copying and linking files based on
+# patterns. The idea is that you give two arguments, a pattern to match,
+# and a string which uses that pattern.
+autoload zmv
+
# Don't resolve symbolic links to their true values.
unsetopt chase_links
use M-j for my shortcuts in dired
File modified: emacs/init/ivan-dired.el
Change800 at Thu Jul 21 21:25:50 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r ab2a3d849a8b -r 5f7e669a3845 emacs/init/ivan-dired.el
--- a/emacs/init/ivan-dired.el Thu Jul 21 20:49:49 2011 +0200
+++ b/emacs/init/ivan-dired.el Thu Jul 21 21:25:50 2011 +0200
@@ -38,14 +38,7 @@
(defun ivan-dired-hook ()
(turn-on-gnus-dired-mode)
(ivan-keymap-keep-global dired-mode-map)
- (ivan-keymap-define dired-mode-map
- "A" gnus-dired-attach
- "E" ivan-emms-play-dired
- "_" dired-omit-mode
- "c" wdired-change-to-wdired-mode
- "e" ivan-emms-add-dired
- "j" gnus-dired-find-file-mailcap
- "p" gnus-dired-print)
+ (ivan-keymap-define dired-mode-map "M-j" ivan-dired-map-m-j)
(dired-omit-mode 1))
(add-hook 'dired-mode-hook 'ivan-dired-hook)
@@ -62,6 +55,15 @@
(add-hook 'wdired-mode-hook 'ivan-wdired-hook)
+(ivan-keymap-prefix
+ ivan-dired-map-m-j
+ "a" gnus-dired-attach
+ "c" wdired-change-to-wdired-mode
+ "e" ivan-emms-add-dired
+ "o" dired-omit-mode
+ "p" ivan-emms-play-dired
+ "M-j" gnus-dired-find-file-mailcap)
+
(setq
dired-dwim-target t
dired-guess-shell-alist-user
bind lookup japanese to key without numeric pad
File modified: emacs/init/ivan-keymap.el
Change799 at Thu Jul 21 20:49:49 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 3bda41c1ebe4 -r ab2a3d849a8b emacs/init/ivan-keymap.el
--- a/emacs/init/ivan-keymap.el Thu Jul 21 19:32:34 2011 +0200
+++ b/emacs/init/ivan-keymap.el Thu Jul 21 20:49:49 2011 +0200
@@ -64,7 +64,7 @@
"i" ivan-erc
"j" ivan-keymap-japanese-map
"k" ivan-org-kb
- "l" recenter-top-bottom
+ "l" ivan-lookup
"n" ivan-gnus
"o" display-time-world
"r" org-capture
fix synchronization of curdir on emacs shell and zsh
File modified: conf/zshrc emacs/init/ivan-comint.el
Change798 at Thu Jul 21 19:32:34 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r b864acbd57bc -r 3bda41c1ebe4 emacs/init/ivan-comint.el
--- a/emacs/init/ivan-comint.el Thu Jul 21 17:52:35 2011 +0200
+++ b/emacs/init/ivan-comint.el Thu Jul 21 19:32:34 2011 +0200
@@ -21,13 +21,12 @@
(defun ivan-comint-shell ()
(interactive)
- (shell)
(if (eq system-type 'windows-nt)
- (setq dirtrack-directory-function 'dirtrack-windows-directory-function
- dirtrack-list '("^emacs \\([a-zA-Z]:.*\\)>" 1)
+ (setq dirtrack-list '("^emacs \\([a-zA-Z]:.*\\)>" 1)
comint-process-echoes t)
- (setq dirtrack-directory-function
- 'file-name-as-directory)))
+ (setq dirtrack-list '("^[0-9]*:[0-5][0-9] \\(.*\\)" 1)))
+ (shell))
+
(defun ivan-comint-hook ()
(ivan-keymap-keep-global comint-mode-map)
add hashcash
File modified: bin/setup.sh
Change797 at Thu Jul 21 17:52:35 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 54bb68319bf5 -r b864acbd57bc bin/setup.sh
--- a/bin/setup.sh Thu Jul 21 17:52:27 2011 +0200
+++ b/bin/setup.sh Thu Jul 21 17:52:35 2011 +0200
@@ -277,6 +277,7 @@
gnutls-bin \
gv \
gzip \
+ hashcash \
imagemagick \
kakasi \
k3b \
print relative path on prompt
File modified: conf/zshrc
Change796 at Thu Jul 21 17:52:27 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r ba742780daeb -r 54bb68319bf5 conf/zshrc
--- a/conf/zshrc Thu Jul 21 09:34:37 2011 +0200
+++ b/conf/zshrc Thu Jul 21 17:52:27 2011 +0200
@@ -5,7 +5,7 @@
# Here the test is, reasonably enough, `%(?...'. Putting these two
# together, you can get a message which is only displayed when the exit
# status is non-zero
-PS1="%T %70<...<%/%<< %(?..(%?%))
+PS1="%T %70<...<%~%<< %(?..(%?%))
%m%# "
# setup environment with a script
hide error message coming from emacs
File modified: bin/emacs.sh
Change795 at Thu Jul 21 09:34:37 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 30983b0f9f1b -r ba742780daeb bin/emacs.sh
--- a/bin/emacs.sh Wed Jul 20 20:20:40 2011 +0200
+++ b/bin/emacs.sh Thu Jul 21 09:34:37 2011 +0200
@@ -8,7 +8,7 @@
bzr_emacs=${HOME}/emacs-bzr
if test -d ${bzr_emacs} && test -z "${IVAN_USER}" ; then
- exec ${bzr_emacs}/bin/emacs $*
+ exec ${bzr_emacs}/bin/emacs $* > /dev/null 2>&1
fi
# prevent GUI agent window popping up
add zsh info
File modified: info/dir info/zsh.info info/zsh.info-1 info/zsh.info-2 info/zsh.info-3 info/zsh.info-4 info/zsh.info-5 info/zsh.info-6 info/zsh.texi
Change794 at Wed Jul 20 20:20:40 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 73fc2c60a5c3 -r 30983b0f9f1b info/zsh.texi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/info/zsh.texi Wed Jul 20 20:20:40 2011 +0200
@@ -0,0 +1,35005 @@
+
+\input texinfo.tex
+@c %**start of header
+@iftex
+@afourpaper
+@setchapternewpage off
+@end iftex
+@setfilename zsh.info
+@settitle zsh
+@c %**end of header
+
+@ifinfo
+@set dsq '@:'
+@set dsbq `@:`
+@end ifinfo
+@iftex
+@set dsq '{}'
+@set dsbq `{}`
+@end iftex
+@ifinfo
+@dircategory Utilities
+@direntry
+ * ZSH: (zsh). The Z Shell Manual.
+@end direntry
+@end ifinfo
+
+@iftex
+@finalout
+@end iftex
+@titlepage
+@title The Z Shell Manual
+@subtitle Version 4.3.12
+@subtitle Updated May 31, 2011
+@author Original documentation by Paul Falstad
+@page
+This is a texinfo version of the documentation for the Z Shell, originally by
+Paul Falstad.
...
zsh prompt truncate path if it's too long
File modified: conf/zshrc
Change793 at Wed Jul 20 10:08:48 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r 774b7dbfef22 -r 73fc2c60a5c3 conf/zshrc
--- a/conf/zshrc Wed Jul 20 09:15:30 2011 +0200
+++ b/conf/zshrc Wed Jul 20 10:08:48 2011 +0200
@@ -5,7 +5,7 @@
# Here the test is, reasonably enough, `%(?...'. Putting these two
# together, you can get a message which is only displayed when the exit
# status is non-zero
-PS1="%~%(?..(%?%)) %*
+PS1="%T %70<...<%/%<< %(?..(%?%))
%m%# "
# setup environment with a script
merge
File modified: bin/setup.sh conf/zshrc
Change792 at Wed Jul 20 09:15:30 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r 9ecba554316d -r 774b7dbfef22 conf/zshrc
--- a/conf/zshrc Tue Jul 19 10:20:06 2011 +0200
+++ b/conf/zshrc Wed Jul 20 09:15:30 2011 +0200
@@ -5,8 +5,8 @@
# Here the test is, reasonably enough, `%(?...'. Putting these two
# together, you can get a message which is only displayed when the exit
# status is non-zero
-PS1="%m%(?..(%?%))%# "
-RPS1="%~"
+PS1="%~%(?..(%?%)) %*
+%m%# "
# setup environment with a script
bgn_setup=${HOME}/hg/bin/setup.sh
remove fedora code
File modified: bin/setup.sh
Change791 at Tue Jul 19 10:20:06 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r 03f1b6f571de -r 9ecba554316d bin/setup.sh
--- a/bin/setup.sh Tue Jul 19 10:12:24 2011 +0200
+++ b/bin/setup.sh Tue Jul 19 10:20:06 2011 +0200
@@ -1,5 +1,4 @@
#!/bin/sh
-#set -x
cur_dir=`dirname $0`
cur_dir=`cd ${cur_dir}; pwd`
@@ -256,40 +255,6 @@
fi
}
-yum_install () {
- yum install \
- apr-devel \
- apr-util-devel \
- aspell-en \
- aspell-fr \
- bzip2-devel \
- eblook \
- freetype-devel \
- fuse \
- giflib-devel \
- gnutls \
- gnutls-utils \
- httpd-devel \
- kakasi \
- lftp \
- libX11-devel \
- libXpm-devel \
- libjpeg-devel \
- libpng-devel \
- libpurple-devel \
- libtiff-devel \
- libxml2-devel \
- mp3info \
- mplayer \
- mumble \
- openssh-server \
- vim \
...
check setup.sh exists before running it
File modified: conf/zshrc
Change790 at Tue Jul 19 10:12:24 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r 1a9f6975c8c6 -r 03f1b6f571de conf/zshrc
--- a/conf/zshrc Tue Jul 19 10:11:53 2011 +0200
+++ b/conf/zshrc Tue Jul 19 10:12:24 2011 +0200
@@ -1,3 +1,5 @@
+#!/bin/zsh
+
# Set up the prompt
# Here the test is, reasonably enough, `%(?...'. Putting these two
@@ -7,17 +9,19 @@
RPS1="%~"
# setup environment with a script
-file=/tmp/setenv.$$
-${HOME}/hg/bin/setup.sh --interactive > ${file}
-source ${file}
+bgn_setup=${HOME}/hg/bin/setup.sh
+if test -f ${bgn_setup} ; then
+ bgn_file=/tmp/setenv.$$
+ ${HOME}/hg/bin/setup.sh --interactive > ${bgn_file}
+ source ${bgn_file}
+fi
# eventual local setting
setup_local=${HOME}/keep/local.sh
if test -f ${setup_local} ; then
- source ${setup_local}
+ source ${setup_local}
fi
-
# Use emacs keybindings even if our EDITOR is set to vi
bindkey -e
@@ -74,3 +78,10 @@
# Don't resolve symbolic links to their true values.
unsetopt chase_links
+
+# Local Variables:
+# compile-command: "sh setup.sh"
...
update tags
File modified: bin/TAGS
Change789 at Tue Jul 19 10:11:53 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r 79b77b8ee7c5 -r 1a9f6975c8c6 bin/TAGS
--- a/bin/TAGS Tue Jul 19 07:08:03 2011 +0200
+++ b/bin/TAGS Tue Jul 19 10:11:53 2011 +0200
@@ -1,26 +1,52 @@
-bgn.sh,632
-update_web () {update_web3,11
-backup_kanis_fr () {backup_kanis_fr24,614
-mercurial_pull () {mercurial_pull33,779
-set_alsa_mixer () {set_alsa_mixer45,1014
-set_xmodmap () {set_xmodmap52,1167
-ssh_key_password () {ssh_key_password59,1304
-launch_browser () {launch_browser66,1448
-mac () {mac74,1641
-tao () {tao78,1669
-tao_rsync () {tao_rsync86,1848
-tny () {tny93,2011
-yan () {yan100,2115
-yan_rsync () {yan_rsync107,2223
-function_exists () {function_exists118,2592
-host_action () {host_action123,2696
-host_rsync () {host_rsync134,2996
-mount_keel () {mount_keel140,3101
-misc_stuff () {misc_stuff147,3254
+bgn.sh,687
+build_bzr_emacs () {build_bzr_emacs3,11
+update_web () {update_web21,385
+backup_kanis_fr () {backup_kanis_fr42,988
+mercurial_pull () {mercurial_pull51,1153
+set_alsa_mixer () {set_alsa_mixer63,1388
+set_xmodmap () {set_xmodmap70,1541
+ssh_key_password () {ssh_key_password77,1678
+launch_browser () {launch_browser84,1822
+mac () {mac92,2015
+tao () {tao96,2043
+tao_background () {tao_background104,2227
+yan () {yan111,2395
+yan_background () {yan_background118,2508
+function_exists () {function_exists129,2894
+host_action () {host_action134,2998
+host_background () {host_background145,3283
...
don't use right prompt, opt for multiline
File modified: conf/zshrc
Change788 at Tue Jul 19 21:04:22 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 03f1d851e0f6 -r 5e85d0690ca8 conf/zshrc
--- a/conf/zshrc Tue Jul 19 20:19:29 2011 +0200
+++ b/conf/zshrc Tue Jul 19 21:04:22 2011 +0200
@@ -1,10 +1,12 @@
+#!/bin/zsh
+
# Set up the prompt
# Here the test is, reasonably enough, `%(?...'. Putting these two
# together, you can get a message which is only displayed when the exit
# status is non-zero
-PS1="%m%(?..(%?%))%# "
-RPS1="%~"
+PS1="%~%(?..(%?%)) %*
+%m%# "
# setup environment with a script
file=/tmp/setenv.$$
@@ -17,7 +19,6 @@
source ${setup_local}
fi
-
# Use emacs keybindings even if our EDITOR is set to vi
bindkey -e
don't overwrite vimperator settings
File modified: bin/setup.sh conf/vimperatorrc
Change787 at Tue Jul 19 20:19:29 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 79b77b8ee7c5 -r 03f1d851e0f6 conf/vimperatorrc
--- a/conf/vimperatorrc Tue Jul 19 07:08:03 2011 +0200
+++ b/conf/vimperatorrc Tue Jul 19 20:19:29 2011 +0200
@@ -1,3 +1,3 @@
map <BS> <PageUp>
map b <PageUp>
-" :set guioptions=bmrBT
+:set guioptions=bmrBT
fix faces on bzr emacs
File modified: emacs/init/ivan-face.el emacs/init/ivan-ido.el
Change786 at Tue Jul 19 07:08:03 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 6dd4150f8041 -r 79b77b8ee7c5 emacs/init/ivan-ido.el
--- a/emacs/init/ivan-ido.el Tue Jul 19 05:29:38 2011 +0200
+++ b/emacs/init/ivan-ido.el Tue Jul 19 07:08:03 2011 +0200
@@ -41,14 +41,12 @@
(unless ido-mode
(require 'uniquify)
(ido-mode 'both)
- (ivan-ido-face))
(ivan-keymap-define ido-common-completion-map
"C-n" ido-next-match
"C-p" ido-prev-match
"~" ivan-ido-home)
(ivan-keymap-define ido-file-dir-completion-map
- "M-k" ivan-ido-map-m-k))
-
+ "M-k" ivan-ido-map-m-k)))
(defun ivan-ido-home ()
"Open home dir."
@@ -86,12 +84,11 @@
;; Prevent ido from abbreviating long directory path
ido-max-file-prompt-width 0)
-(defun ivan-ido-face ()
- (ivan-face
- ido-subdir yellow
- ido-only-match green
- ido-incomplete-regexp red
- ido-first-match orange))
+(ivan-face
+ ido-subdir yellow
+ ido-only-match green
+ ido-incomplete-regexp red
+ ido-first-match orange)
;; Copyright (C) 2007 Ivan Kanis
;; Author: Ivan Kanis
remove debug code
File modified: bin/bgn.sh
Change785 at Tue Jul 19 05:29:38 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r 09bb2d5d540e -r 6dd4150f8041 bin/bgn.sh
--- a/bin/bgn.sh Mon Jul 18 21:56:44 2011 +0200
+++ b/bin/bgn.sh Tue Jul 19 05:29:38 2011 +0200
@@ -18,8 +18,6 @@
fi
}
-build_bzr_emacs
-exit
update_web () {
uw_dest="kanis.fr:~/www/"
uw_hg="${HOME}/tmp/hg"
use parallel make excep for install of bzr emacs
File modified: bin/bgn.sh
Change784 at Mon Jul 18 21:56:44 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r efc9034be8fc -r 09bb2d5d540e bin/bgn.sh
--- a/bin/bgn.sh Mon Jul 18 16:54:47 2011 +0200
+++ b/bin/bgn.sh Mon Jul 18 21:56:44 2011 +0200
@@ -3,14 +3,23 @@
build_bzr_emacs () {
bbe_src=${HOME}/src/emacs-bzr/trunk
bbe_pwd=`pwd`
+ bbe_cmd=make
+
if test -d ${bbe_src} ; then
cd ${bbe_src}
bzr pull
- make -j2 install
+ case `hostname -s` in
+ tao) bbe_cmd="${bbe_cmd} -j4" ;;
+ yan) bbe_cmd="${bbe_cmd} -j2" ;;
+ esac
+ ${bbe_cmd}
+ make install
cd ${bbe_pwd}
fi
}
+build_bzr_emacs
+exit
update_web () {
uw_dest="kanis.fr:~/www/"
uw_hg="${HOME}/tmp/hg"
bzr emacs need to late bind ido-face
File modified: emacs/init/ivan-ido.el
Change783 at Mon Jul 18 16:54:47 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r 8ad16422b6f5 -r efc9034be8fc emacs/init/ivan-ido.el
--- a/emacs/init/ivan-ido.el Mon Jul 18 16:43:05 2011 +0200
+++ b/emacs/init/ivan-ido.el Mon Jul 18 16:54:47 2011 +0200
@@ -40,7 +40,8 @@
"Load ido after starting emacs."
(unless ido-mode
(require 'uniquify)
- (ido-mode 'both))
+ (ido-mode 'both)
+ (ivan-ido-face))
(ivan-keymap-define ido-common-completion-map
"C-n" ido-next-match
"C-p" ido-prev-match
@@ -48,6 +49,7 @@
(ivan-keymap-define ido-file-dir-completion-map
"M-k" ivan-ido-map-m-k))
+
(defun ivan-ido-home ()
"Open home dir."
(interactive)
@@ -84,11 +86,12 @@
;; Prevent ido from abbreviating long directory path
ido-max-file-prompt-width 0)
-(ivan-face
- ido-subdir yellow
- ido-only-match green
- ido-incomplete-regexp red
- ido-first-match orange)
+(defun ivan-ido-face ()
+ (ivan-face
+ ido-subdir yellow
+ ido-only-match green
+ ido-incomplete-regexp red
+ ido-first-match orange))
;; Copyright (C) 2007 Ivan Kanis
;; Author: Ivan Kanis
...
build and install bzr emacs before launching it
File modified: bin/bgn.sh
Change782 at Mon Jul 18 16:43:05 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r fe1b20d323da -r 8ad16422b6f5 bin/bgn.sh
--- a/bin/bgn.sh Mon Jul 18 16:22:47 2011 +0200
+++ b/bin/bgn.sh Mon Jul 18 16:43:05 2011 +0200
@@ -3,11 +3,12 @@
build_bzr_emacs () {
bbe_src=${HOME}/src/emacs-bzr/trunk
bbe_pwd=`pwd`
-
- cd ${bbe_src}
- bzr pull
- make install
- cd ${bbe_pwd}
+ if test -d ${bbe_src} ; then
+ cd ${bbe_src}
+ bzr pull
+ make -j2 install
+ cd ${bbe_pwd}
+ fi
}
update_web () {
@@ -97,7 +98,6 @@
fn_rsync ~/lucia ${PORTABLE_DIR}/backup
fn_rsync ${PORTABLE_DIR}/listen ~/backup --delete
fn_rsync ${KEEL_DIR} ~/backup
- build_bzr_emacs
${SHELL}
}
@@ -112,7 +112,6 @@
fn_rsync ${PORTABLE_DIR}/backup/lucia ~/backup
fn_rsync ${KEEL_DIR} ~/backup
fn_rsync ~/bob ${PORTABLE_DIR}/backup/yan
- build_bzr_emacs
fn_rsync_net bld:~/keep ${PORTABLE_DIR}/backup/bld --delete
fn_rsync_net bldmac:~/keep ${PORTABLE_DIR}/backup/bldmac --delete
fn_rsync_net zen:~/keep ${PORTABLE_DIR}/backup/zen --delete
@@ -183,8 +182,9 @@
fn_check "compilation error"
ssh_key_password
misc_stuff
...
remove tags that only work with vim
File modified: bin/tags
Change781 at Mon Jul 18 16:22:47 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r da79bb4daf98 -r fe1b20d323da bin/tags
--- a/bin/tags Mon Jul 18 16:22:16 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-!_TAG_FILE_FORMAT 2 /extended format; --format=1 will not append ;" to lines/
-!_TAG_FILE_SORTED 1 /0=unsorted, 1=sorted, 2=foldcase/
-!_TAG_PROGRAM_AUTHOR Darren Hiebert /dhiebert@users.sourceforge.net/
-!_TAG_PROGRAM_NAME Exuberant Ctags //
-!_TAG_PROGRAM_URL http://ctags.sourceforge.net /official site/
-!_TAG_PROGRAM_VERSION 5.8 //
-apt_get_install setup.sh /^apt_get_install () {$/;" f
-apt_install setup.sh /^apt_install () {$/;" f
-backup_kanis_fr bgn.sh /^backup_kanis_fr () {$/;" f
-build_elisp setup.sh /^build_elisp () {$/;" f
-build_emacs setup.sh /^build_emacs () {$/;" f
-build_stumpwm setup.sh /^build_stumpwm () {$/;" f
-check flac2mp3.sh /^check () {$/;" f
-common_tee function.sh /^common_tee () {$/;" f
-configure_vc setup.sh /^configure_vc () {$/;" f
-do_path setup.sh /^do_path () {$/;" f
-domain_name setup.sh /^domain_name () {$/;" f
-fn_arch function.sh /^fn_arch () {$/;" f
-fn_banner function.sh /^fn_banner () {$/;" f
-fn_cd function.sh /^fn_cd () {$/;" f
-fn_check function.sh /^fn_check () {$/;" f
-fn_cp function.sh /^fn_cp () {$/;" f
-fn_cpr function.sh /^fn_cpr () {$/;" f
-fn_cygpath function.sh /^fn_cygpath () {$/;" f
-fn_cygwin function.sh /^fn_cygwin () {$/;" f
-fn_dos_print function.sh /^fn_dos_print () {$/;" f
-fn_exists function.sh /^fn_exists () {$/;" f
-fn_ln function.sh /^fn_ln () {$/;" f
-fn_mac_mount_ntfs_write function.sh /^fn_mac_mount_ntfs_write () {$/;" f
-fn_mail_attach function.sh /^fn_mail_attach () {$/;" f
-fn_mail_body function.sh /^fn_mail_body () {$/;" f
-fn_mail_ko function.sh /^fn_mail_ko () {$/;" f
-fn_mail_send function.sh /^fn_mail_send () {$/;" f
-fn_mail_subject function.sh /^fn_mail_subject () {$/;" f
-fn_mkdir function.sh /^fn_mkdir () {$/;" f
-fn_print function.sh /^fn_print () {$/;" f
-fn_rsync function.sh /^fn_rsync () {$/;" f
...
remove ntsf3g (typo), add lockfile library
File modified: bin/setup.sh
Change780 at Mon Jul 18 16:22:16 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r 343a2744f2bd -r da79bb4daf98 bin/setup.sh
--- a/bin/setup.sh Mon Jul 18 16:20:24 2011 +0200
+++ b/bin/setup.sh Mon Jul 18 16:22:16 2011 +0200
@@ -323,6 +323,7 @@
libgnutls-dev \
libgtk2.0-dev \
libjpeg62-dev \
+ liblockfile-dev \
libm17n-dev \
libotf-dev \
libncurses5-dev \
@@ -342,7 +343,6 @@
man-db \
manpages-dev \
mercurial \
- ntfs3g \
genisoimage \
mp3info \
mplayer \
@@ -366,7 +366,7 @@
xpdf-reader \
xsltproc \
xterm \
- zsh >> ${fn_log}
+ zsh >> ${fn_log} 2>&1
}
## environment code
launch bzr emacs if installed
File modified: bin/emacs.sh
Change779 at Mon Jul 18 16:20:24 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r 6b85a3f8e196 -r 343a2744f2bd bin/emacs.sh
--- a/bin/emacs.sh Mon Jul 18 16:14:41 2011 +0200
+++ b/bin/emacs.sh Mon Jul 18 16:20:24 2011 +0200
@@ -6,11 +6,16 @@
shift
fi
+bzr_emacs=${HOME}/emacs-bzr
+if test -d ${bzr_emacs} && test -z "${IVAN_USER}" ; then
+ exec ${bzr_emacs}/bin/emacs $*
+fi
+
# prevent GUI agent window popping up
unset GPG_AGENT_INFO
# redirection for obscure pulse audio error
-emacs $* > /dev/null 2>&1
+exec emacs $* > /dev/null 2>&1
# Local Variables:
# compile-command: "sh emacs.sh"
refactor sync with background
- add build bzr emacs in background tasks
- remove tny
- fix net backup
File modified: bin/bgn.sh
Change778 at Mon Jul 18 16:14:41 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r b786c7ebe25e -r 6b85a3f8e196 bin/bgn.sh
--- a/bin/bgn.sh Mon Jul 18 16:12:27 2011 +0200
+++ b/bin/bgn.sh Mon Jul 18 16:14:41 2011 +0200
@@ -1,5 +1,15 @@
#!/bin/sh
+build_bzr_emacs () {
+ bbe_src=${HOME}/src/emacs-bzr/trunk
+ bbe_pwd=`pwd`
+
+ cd ${bbe_src}
+ bzr pull
+ make install
+ cd ${bbe_pwd}
+}
+
update_web () {
uw_dest="kanis.fr:~/www/"
uw_hg="${HOME}/tmp/hg"
@@ -80,37 +90,32 @@
~/src/stumpwm/stumpwm > /dev/null 2>&1 &
update_web
backup_kanis_fr
- exec screen ${0} --rsync
+ exec screen ${0} --background
}
-tao_rsync () {
+tao_background () {
fn_rsync ~/lucia ${PORTABLE_DIR}/backup
fn_rsync ${PORTABLE_DIR}/listen ~/backup --delete
fn_rsync ${KEEL_DIR} ~/backup
+ build_bzr_emacs
${SHELL}
}
-tny () {
- killall compiz &
- ${HOME}/src/stumpwm/stumpwm &
- skype &
- exec screen ${SHELL}
...
add tags that work with emacs and vim
File modified: bin/TAGS
Change777 at Mon Jul 18 16:12:27 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r 4b54555db359 -r b786c7ebe25e bin/TAGS
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/TAGS Mon Jul 18 16:12:27 2011 +0200
@@ -0,0 +1,101 @@
+
+bgn.sh,632
+update_web () {update_web3,11
+backup_kanis_fr () {backup_kanis_fr24,614
+mercurial_pull () {mercurial_pull33,779
+set_alsa_mixer () {set_alsa_mixer45,1014
+set_xmodmap () {set_xmodmap52,1167
+ssh_key_password () {ssh_key_password59,1304
+launch_browser () {launch_browser66,1448
+mac () {mac74,1641
+tao () {tao78,1669
+tao_rsync () {tao_rsync86,1848
+tny () {tny93,2011
+yan () {yan100,2115
+yan_rsync () {yan_rsync107,2223
+function_exists () {function_exists118,2592
+host_action () {host_action123,2696
+host_rsync () {host_rsync134,2996
+mount_keel () {mount_keel140,3101
+misc_stuff () {misc_stuff147,3254
+
+emacs.sh,0
+
+excel.sh,0
+
+flac2mp3.sh,22
+check () {check3,11
+
+function.sh,1132
+fn_rsync () {fn_rsync4,55
+fn_rsync_net () {fn_rsync_net22,484
+fn_sync_keel () {fn_sync_keel32,717
+fn_cd () {fn_cd54,1386
+fn_ln () {fn_ln59,1460
+fn_sed ()fn_sed73,1758
+fn_arch () {fn_arch96,2248
+fn_tee () {fn_tee115,2896
...
don't chase symlinks anymore in emacs
File modified: emacs/init/ivan-var.el
Change776 at Mon Jul 18 15:25:37 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r c2867151a277 -r 4b54555db359 emacs/init/ivan-var.el
--- a/emacs/init/ivan-var.el Mon Jul 18 14:41:08 2011 +0200
+++ b/emacs/init/ivan-var.el Mon Jul 18 15:25:37 2011 +0200
@@ -89,9 +89,6 @@
;; put url cookie in temporary directory
user-emacs-directory ivan-var-tmp-dir
- ;; chase real file
- find-file-visit-truename t
-
;; Modes that will get font highlighting
font-lock-global-modes t
add libtool for bzr emacs
File modified: bin/setup.sh
Change775 at Mon Jul 18 14:41:08 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r 2630dcfc5f18 -r c2867151a277 bin/setup.sh
--- a/bin/setup.sh Mon Jul 18 14:38:11 2011 +0200
+++ b/bin/setup.sh Mon Jul 18 14:41:08 2011 +0200
@@ -334,6 +334,7 @@
libtemplate-perl \
libtiff4-dev \
libtimedate-perl \
+ libtool \
libpurple-dev \
libxml-simple-perl \
libxml2-dev \
turn off cdpath and chase links
File modified: conf/zshrc
Change774 at Mon Jul 18 14:38:11 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r c7c520d7af84 -r 2630dcfc5f18 conf/zshrc
--- a/conf/zshrc Mon Jul 18 12:16:30 2011 +0200
+++ b/conf/zshrc Mon Jul 18 14:38:11 2011 +0200
@@ -72,10 +72,5 @@
# zed -f edit function in place, ^j quits editor
autoload zed
-# cdpath is a list of directories whose subdirectories you may want to
-# change into. If you use a normal cd command (i.e. in the form `cd
-# dirname', and dirname does not begin with a / or ~, the shell will
-# look through the directories in $cdpath to find one which contains
-# the subdirectory dirname. If $cdpath isn't set, as you'd guess, it
-# just uses the current directory.
-cdpath=(/media/portable ${VC_DIR}/emacs ${VC_DIR} ~ .)
+# Don't resolve symbolic links to their true values.
+unsetopt chase_links
add zsh and bzr emacs dependencies
File modified: bin/setup.sh
Change773 at Mon Jul 18 12:16:30 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r 8edaadcf3121 -r c7c520d7af84 bin/setup.sh
--- a/bin/setup.sh Mon Jul 18 12:14:25 2011 +0200
+++ b/bin/setup.sh Mon Jul 18 12:16:30 2011 +0200
@@ -298,6 +298,7 @@
autoconf \
automake \
bzip2 \
+ bzr \
cl-clx-sbcl \
cl-ppcre \
diff \
@@ -319,6 +320,7 @@
lftp \
libdbus-1-dev \
libgif-dev \
+ libgnutls-dev \
libgtk2.0-dev \
libjpeg62-dev \
libm17n-dev \
@@ -362,7 +364,8 @@
x11proto-core-dev \
xpdf-reader \
xsltproc \
- xterm
+ xterm \
+ zsh >> ${fn_log}
}
## environment code
indent package lists for code folding
File modified: bin/setup.sh
Change772 at Mon Jul 18 12:14:25 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r c3d0f09102cb -r 8edaadcf3121 bin/setup.sh
--- a/bin/setup.sh Mon Jul 18 11:06:00 2011 +0200
+++ b/bin/setup.sh Mon Jul 18 12:14:25 2011 +0200
@@ -258,111 +258,111 @@
yum_install () {
yum install \
-apr-devel \
-apr-util-devel \
-aspell-en \
-aspell-fr \
-bzip2-devel \
-eblook \
-freetype-devel \
-fuse \
-giflib-devel \
-gnutls \
-gnutls-utils \
-httpd-devel \
-kakasi \
-lftp \
-libX11-devel \
-libXpm-devel \
-libjpeg-devel \
-libpng-devel \
-libpurple-devel \
-libtiff-devel \
-libxml2-devel \
-mp3info \
-mplayer \
-mumble \
-openssh-server \
-vim \
-w3m \
-xorg-x11-fonts-misc \
-xterm \
-zlib-devel >> ${fn_log}
+ apr-devel \
+ apr-util-devel \
+ aspell-en \
+ aspell-fr \
...
make root setup optional
File modified: bin/setup.sh
Change771 at Mon Jul 18 11:06:00 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r 7ff61f1eb523 -r c3d0f09102cb bin/setup.sh
--- a/bin/setup.sh Mon Jul 18 11:05:14 2011 +0200
+++ b/bin/setup.sh Mon Jul 18 11:06:00 2011 +0200
@@ -43,7 +43,7 @@
prompt_option () {
printf "The log file is ${fn_log}.\n"
if test ! -d ${PORTABLE_DIR} ; then
- cat << EOF
+ cat <<EOF
Couldn't find the external drive. Proceding with install means that
source code will not be under version control. It also means that
the signature of the emacs compressed file will not be checked.
@@ -54,14 +54,21 @@
exit 0
fi
fi
- cat <<EOF
+ printf "Setup with root privileges? y/N: "
+ read SETUP_ROOT=
+ export SETUP_ROOT
+ if test x${SETUP_ROOT} = xy ; then
+ cat <<EOF
Setting up sudo without password. Answering y will introduce a huge
security hole. Don't do this when setting up a server!
EOF
- printf "Install sudo without password? [y/N]: "
- read OPTION_SUDO
- export OPTION_SUDO
+ printf "Install sudo without password? [y/N]: "
+ read OPTION_SUDO
+ export OPTION_SUDO
+ else
+ OPTION_SUDO=n
+ fi
}
install_sudo () {
@@ -233,18 +240,20 @@
build_stumpwm () {
...
hgrc is generated by setup.sh
File modified: conf/hgrc
Change770 at Mon Jul 18 11:05:14 2011 +0200 by Ivan Kanis <ivan@yan>
diff -r 4c7d58f3e378 -r 7ff61f1eb523 conf/hgrc
--- a/conf/hgrc Mon Jul 18 10:21:17 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-[ui]
-username = Ivan Kanis <ivan@foo>
-merge = internal:merge
-
add tags
File modified: bin/tags
Change769 at Mon Jul 18 10:21:17 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 5c0efc3542e1 -r 4c7d58f3e378 bin/tags
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/tags Mon Jul 18 10:21:17 2011 +0200
@@ -0,0 +1,87 @@
+!_TAG_FILE_FORMAT 2 /extended format; --format=1 will not append ;" to lines/
+!_TAG_FILE_SORTED 1 /0=unsorted, 1=sorted, 2=foldcase/
+!_TAG_PROGRAM_AUTHOR Darren Hiebert /dhiebert@users.sourceforge.net/
+!_TAG_PROGRAM_NAME Exuberant Ctags //
+!_TAG_PROGRAM_URL http://ctags.sourceforge.net /official site/
+!_TAG_PROGRAM_VERSION 5.8 //
+apt_get_install setup.sh /^apt_get_install () {$/;" f
+apt_install setup.sh /^apt_install () {$/;" f
+backup_kanis_fr bgn.sh /^backup_kanis_fr () {$/;" f
+build_elisp setup.sh /^build_elisp () {$/;" f
+build_emacs setup.sh /^build_emacs () {$/;" f
+build_stumpwm setup.sh /^build_stumpwm () {$/;" f
+check flac2mp3.sh /^check () {$/;" f
+common_tee function.sh /^common_tee () {$/;" f
+configure_vc setup.sh /^configure_vc () {$/;" f
+do_path setup.sh /^do_path () {$/;" f
+domain_name setup.sh /^domain_name () {$/;" f
+fn_arch function.sh /^fn_arch () {$/;" f
+fn_banner function.sh /^fn_banner () {$/;" f
+fn_cd function.sh /^fn_cd () {$/;" f
+fn_check function.sh /^fn_check () {$/;" f
+fn_cp function.sh /^fn_cp () {$/;" f
+fn_cpr function.sh /^fn_cpr () {$/;" f
+fn_cygpath function.sh /^fn_cygpath () {$/;" f
+fn_cygwin function.sh /^fn_cygwin () {$/;" f
+fn_dos_print function.sh /^fn_dos_print () {$/;" f
+fn_exists function.sh /^fn_exists () {$/;" f
+fn_ln function.sh /^fn_ln () {$/;" f
+fn_mac_mount_ntfs_write function.sh /^fn_mac_mount_ntfs_write () {$/;" f
+fn_mail_attach function.sh /^fn_mail_attach () {$/;" f
+fn_mail_body function.sh /^fn_mail_body () {$/;" f
+fn_mail_ko function.sh /^fn_mail_ko () {$/;" f
+fn_mail_send function.sh /^fn_mail_send () {$/;" f
+fn_mail_subject function.sh /^fn_mail_subject () {$/;" f
+fn_mkdir function.sh /^fn_mkdir () {$/;" f
+fn_print function.sh /^fn_print () {$/;" f
+fn_rsync function.sh /^fn_rsync () {$/;" f
...
rewrite (let (while (let* with mapc
File modified: emacs/bbdb/bbdb-picture.el
Change768 at Mon Jul 18 07:35:46 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 7d92f0658eaf -r 5c0efc3542e1 emacs/bbdb/bbdb-picture.el
--- a/emacs/bbdb/bbdb-picture.el Sun Jul 17 10:22:19 2011 +0200
+++ b/emacs/bbdb/bbdb-picture.el Mon Jul 18 07:35:46 2011 +0200
@@ -35,19 +35,16 @@
(defun bbdb-picture-display-image (name)
"Search for face properties and display the faces."
- (let ((extension bbdb-picture-extension))
- (while extension
- (let* ((image-file (concat bbdb-picture-path
- name
- (car extension)))
- (image (if (file-exists-p image-file)
- (create-image image-file))))
- (if image
- (progn
- (insert " ")
- (insert-image image)
- (setq extension nil))
- (setq extension (cdr extension)))))))
+ (mapc 'bbdb-picture-insert-image bbdb-picture-extension))
+
+(defun bbdb-picture-insert-image (extension)
+ "Insert image matching name and extension."
+ (let* ((image-file (concat bbdb-picture-path name extension))
+ (image (when (file-exists-p image-file)
+ (create-image image-file))))
+ (when image
+ (insert " ")
+ (insert-image image))))
(defun bbdb-format-record-name-company (record)
"Display name, company and picture.
remount ntfs drive writable to backup keep on mac
File modified: bin/bgn.sh bin/function.sh bin/stop.sh
Change767 at Sun Jul 17 10:22:19 2011 +0200 by Ivan Kanis <ivan@mac.foo>
diff -r 4fc2a8287445 -r 7d92f0658eaf bin/stop.sh
--- a/bin/stop.sh Sat Jul 16 15:58:39 2011 +0200
+++ b/bin/stop.sh Sun Jul 17 10:22:19 2011 +0200
@@ -4,18 +4,6 @@
. ${cur_dir}/function.sh
-mac_mount_ntfs_write () {
- if test x`uname` = xDarwin ; then
- sudo umount "${PORTABLE_DIR}"
- hd_device=`diskutil list | grep "${HD_NAME}" | awk '{printf $6}'`
- uid=`id -u`
- gid=`id -g`
- sudo ntfs-3g -o "uid=${uid},gid=${gid}" \
- "/dev/${hd_device}" "${PORTABLE_DIR}"
- fn_check "error mounting ${PORTABLE_DIR}"
- fi
-}
-
mercurial_push () {
if test -d ${KEEL_DIR} ; then
cd ${HOME}/hg
improvement to zsh
- load optianal settings in ~/keep/local.sh
- add magic_equal_subst and extended_glog
File modified: conf/zshrc
Change766 at Sat Jul 16 15:58:39 2011 +0200 by Ivan Kanis <ivan@mac.foo>
diff -r 30718c009e12 -r 4fc2a8287445 conf/zshrc
--- a/conf/zshrc Sat Jul 16 15:57:06 2011 +0200
+++ b/conf/zshrc Sat Jul 16 15:58:39 2011 +0200
@@ -11,6 +11,13 @@
${HOME}/hg/bin/setup.sh --interactive > ${file}
source ${file}
+# eventual local setting
+setup_local=${HOME}/keep/local.sh
+if test -f ${setup_local} ; then
+ source ${setup_local}
+fi
+
+
# Use emacs keybindings even if our EDITOR is set to vi
bindkey -e
@@ -35,6 +42,22 @@
# changes to the parent directory.
setopt auto_cd
+# It's often useful to have this feature with commands of your
+# own. There is an option, MAGIC_EQUAL_SUBST, which spots the forms
+# '...=~...' and '...=...:~...' for any command at all and expands
+# ~-expressions. Commands where this is particularly useful include make
+# and the GNU configure command used for setting up the compilation of a
+# software package from scratch.
+setopt magic_equal_subst
+
+# Setting EXTENDED_GLOB makes three new types of operator available:
+# those which excluded a particular pattern from matching; those which
+# specify that a pattern may occur a repeated number of times; and a set
+# of 'globbing flags', a little bit like parameter flags which I’ll
+# describe in a later section since they are really the icing on the
+# cake.
+setopt extended_glob
+
# If you have CORRECT set, the shell will check all the commands you
# type and if they don't exist, but there is one with a similar name,
# it will ask you if you meant that one instead. You can type `n' for
...
start screen on the mac
File modified: bin/bgn.sh
Change765 at Sat Jul 16 15:57:06 2011 +0200 by Ivan Kanis <ivan@mac.foo>
diff -r ce50ede5e5bb -r 30718c009e12 bin/bgn.sh
--- a/bin/bgn.sh Sat Jul 16 11:38:39 2011 +0200
+++ b/bin/bgn.sh Sat Jul 16 15:57:06 2011 +0200
@@ -71,6 +71,10 @@
fi
}
+mac () {
+ exec screen
+}
+
tao () {
# ignore secure output error generated by pulse audio
~/src/stumpwm/stumpwm > /dev/null 2>&1 &
zsh improvements
- setup fink in setup.sh
- bind kill-region and push-line-or edit
File modified: conf/zshrc
Change764 at Sat Jul 16 11:38:39 2011 +0200 by Ivan Kanis <ivan@mac.foo>
diff -r 89919f066ce6 -r ce50ede5e5bb conf/zshrc
--- a/conf/zshrc Sat Jul 16 11:34:30 2011 +0200
+++ b/conf/zshrc Sat Jul 16 11:38:39 2011 +0200
@@ -1,8 +1,5 @@
# Set up the prompt
-# fink
-test -r /sw/bin/init.sh && . /sw/bin/init.sh
-
# Here the test is, reasonably enough, `%(?...'. Putting these two
# together, you can get a message which is only displayed when the exit
# status is non-zero
@@ -17,6 +14,10 @@
# Use emacs keybindings even if our EDITOR is set to vi
bindkey -e
+# keybinding
+bindkey '^w' kill-region
+bindkey '^q' push-line-or-edit
+
# History sharing and huge size
HISTSIZE=10000
SAVEHIST=10000
@@ -45,6 +46,9 @@
autoload -Uz compinit
compinit
+# zed -f edit function in place, ^j quits editor
+autoload zed
+
# cdpath is a list of directories whose subdirectories you may want to
# change into. If you use a normal cd command (i.e. in the form `cd
# dirname', and dirname does not begin with a / or ~, the shell will
add fink and MacPorts, privilege to fink
+ some small solari refactor
File modified: bin/setup.sh
Change763 at Sat Jul 16 11:34:30 2011 +0200 by Ivan Kanis <ivan@mac.foo>
diff -r a95be5cff93f -r 89919f066ce6 bin/setup.sh
--- a/bin/setup.sh Fri Jul 15 19:19:50 2011 +0200
+++ b/bin/setup.sh Sat Jul 16 11:34:30 2011 +0200
@@ -377,6 +377,7 @@
printf "unknown"
}
+# prefer fink over MacPorts
path () {
do_path "PATH" "${PATH}" "\
${HOME}/hg/bin \
@@ -393,6 +394,10 @@
/opt/csw/apache2/sbin \
/opt/csw/bin \
/opt/csw/gcc3/bin \
+_/opt/local/bin \
+_/opt/local/sbin \
+_/sw/bin \
+_/sw/sbin \
/sbin \
/usr/X11/bin \
/usr/bin \
@@ -413,6 +418,8 @@
${local_path}/man \
/opt/csw/apache2/man \
/opt/csw/man \
+/sw/share/man \
+/opt/local/man \
/usr/X11R6/man \
/usr/local/man \
/usr/local/man \
@@ -426,6 +433,10 @@
${local_path}/lib \
/opt/csw/lib\
"
+ do_path "INFOPATH" "${INFOPATH}" "\
+/sw/share/ivan \
+/sw/info \
+"
}
...
support multiple extensions by Adam Sj¯gren
File modified: emacs/bbdb/bbdb-picture.el
Change762 at Fri Jul 15 19:19:50 2011 +0200 by Ivan Kanis <ivan@mac.foo>
diff -r b43a424904c1 -r a95be5cff93f emacs/bbdb/bbdb-picture.el
--- a/emacs/bbdb/bbdb-picture.el Fri Jul 15 18:56:15 2011 +0200
+++ b/emacs/bbdb/bbdb-picture.el Fri Jul 15 19:19:50 2011 +0200
@@ -11,6 +11,8 @@
;;; THANKS:
+;;; support multiple extensions by Adam Sjøgren
+
;;; BUGS:
;;; INSTALLATION:
@@ -28,20 +30,24 @@
"Directory where pictures are stored.
Don't forget to put a trailing slash.")
-(defvar bbdb-picture-extension ".png"
- "Extension of your picture.")
+(defvar bbdb-picture-extension '(".png" ".jpg" ".gif" ".xmp")
+ "List of extensions of your picture.")
(defun bbdb-picture-display-image (name)
"Search for face properties and display the faces."
- (let* ((image-file (concat bbdb-picture-path
- name
- bbdb-picture-extension))
- (image (if (file-exists-p image-file)
- (create-image image-file))))
- (if image
- (progn
- (insert " ")
- (insert-image image)))))
+ (let ((extension bbdb-picture-extension))
+ (while extension
+ (let* ((image-file (concat bbdb-picture-path
+ name
+ (car extension)))
+ (image (if (file-exists-p image-file)
+ (create-image image-file))))
+ (if image
+ (progn
...
doc fix by Adam Sj¯gren
File modified: emacs/bbdb/bbdb-picture.el
Change761 at Fri Jul 15 18:56:15 2011 +0200 by Ivan Kanis <ivan@mac.foo>
diff -r 347999770860 -r b43a424904c1 emacs/bbdb/bbdb-picture.el
--- a/emacs/bbdb/bbdb-picture.el Mon Jul 11 19:21:29 2011 +0200
+++ b/emacs/bbdb/bbdb-picture.el Fri Jul 15 18:56:15 2011 +0200
@@ -18,7 +18,7 @@
;;; Put this file somewhere in your load-path then stick this in your
;;; .emacs
-;;; (require 'bbdb-picture.el)
+;;; (require 'bbdb-picture)
;;; Code:
only compile elim on Linux
File modified: emacs/Makefile
Change760 at Mon Jul 11 19:21:29 2011 +0200 by Ivan Kanis <ivan@mac.foo>
diff -r f112805102a2 -r 347999770860 emacs/Makefile
--- a/emacs/Makefile Sun Jul 03 19:50:35 2011 +0200
+++ b/emacs/Makefile Mon Jul 11 19:21:29 2011 +0200
@@ -24,7 +24,9 @@
init
ifndef ComSpec
-SUBDIR += elim
+ ifeq ($(shell uname), Linux)
+ SUBDIR += elim
+ endif
endif
.PHONY: $(SUBDIR) all clean install
redirect errors from emacs and stumpwm
hide secure output error generated by pulse audio
add private shell script
File modified: bin/bgn.sh bin/emacs.sh bin/function.sh bin/stop.sh
Change759 at Sun Jul 03 19:50:35 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r de8448ba131d -r f112805102a2 bin/stop.sh
--- a/bin/stop.sh Sun Jul 03 19:48:42 2011 +0200
+++ b/bin/stop.sh Sun Jul 03 19:50:35 2011 +0200
@@ -19,7 +19,7 @@
mercurial_push () {
if test -d ${KEEL_DIR} ; then
cd ${HOME}/hg
- hg push ${KEEL_DIR}/hg
+ hg push ${FN_VC_SERVER}
fn_check "error pushing mercurial"
fi
}
update zsh config
- show return error on prompt
- add auto_cd and correct
File modified: conf/zshrc
Change758 at Sun Jul 03 19:48:42 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 0723377a113e -r de8448ba131d conf/zshrc
--- a/conf/zshrc Sun Jul 03 17:14:37 2011 +0200
+++ b/conf/zshrc Sun Jul 03 19:48:42 2011 +0200
@@ -1,11 +1,14 @@
# Set up the prompt
-PROMPT="%m%# "
-RPROMPT="%~"
-
# fink
test -r /sw/bin/init.sh && . /sw/bin/init.sh
+# Here the test is, reasonably enough, `%(?...'. Putting these two
+# together, you can get a message which is only displayed when the exit
+# status is non-zero
+PS1="%m%(?..(%?%))%# "
+RPS1="%~"
+
# setup environment with a script
file=/tmp/setenv.$$
${HOME}/hg/bin/setup.sh --interactive > ${file}
@@ -19,9 +22,33 @@
SAVEHIST=10000
HISTFILE=~/.history
setopt share_history
-setopt APPEND_HISTORY
+setopt append_history
+setopt extended_history
+setopt hist_ignore_all_dups
+
+# If this option is set, and you type something with no arguments which
+# isn't a command, zsh will check to see if it's actually a directory.
+# If it is, the shell will change to that directory. So `./bin' on its
+# own is equivalent to `cd ./bin', as long as the directory `./bin'
+# really exists. This is particularly useful in the form `..', which
+# changes to the parent directory.
+setopt auto_cd
+
+# If you have CORRECT set, the shell will check all the commands you
+# type and if they don't exist, but there is one with a similar name,
+# it will ask you if you meant that one instead. You can type `n' for
...
add imagemagick wand library for emacs 24.x
File modified: bin/setup.sh
Change757 at Sun Jul 03 17:14:37 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 56e3f25ef622 -r 0723377a113e bin/setup.sh
--- a/bin/setup.sh Sun Jul 03 17:14:14 2011 +0200
+++ b/bin/setup.sh Sun Jul 03 17:14:37 2011 +0200
@@ -315,6 +315,7 @@
libm17n-dev \
libotf-dev \
libncurses5-dev \
+libmagickwand-dev \
libpng12-dev \
libpurple-dev \
librep-dev \
turn off xon/xoff
File modified: bin/setup.sh
Change756 at Sun Jul 03 17:14:14 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r ce7214ebbc75 -r 56e3f25ef622 bin/setup.sh
--- a/bin/setup.sh Sun Jul 03 10:40:26 2011 +0200
+++ b/bin/setup.sh Sun Jul 03 17:14:14 2011 +0200
@@ -481,9 +481,11 @@
}
setup_environment () {
+ # set wrapping of man for easier reading
printf "export MANWIDTH=80\n"
- # Prompt
+ # turn off xon/xoff
+ printf "stty -ixon\n"
}
solaris () {
fix bug introduced by save-place in blog
File modified: emacs/init/ivan-muse.el
Change755 at Sun Jul 03 10:40:26 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 26e1ec804e69 -r ce7214ebbc75 emacs/init/ivan-muse.el
--- a/emacs/init/ivan-muse.el Sat Jul 02 19:49:13 2011 +0200
+++ b/emacs/init/ivan-muse.el Sun Jul 03 10:40:26 2011 +0200
@@ -68,6 +68,7 @@
((string= blog "french") "blog-fr")
(t "blog"))))
(find-file (concat ivan-var-web-dir muse ".muse"))
+ (goto-line 1)
(forward-line 2)
(insert (format-time-string "* %Y%m%d "))
(save-excursion
add incoming list to random music picker
File modified: emacs/init/ivan-emms.el
Change754 at Sat Jul 02 19:49:13 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 2c73b3be1f9c -r 26e1ec804e69 emacs/init/ivan-emms.el
--- a/emacs/init/ivan-emms.el Tue Jun 28 10:27:54 2011 +0200
+++ b/emacs/init/ivan-emms.el Sat Jul 02 19:49:13 2011 +0200
@@ -106,6 +106,7 @@
(interactive)
(ivan-emms-init)
(let ((playlist (vconcat (ivan-emms-pick-album "zic")
+ (ivan-emms-pick-album "fresh")
(ivan-emms-pick-album "listen"))))
(emms-shuffle-vector playlist)
(ivan-emms-play-list playlist)
Fix indentation for mail link with org capture
File modified: emacs/init/ivan-org.el
Change753 at Tue Jun 28 10:27:54 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r e3c9f2d5408c -r 2c73b3be1f9c emacs/init/ivan-org.el
--- a/emacs/init/ivan-org.el Tue Jun 28 10:27:07 2011 +0200
+++ b/emacs/init/ivan-org.el Tue Jun 28 10:27:54 2011 +0200
@@ -196,7 +196,7 @@
org-capture-templates
'(("e" "e-mail" entry
(file+headline ivan-org-todo "In")
- "* %:subject%?\n %a")
+ "* %:subject%?\n %a")
("n" "no link" entry
(file+headline ivan-org-todo "In")
"* %?")
add zsh configuration
File modified: bin/setup.sh conf/bashrc conf/zshrc
Change752 at Tue Jun 28 10:27:07 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r a60aaf586e51 -r e3c9f2d5408c conf/zshrc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/zshrc Tue Jun 28 10:27:07 2011 +0200
@@ -0,0 +1,27 @@
+# Set up the prompt
+
+PROMPT="%m%# "
+RPROMPT="%~"
+
+# fink
+test -r /sw/bin/init.sh && . /sw/bin/init.sh
+
+# setup environment with a script
+file=/tmp/setenv.$$
+${HOME}/hg/bin/setup.sh --interactive > ${file}
+source ${file}
+
+# Use emacs keybindings even if our EDITOR is set to vi
+bindkey -e
+
+# History sharing and huge size
+HISTSIZE=10000
+SAVEHIST=10000
+HISTFILE=~/.history
+setopt share_history
+setopt APPEND_HISTORY
+
+# Use modern completion system
+autoload -Uz compinit
+compinit
+
delete a normal space if it exists, useful with abbrev
File modified: emacs/init/ivan-french.el
Change751 at Fri Jun 24 20:28:27 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 3a2c929d1649 -r a60aaf586e51 emacs/init/ivan-french.el
--- a/emacs/init/ivan-french.el Fri Jun 24 08:37:06 2011 +0200
+++ b/emacs/init/ivan-french.el Fri Jun 24 20:28:27 2011 +0200
@@ -81,9 +81,16 @@
(string= "«" quote)) " »" "« "))))
(defmacro ivan-french-insert-space (symbol char)
+ "Define function that will insert non breaking space for french
+character such as the question mark. It will delete a normal
+space if it exists. This useful after expanding an abbreviation."
`(defun ,(intern (concat "ivan-french-" symbol)) ()
(interactive)
- (insert ,(concat "Â " char))))
+ (let* ((point (point))
+ (end (if (> point 0) (- point 1))))
+ (if (re-search-backward " " end t)
+ (delete-char 1)))
+ (insert ,(concat "Â " char))))
(ivan-french-insert-space "question" "?")
(ivan-french-insert-space "exclamation" "!")
install zsh
File modified: bin/bgn.sh
Change750 at Fri Jun 24 08:37:06 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 7316efc1bdac -r 3a2c929d1649 bin/bgn.sh
--- a/bin/bgn.sh Thu Jun 23 20:36:02 2011 +0200
+++ b/bin/bgn.sh Fri Jun 24 08:37:06 2011 +0200
@@ -171,6 +171,8 @@
emacs.sh &
launch_browser
host_action
+ sudo apt-get install zsh zsh-doc
+ chsh
fi
# Local Variables:
fix stupid bugs
File modified: bin/bgn.sh
Change749 at Thu Jun 23 20:36:02 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 8289c3fe4e84 -r 7316efc1bdac bin/bgn.sh
--- a/bin/bgn.sh Wed Jun 22 22:39:09 2011 +0200
+++ b/bin/bgn.sh Thu Jun 23 20:36:02 2011 +0200
@@ -9,7 +9,8 @@
fn_check "Failed to update RSS mercurial blog"
python "${VC_DIR}/bin/blog-archive.py"
fn_check "Failed to update archive blog"
- cat ${VC_DIR}/function.sh ${VC_DIR}/setup.sh > ${WEB_DIR}/bootstrap.sh
+ cat ${VC_DIR}/bin/function.sh ${VC_DIR}/bin/setup.sh > \
+ ${WEB_DIR}/bootstrap.sh
fn_rsync_net "${WEB_DIR}/" "${uw_dest}"
if test ! -d ${uw_hg}; then
mkdir -p ${uw_hg}
@@ -70,11 +71,6 @@
fi
}
-if test x${1} = x--web ; then
- update_web
- exit 0
-fi
-
tao () {
~/src/stumpwm/stumpwm &
update_web
@@ -158,6 +154,8 @@
if test x${1} = x--rsync ; then
host_rsync
+elif test x${1} = x--web ; then
+ update_web
else
set_alsa_mixer
set_xmodmap
remove debug line in meditation script
File modified: bin/meditate.sh
Change748 at Wed Jun 22 22:39:09 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 8533d57876f0 -r 8289c3fe4e84 bin/meditate.sh
--- a/bin/meditate.sh Mon Jun 20 16:43:50 2011 +0200
+++ b/bin/meditate.sh Wed Jun 22 22:39:09 2011 +0200
@@ -21,7 +21,7 @@
else
second=`expr ${minute} \* 60`
fi
-echo $second
+
if test x${kind} = x2 ; then
eog ${cur_dir}/meditate.jpg &
pid=$!
set executable bit on meditation script
File modified: bin/meditate.sh
Change747 at Mon Jun 20 16:43:50 2011 +0200 by Ivan Kanis <ivan@tny>
wait 5 minutes before tracking irc
File modified: emacs/init/ivan-erc.el
Change746 at Mon Jun 20 13:32:50 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r a5f6fe888e2f -r 99a3a89f427e emacs/init/ivan-erc.el
--- a/emacs/init/ivan-erc.el Fri Jun 10 09:20:16 2011 +0200
+++ b/emacs/init/ivan-erc.el Mon Jun 20 13:32:50 2011 +0200
@@ -45,7 +45,7 @@
(switch-to-buffer "#emacs")
(private-erc)
;; track later
- (run-at-time 60 nil 'ivan-erc-track)
+ (run-at-time 300 nil 'ivan-erc-track)
(ivan-elim)))
(defun ivan-erc-track ()
turn off library timer
File modified: emacs/init/ivan-load.el
Change745 at Fri Jun 10 09:20:16 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 563fa141a697 -r a5f6fe888e2f emacs/init/ivan-load.el
--- a/emacs/init/ivan-load.el Thu Jun 09 09:48:56 2011 +0200
+++ b/emacs/init/ivan-load.el Fri Jun 10 09:20:16 2011 +0200
@@ -6,7 +6,7 @@
(defvar ivan-var-vc-dir)
(defvar init-user))
-(defvar ivan-load-time t
+(defvar ivan-load-time nil
"Set to t to display how long it takes for libraries to load.")
(defun ivan-load (file)
add easier shortcut to add cc, to and bcc field
File modified: emacs/init/ivan-message.el
Change744 at Thu Jun 09 09:48:56 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 8699f4b38f0f -r 563fa141a697 emacs/init/ivan-message.el
--- a/emacs/init/ivan-message.el Wed Jun 08 18:04:16 2011 +0200
+++ b/emacs/init/ivan-message.el Thu Jun 09 09:48:56 2011 +0200
@@ -111,7 +111,10 @@
(auto-fill-mode 1)
(ivan-keymap-define message-mode-map
"M-j a" ivan-message-mml-attach-file
- "M-j k" message-kill-to-signature))
+ "M-j b" message-goto-bcc
+ "M-j c" message-goto-cc
+ "M-j k" message-kill-to-signature
+ "M-j t" message-goto-to))
(add-hook 'message-signature-setup-hook 'ivan-message-setup)
roll back changes
File modified: emacs/init/ivan-abbrev.el
Change743 at Wed Jun 08 18:04:16 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 6b7070178283 -r 8699f4b38f0f emacs/init/ivan-abbrev.el
--- a/emacs/init/ivan-abbrev.el Wed Jun 08 13:25:27 2011 +0200
+++ b/emacs/init/ivan-abbrev.el Wed Jun 08 18:04:16 2011 +0200
@@ -12,8 +12,8 @@
(define-abbrev-table 'text-mode-abbrev-table
'(("bc" "Bien cordialement,")
- ("stp" "s'il te plaît ?")
- ("svp" "s'il vous plaît ?")
+ ("stp" "s'il te plaît")
+ ("svp" "s'il vous plaît")
("vmr" (concat "Veuillez agréer, Monsieur, "
"l'expression de mes salutations distinguées."))
("vmm" (concat "Veuillez agréer, Madame, Monsieur, "
switch to home dir at end of bgn script
File modified: bin/bgn.sh
Change742 at Wed Jun 08 13:25:27 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r cd67742e8906 -r 6b7070178283 bin/bgn.sh
--- a/bin/bgn.sh Wed Jun 08 13:24:30 2011 +0200
+++ b/bin/bgn.sh Wed Jun 08 13:25:27 2011 +0200
@@ -166,7 +166,7 @@
mercurial_pull "${KEEL_DIR}/hg" "${VC_DIR}"
fn_cd "${VC_DIR}"
make
- fn_cd ${cur_dir}
+ fn_cd "${HOME}"
fn_check "compilation error"
ssh_key_password
misc_stuff
set european date in calendar
File modified: emacs/init/ivan-calendar.el
Change741 at Wed Jun 08 13:24:30 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r d5a708432aa7 -r cd67742e8906 emacs/init/ivan-calendar.el
--- a/emacs/init/ivan-calendar.el Wed Jun 08 11:53:52 2011 +0200
+++ b/emacs/init/ivan-calendar.el Wed Jun 08 13:24:30 2011 +0200
@@ -45,8 +45,7 @@
(d (calendar-day-number date))
(days-remaining
(- (calendar-day-number (list 12 31 year)) d)))
- (format "Day %d, remain %d" d days-remaining)))
- calendar-date-style 'european)
+ (format "Day %d, remain %d" d days-remaining))))
(calendar))
(defun ivan-calendar-no-week-end (m1 d1 y1 m2 d2 y2 &optional mark)
@@ -62,6 +61,8 @@
(and (<= date1 d) (<= d date2) (not (= day 6)) (not (= day 0))
(cons mark entry))))
+(setq calendar-date-style 'european)
+
;; Local Variables:
;; compile-command: "make"
;; End:
add a question mark after stp and svp abbreviation
File modified: emacs/init/ivan-abbrev.el
Change740 at Wed Jun 08 11:53:52 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 7780467df650 -r d5a708432aa7 emacs/init/ivan-abbrev.el
--- a/emacs/init/ivan-abbrev.el Mon Jun 06 19:01:28 2011 +0200
+++ b/emacs/init/ivan-abbrev.el Wed Jun 08 11:53:52 2011 +0200
@@ -12,8 +12,8 @@
(define-abbrev-table 'text-mode-abbrev-table
'(("bc" "Bien cordialement,")
- ("stp" "s'il te plaît")
- ("svp" "s'il vous plaît")
+ ("stp" "s'il te plaît ?")
+ ("svp" "s'il vous plaît ?")
("vmr" (concat "Veuillez agréer, Monsieur, "
"l'expression de mes salutations distinguées."))
("vmm" (concat "Veuillez agréer, Madame, Monsieur, "
fix garak icons
File modified: emacs/init/ivan-elim.el
Change739 at Mon Jun 06 19:01:28 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 96552eb431ae -r 7780467df650 emacs/init/ivan-elim.el
--- a/emacs/init/ivan-elim.el Mon Jun 06 18:38:12 2011 +0200
+++ b/emacs/init/ivan-elim.el Mon Jun 06 19:01:28 2011 +0200
@@ -32,7 +32,7 @@
(setq
elim-executable (expand-file-name "~/.emacs.d/elim/elim-client")
garak-alert-methods '(ivan-elim-pop-buffer)
- garak-icon-directory (expand-file-name "~/.emacs.d/elim/icons")
+ garak-icon-directory (expand-file-name "~/.emacs.d/elim/icons/")
garak-ui-buffer-name "*chat*"
tracking-mode-map
(let ((map (make-sparse-keymap)))
no plural in SUBDIR
File modified: emacs/Makefile
Change738 at Mon Jun 06 18:38:12 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 703a18d25c75 -r 96552eb431ae emacs/Makefile
--- a/emacs/Makefile Sun Jun 05 20:02:20 2011 +0200
+++ b/emacs/Makefile Mon Jun 06 18:38:12 2011 +0200
@@ -1,6 +1,6 @@
# Makefile for building all emacs packages
-SUBDIRS = \
+SUBDIR = \
auctex \
auctex/style \
bbdb \
@@ -27,11 +27,11 @@
SUBDIR += elim
endif
-.PHONY: $(SUBDIRS) all clean install
+.PHONY: $(SUBDIR) all clean install
-all : $(SUBDIRS)
+all : $(SUBDIR)
-$(SUBDIRS):
+$(SUBDIR):
$(MAKE) -C $@ ${MAKECMDGOALS}
clean: all
modify sh-if to use test instead of []
File modified: emacs/init/ivan-shell.el
Change737 at Sun Jun 05 20:02:20 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r a692047e2139 -r 703a18d25c75 emacs/init/ivan-shell.el
--- a/emacs/init/ivan-shell.el Sun Jun 05 19:40:48 2011 +0200
+++ b/emacs/init/ivan-shell.el Sun Jun 05 20:02:20 2011 +0200
@@ -12,12 +12,15 @@
(defun ivan-sh-hook ()
(ivan-common-code-key-binding sh-mode-map)
(ivan-keymap-define sh-mode-map
- "M-j c" caps-mode)
+ "M-j c" caps-mode
+ "M-j i" sh-if)
(setq outline-regexp "^##\\|.* () {"
indent-tabs-mode nil))
(add-hook 'sh-mode-hook 'ivan-sh-hook)
+(setq sh-test '((sh "test " . 6)))
+
(ivan-face
sh-heredoc orange)
modify org capture so that e-mail subject is in the title
File modified: emacs/init/ivan-org.el
Change736 at Sun Jun 05 19:40:48 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r d7002726c085 -r a692047e2139 emacs/init/ivan-org.el
--- a/emacs/init/ivan-org.el Sun Jun 05 19:16:13 2011 +0200
+++ b/emacs/init/ivan-org.el Sun Jun 05 19:40:48 2011 +0200
@@ -194,10 +194,13 @@
org-agenda-ndays 2
org-attach-auto-tag "attach"
org-capture-templates
- '(("n" "No link" entry
+ '(("e" "e-mail" entry
+ (file+headline ivan-org-todo "In")
+ "* %:subject%?\n %a")
+ ("n" "no link" entry
(file+headline ivan-org-todo "In")
"* %?")
- ("l" "Link" entry
+ ("l" "link" entry
(file+headline ivan-org-todo "In")
"* %(ivan-org-title)%?\n %(ivan-org-link)"))
org-default-notes-file ivan-org-todo
@@ -220,11 +223,7 @@
("started" . org-wait)
("wait" . org-wait)
("done" . org-done)
- ("cancel" . org-done))
- remember-annotation-functions '(org-remember-annotation)
- remember-handler-functions '(org-remember-handler))
-
-(add-hook 'remember-mode-hook 'org-remember-apply-template)
+ ("cancel" . org-done)))
(ivan-face-gradient "org-level-" 5 "yellow" "purple")
fix backtrace jump to source code
File modified: emacs/init/Makefile emacs/init/ivan-fun.el
Change735 at Sun Jun 05 19:16:13 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r cd156069cb06 -r d7002726c085 emacs/init/ivan-fun.el
--- a/emacs/init/ivan-fun.el Sun Jun 05 10:43:18 2011 +0200
+++ b/emacs/init/ivan-fun.el Sun Jun 05 19:16:13 2011 +0200
@@ -181,6 +181,26 @@
(add-hook 'php-mode-user-hook 'ivan-php-hook)
+(require 'find-func)
+(defun find-library-name (library)
+ "Return the absolute file name of the Emacs Lisp source of LIBRARY.
+LIBRARY should be a string (the name of the library)."
+ ;; If the library is byte-compiled, try to find a source library by
+ ;; the same name.
+ (if (string-match "\\.el\\(c\\(\\..*\\)?\\)\\'" library)
+ (setq library (replace-match "" t t library)))
+ (or
+ (locate-file library
+ (or find-function-source-path load-path)
+ (find-library-suffixes))
+ (locate-file library
+ (or find-function-source-path load-path)
+ load-file-rep-suffixes)
+ (locate-file (file-name-sans-extension (file-name-nondirectory library))
+ (or find-function-source-path load-path)
+ (find-library-suffixes))
+ (error "Can't find library %s" library)))
+
(provide 'ivan-fun)
;; Copyright (C) 2007 Ivan Kanis
fix bug M-i g doesn't open link starting with http://
File modified: emacs/init/ivan-w3m.el
Change734 at Sun Jun 05 10:43:18 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r e65217b5da3a -r cd156069cb06 emacs/init/ivan-w3m.el
--- a/emacs/init/ivan-w3m.el Sun Jun 05 10:21:08 2011 +0200
+++ b/emacs/init/ivan-w3m.el Sun Jun 05 10:43:18 2011 +0200
@@ -47,7 +47,9 @@
(let ((what (read-from-minibuffer "Enter URL or keywords: ")))
(if (and (= (length (split-string what)) 1)
(> (length (split-string what "\\.")) 1))
- (w3m-goto-url (concat "http://" what))
+ (if (string-match "^http" what)
+ (w3m-goto-url what)
+ (w3m-goto-url (concat "http://" what)))
(w3m-search "google" what))))
(defun ivan-w3m-view-url (arg)
document verbiste
File modified: emacs/ivan/verbiste.el
Change733 at Sun Jun 05 10:21:08 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r c66895c6451f -r e65217b5da3a emacs/ivan/verbiste.el
--- a/emacs/ivan/verbiste.el Sun Jun 05 09:54:37 2011 +0200
+++ b/emacs/ivan/verbiste.el Sun Jun 05 10:21:08 2011 +0200
@@ -2,15 +2,33 @@
;;; Commentary:
-;; there is another verbiste.el out there, this one gives a prettier
-;; output
+;; Ben Voui wrote the first verbiste.el. This one is a completely
+;; different. This mode displays a list of conjugation of a french
+;; verb in a nice table. To use install it in your load-path. You then
+;; put the following in your .emacs:
+;;
+;; (require 'verbiste)
+;;
+;; Put your cursor on a verb and M-x verbiste will display a table of
+;; conjugation.
+
+;; Ben Voui a écrit le premier verbiste.el. Cette version est
+;; complètement différente. Ce mode affiche une liste de conjugaison
+;; dans un joli tableau. Pour utiliser ce mode installer ce fichier
+;; dans un chemin de load-path. Ensuite mettez la ligne suivante dans
+;; votre .emacs :
+;;
+;; (require 'verbiste)
+;;
+;; Mettez votre curseur sur un verbe puis M-x verbiste vous afficher
+;; un tableau de conjugaison.
;;; THANKS:
+;; Pierre Sarrazin for the excellent verbiste program
+
;;; BUGS:
-;;; INSTALLATION:
-
;;; Code:
(defvar verbiste-buffer "*verbiste*"
...
late bind grep customisation
File modified: emacs/init/ivan-grep.el
Change732 at Sun Jun 05 09:54:37 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 1cdb70d09be3 -r c66895c6451f emacs/init/ivan-grep.el
--- a/emacs/init/ivan-grep.el Sun Jun 05 09:51:19 2011 +0200
+++ b/emacs/init/ivan-grep.el Sun Jun 05 09:54:37 2011 +0200
@@ -10,8 +10,6 @@
;;; Code:
-(require 'grep)
-
(defun grep-default-command ()
"Compute the default grep command used with C-u"
(concat grep-command (grep-tag-default)))
@@ -19,10 +17,11 @@
(defun ivan-grep (arg)
"Reverse prefix argument behavior of `grep'."
(interactive "P")
+ (require 'grep)
+ (grep-apply-setting 'grep-use-null-device nil)
(let ((current-prefix-arg (not current-prefix-arg)))
(call-interactively 'grep)))
-(grep-apply-setting 'grep-use-null-device nil)
;; Local Variables:
;; compile-command: "make"
don't load dired-x when starting
File modified: emacs/init/ivan-dired.el
Change731 at Sun Jun 05 09:51:19 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r c90e6ccdbe24 -r 1cdb70d09be3 emacs/init/ivan-dired.el
--- a/emacs/init/ivan-dired.el Sun Jun 05 09:48:31 2011 +0200
+++ b/emacs/init/ivan-dired.el Sun Jun 05 09:51:19 2011 +0200
@@ -1,7 +1,5 @@
;;; ivan-dired.el --- directory mode customization
-(require 'dired-x)
-
(eval-when-compile
(require 'ivan-face)
(require 'ivan-fun)
late bind calendar mode line customisation
File modified: emacs/init/ivan-calendar.el emacs/init/ivan-keymap.el
Change730 at Sun Jun 05 09:48:31 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 4a59c049d0c9 -r c90e6ccdbe24 emacs/init/ivan-keymap.el
--- a/emacs/init/ivan-keymap.el Sun Jun 05 09:40:46 2011 +0200
+++ b/emacs/init/ivan-keymap.el Sun Jun 05 09:48:31 2011 +0200
@@ -57,7 +57,7 @@
"R" ivan-fun-rename-file-and-buffer
"a" ivan-org-agenda
"b" ivan-bbdb-map
- "c" calendar
+ "c" ivan-calendar
"e" ivan-keymap-english-map
"f" ivan-keymap-french-map
"g" ivan-w3m-open-or-search
late bind french input method
File modified: emacs/init/init.el emacs/init/ivan-french.el emacs/init/ivan-load.el emacs/init/ivan-quail.el
Change729 at Sun Jun 05 09:40:46 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 52c95ca5c020 -r 4a59c049d0c9 emacs/init/ivan-quail.el
--- a/emacs/init/ivan-quail.el Sun Jun 05 09:22:35 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-;;; ivan-quail.el --- custom french input mapping
-
-;;; Commentary:
-
-;;; THANKS:
-
-;;; BUGS:
-
-;;; INSTALLATION:
-
-;;; Code:
-
-(quail-define-package
- "ivan-french-prefix" "Latin-9" "F>" t
- "French characters input method with prefix modifiers
-
- effect | prefix | examples
- ------------+--------+----------
- acute | ' | 'e -> é 'c -> ç
- grave | ` | `a -> Ã
- circumflex | ^ | ^a -> â ^1 -> ¹ ^c -> ©
- tilde | ~ | ~a -> æ ~o -> œ ~c ->
- tilde | ~ | ~> -> » ~< -> «
- underscore | _ | _/ -> ÷ _e -> €
-" nil t nil nil nil nil nil nil nil nil t)
-
-(quail-define-rules
- ("' " ?')
- ("'C" ?Ç)
- ("'E" ?É)
- ("'c" ?ç)
- ("'e" ?é)
- ("\" " ?\")
- ("\"A" ?Ä)
- ("\"E" ?Ë)
- ("\"a" ?ä)
- ("\"e" ?ë)
...
late bind slime
File modified: emacs/init/ivan-slime.el
Change728 at Sun Jun 05 09:22:35 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 3230aefcb6d1 -r 52c95ca5c020 emacs/init/ivan-slime.el
--- a/emacs/init/ivan-slime.el Sat Jun 04 19:47:22 2011 +0200
+++ b/emacs/init/ivan-slime.el Sun Jun 05 09:22:35 2011 +0200
@@ -16,7 +16,10 @@
(require 'ivan-keymap)
(require 'ivan-var))
-(slime-setup '(slime-repl))
+(defun ivan-slime ()
+ (interactive)
+ (slime-setup '(slime-repl))
+ (slime))
(defun ivan-slime-mode-hook ()
(ivan-keymap-define slime-mode-map
map ? and : to non breaking space in french mode
File modified: emacs/init/ivan-french.el
Change727 at Sat Jun 04 19:47:22 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r e472dfd75237 -r 3230aefcb6d1 emacs/init/ivan-french.el
--- a/emacs/init/ivan-french.el Fri Jun 03 20:48:19 2011 +0200
+++ b/emacs/init/ivan-french.el Sat Jun 04 19:47:22 2011 +0200
@@ -77,9 +77,23 @@
(insert (if (and (stringp quote)
(string= "«" quote)) " »" "« "))))
+(defmacro ivan-french-insert-space (symbol char)
+ `(defun ,(intern (concat "ivan-french-" symbol)) ()
+ (interactive)
+ (insert ,(concat "Â " char))))
+
+(ivan-french-insert-space "question" "?")
+(ivan-french-insert-space "exclamation" "!")
+(ivan-french-insert-space "colon" ":")
+(ivan-french-insert-space "semicolon" ";")
+
(define-minor-mode ivan-french-mode
"Toggle french mode in the current buffer."
- :keymap '(("\"" . ivan-french-quotes)))
+ :keymap '(("\"" . ivan-french-quotes)
+ ("?" . ivan-french-question)
+ ("!" . ivan-french-exclamation)
+ (":" . ivan-french-colon)
+ (";" . ivan-french-semicolon)))
(ivan-keymap-prefix
ivan-keymap-french-map
add french smart quotes
File modified: emacs/init/ivan-english.el emacs/init/ivan-french.el emacs/init/ivan-japanese.el emacs/misc/smart-quotes.el
Change726 at Fri Jun 03 20:48:19 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 280cd29036da -r e472dfd75237 emacs/misc/smart-quotes.el
--- a/emacs/misc/smart-quotes.el Fri Jun 03 19:42:38 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-;;; smart-quotes.el --- Smart Quotes mode for Emacs
-
-;; Copyright (C) 2007 Gareth Rees
-
-;; Author: Gareth Rees <gdr@garethrees.org>
-;; Created: 2007-10-20
-;; Version: 1.0
-;; Keywords: abbrev
-
-;; Smart Quotes mode is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
-;; your option) any later version.
-
-;;; Commentary:
-
-;; In Smart Quotes minor mode, the ' and \" keys insert left and
-;; right quotation marks according to the context around point.
-
-;;; Code:
-
-(defcustom smart-quotes-left-context "\\s-\\|\\s(\\|^"
- "Regular expression matching the context in which a left
-quotation mark will be inserted (a right quotation mark will
-be inserted in all other contexts)."
- :type 'regexp)
-
-(defun smart-quotes-insert-single ()
- "Insert U+2018 LEFT SINGLE QUOTATION MARK if point is preceded
-by `smart-quotes-left-context'; U+2019 RIGHT SINGLE QUOTATION MARK
-otherwise."
- (interactive)
- (ucs-insert (if (looking-back smart-quotes-left-context) #x2018 #x2019)))
-
-(defun smart-quotes-insert-double ()
- "Insert U+201C LEFT DOUBLE QUOTATION MARK if point is preceded
-by `smart-quotes-left-context'; U+201D RIGHT DOUBLE QUOTATION MARK
...
original smart-quotes
File modified: emacs/misc/smart-quotes.el
Change725 at Fri Jun 03 19:42:38 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 70f483358358 -r 280cd29036da emacs/misc/smart-quotes.el
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emacs/misc/smart-quotes.el Fri Jun 03 19:42:38 2011 +0200
@@ -0,0 +1,59 @@
+;;; smart-quotes.el --- Smart Quotes mode for Emacs
+
+;; Copyright (C) 2007 Gareth Rees
+
+;; Author: Gareth Rees <gdr@garethrees.org>
+;; Created: 2007-10-20
+;; Version: 1.0
+;; Keywords: abbrev
+
+;; Smart Quotes mode is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;;; Commentary:
+
+;; In Smart Quotes minor mode, the ' and \" keys insert left and
+;; right quotation marks according to the context around point.
+
+;;; Code:
+
+(defcustom smart-quotes-left-context "\\s-\\|\\s(\\|^"
+ "Regular expression matching the context in which a left
+quotation mark will be inserted (a right quotation mark will
+be inserted in all other contexts)."
+ :type 'regexp)
+
+(defun smart-quotes-insert-single ()
+ "Insert U+2018 LEFT SINGLE QUOTATION MARK if point is preceded
+by `smart-quotes-left-context'; U+2019 RIGHT SINGLE QUOTATION MARK
+otherwise."
+ (interactive)
+ (ucs-insert (if (looking-back smart-quotes-left-context) #x2018 #x2019)))
+
+(defun smart-quotes-insert-double ()
+ "Insert U+201C LEFT DOUBLE QUOTATION MARK if point is preceded
+by `smart-quotes-left-context'; U+201D RIGHT DOUBLE QUOTATION MARK
...
add function private-init called at the end of when emacs starts
File modified: emacs/init/init.el emacs/init/ivan-erc.el
Change724 at Fri Jun 03 19:20:50 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r b279b8d9579a -r 70f483358358 emacs/init/ivan-erc.el
--- a/emacs/init/ivan-erc.el Fri Jun 03 09:49:29 2011 +0200
+++ b/emacs/init/ivan-erc.el Fri Jun 03 19:20:50 2011 +0200
@@ -43,7 +43,7 @@
(if (get-buffer "#emacs")
(switch-to-buffer "#emacs")
- (ivan-private-erc)
+ (private-erc)
;; track later
(run-at-time 60 nil 'ivan-erc-track)
(ivan-elim)))
meditation script
File modified: bin/meditate.jpg bin/meditate.sh bin/setup.sh
Change723 at Fri Jun 03 09:49:29 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 6571f757b327 -r b279b8d9579a bin/setup.sh
--- a/bin/setup.sh Thu Jun 02 21:18:58 2011 +0200
+++ b/bin/setup.sh Fri Jun 03 09:49:29 2011 +0200
@@ -568,6 +568,7 @@
alias excel='excel.sh'
alias ifdown='sudo ifdown'
alias ifup='sudo ifup'
+alias meditate=meditate.sh
alias mount='sudo mount'
alias r='remote.sh'
alias ssh='ssh.sh'
go in emacs directory to run make
File modified: bin/bgn.sh
Change722 at Thu Jun 02 21:18:58 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 40c0a06c5c98 -r 6571f757b327 bin/bgn.sh
--- a/bin/bgn.sh Thu Jun 02 18:31:10 2011 +0200
+++ b/bin/bgn.sh Thu Jun 02 21:18:58 2011 +0200
@@ -1,11 +1,5 @@
#!/bin/sh
-cur_dir=`dirname ${0}`
-host_name="`hostname -s`"
-uname=`uname`
-
-. ${cur_dir}/function.sh
-
update_web () {
uw_dest="kanis.fr:~/www/"
uw_hg="${HOME}/tmp/hg"
@@ -155,6 +149,13 @@
fn_cp ${KEEL_DIR}/gnus/.newsrc.eld ~/tmp
}
+cur_dir=`dirname ${0}`
+cur_dir=`cd ${cur_dir} ; pwd`
+host_name=`hostname -s`
+uname=`uname`
+
+. ${cur_dir}/function.sh
+
if test x${1} = x--rsync ; then
host_rsync
else
@@ -163,7 +164,9 @@
mount_keel
fn_sync_keel from
mercurial_pull "${KEEL_DIR}/hg" "${VC_DIR}"
- make -C "${VC_DIR}"
+ fn_cd "${VC_DIR}"
+ make
+ fn_cd ${cur_dir}
fn_check "compilation error"
ssh_key_password
misc_stuff
...
prettify ivan-load-path function
File modified: emacs/init/ivan-load.el
Change721 at Thu Jun 02 18:31:10 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 19f40829dc57 -r 40c0a06c5c98 emacs/init/ivan-load.el
--- a/emacs/init/ivan-load.el Thu Jun 02 13:32:58 2011 +0200
+++ b/emacs/init/ivan-load.el Thu Jun 02 18:31:10 2011 +0200
@@ -47,10 +47,11 @@
"Add LIST of modules and load autoloads."
(while module
(when (not noninteractive)
- (ivan-load-path-add find-function-source-path
- (concat ivan-var-vc-dir "emacs/" (car module))))
- (ivan-load-path-add load-path
- (concat (expand-file-name "~/.emacs.d/") (car module)))
+ (ivan-load-path-add
+ find-function-source-path
+ (concat ivan-var-vc-dir "emacs/" (car module))))
+ (ivan-load-path-add
+ load-path (concat (expand-file-name "~/.emacs.d/") (car module)))
(ivan-load (concat (car module) "-auto-load"))
(setq module (cdr module))))
highlight weekend
File modified: emacs/init/ivan-org.el
Change720 at Thu Jun 02 13:32:58 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r fc8c62114914 -r 19f40829dc57 emacs/init/ivan-org.el
--- a/emacs/init/ivan-org.el Wed Jun 01 20:16:14 2011 +0200
+++ b/emacs/init/ivan-org.el Thu Jun 02 13:32:58 2011 +0200
@@ -229,9 +229,9 @@
(ivan-face-gradient "org-level-" 5 "yellow" "purple")
(ivan-face
- org-agenda-date blue
- org-agenda-date-today yellow
- org-agenda-date-weekend blue
+ org-agenda-date normal
+ org-agenda-date-today blue
+ org-agenda-date-weekend yellow
org-agenda-dimmed-todo-face normal
org-agenda-done normal
org-agenda-structure yellow
merge
File modified: bin/setup.sh conf/hgrc emacs/Makefile emacs/elim/Makefile emacs/elisp.mk emacs/init/init.el emacs/init/ivan-elim.el emacs/init/ivan-ido.el emacs/init/ivan-load.el
Change719 at Wed Jun 01 20:16:14 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 3efb4507c272 -r fc8c62114914 emacs/init/ivan-load.el
--- a/emacs/init/ivan-load.el Wed Jun 01 18:57:11 2011 +0200
+++ b/emacs/init/ivan-load.el Wed Jun 01 20:16:14 2011 +0200
@@ -1,5 +1,7 @@
;;; ivan-load.el --- library loading functions
+(require 'time-date)
+
(eval-when-compile
(defvar ivan-var-vc-dir)
(defvar init-user))
copy elim-client in ~/.emacs.d
File modified: emacs/elim/Makefile
Change718 at Wed Jun 01 18:57:11 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 10fbcf4e2b8b -r 3efb4507c272 emacs/elim/Makefile
--- a/emacs/elim/Makefile Wed Jun 01 18:55:20 2011 +0200
+++ b/emacs/elim/Makefile Wed Jun 01 18:57:11 2011 +0200
@@ -64,7 +64,7 @@
.PHONY: clean diag distclean check-libdeps signed-tar tar
all: $(BINARIES) TAGS
- cp $(BINARIES) $(HOME)/.emacs
+ cp $(BINARIES) $(HOME)/.emacs.d
############################################################################
# test scripts/utils etc, such as there are:
#test/sexp-test: test/sexp-test.o test/sexp-example.h $(UTIL_OBJ)
run skype on tny
File modified: bin/bgn.sh
Change717 at Wed Jun 01 18:55:20 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 2f33085f06c6 -r 10fbcf4e2b8b bin/bgn.sh
--- a/bin/bgn.sh Wed Jun 01 10:51:19 2011 +0200
+++ b/bin/bgn.sh Wed Jun 01 18:55:20 2011 +0200
@@ -99,6 +99,7 @@
tny () {
killall compiz &
${HOME}/src/stumpwm/stumpwm &
+ skype &
exec screen ${SHELL}
}
don't quote function with ivan-keymap-prefix
File modified: emacs/init/ivan-english.el emacs/init/ivan-french.el emacs/init/ivan-ido.el emacs/init/ivan-xcscope.el
Change716 at Wed Jun 01 10:51:19 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r a01b13d65e28 -r 2f33085f06c6 emacs/init/ivan-xcscope.el
--- a/emacs/init/ivan-xcscope.el Wed Jun 01 10:44:02 2011 +0200
+++ b/emacs/init/ivan-xcscope.el Wed Jun 01 10:51:19 2011 +0200
@@ -24,32 +24,32 @@
(ivan-keymap-prefix
ivan-xcscope-key-map
- "s" 'cscope-find-this-symbol
- "d" 'cscope-find-global-definition
- "g" 'cscope-find-global-definition
- "G" 'cscope-find-global-definition-no-prompting
- "c" 'cscope-find-functions-calling-this-function
- "C" 'cscope-find-called-functions
- "t" 'cscope-find-this-text-string
- "e" 'cscope-find-egrep-pattern
- "f" 'cscope-find-this-file
- "i" 'cscope-find-files-including-file
- "b" 'cscope-display-buffer
- "B" 'cscope-display-buffer-toggle
- "n" 'cscope-next-symbol
- "N" 'cscope-next-file
- "p" 'cscope-prev-symbol
- "P" 'cscope-prev-file
- "u" 'cscope-pop-mark
- "a" 'cscope-set-initial-directory
- "A" 'cscope-unset-initial-directory
- "L" 'cscope-create-list-of-files-to-index
- "I" 'cscope-index-files
- "E" 'cscope-edit-list-of-files-to-index
- "W" 'cscope-tell-user-about-directory
- "S" 'cscope-tell-user-about-directory
- "T" 'cscope-tell-user-about-directory
- "D" 'cscope-dired-directory)
+ "s" cscope-find-this-symbol
+ "d" cscope-find-global-definition
+ "g" cscope-find-global-definition
+ "G" cscope-find-global-definition-no-prompting
+ "c" cscope-find-functions-calling-this-function
+ "C" cscope-find-called-functions
+ "t" cscope-find-this-text-string
+ "e" cscope-find-egrep-pattern
...
fix bbdb prefix
File modified: emacs/init/ivan-bbdb.el
Change715 at Wed Jun 01 10:44:02 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 1c152019b036 -r a01b13d65e28 emacs/init/ivan-bbdb.el
--- a/emacs/init/ivan-bbdb.el Tue May 31 19:54:11 2011 +0200
+++ b/emacs/init/ivan-bbdb.el Wed Jun 01 10:44:02 2011 +0200
@@ -23,8 +23,8 @@
"Ivan BBDB prefix keymap")
(ivan-keymap-prefix ivan-bbdb-map
- "b" 'ivan-bbdb
- "i" 'ivan-bbdb-create)
+ "b" ivan-bbdb
+ "i" ivan-bbdb-create)
(defun ivan-bbdb (string elidep)
"Like function bbdb with late binding."
add missing w3m-session
File modified: emacs/w3m/Makefile
Change714 at Tue May 31 19:54:11 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r eec4484420d9 -r 1c152019b036 emacs/w3m/Makefile
--- a/emacs/w3m/Makefile Tue May 31 19:46:39 2011 +0200
+++ b/emacs/w3m/Makefile Tue May 31 19:54:11 2011 +0200
@@ -22,6 +22,7 @@
w3m-proc.el \
w3m-rss.el \
w3m-search.el \
+w3m-session.el \
w3m-symbol.el \
w3m-tabmenu.el \
w3m-util.el \
set elim-executable
File modified: emacs/init/ivan-elim.el
Change713 at Tue May 31 19:46:39 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 75f8938a90f7 -r eec4484420d9 emacs/init/ivan-elim.el
--- a/emacs/init/ivan-elim.el Tue May 31 14:31:55 2011 +0200
+++ b/emacs/init/ivan-elim.el Tue May 31 19:46:39 2011 +0200
@@ -30,6 +30,7 @@
(raise-frame (selected-frame)))
(setq
+ elim-executable (expand-file-name "~/.emacs.d/elim-client")
garak-alert-methods '(ivan-elim-pop-buffer)
garak-ui-buffer-name "*chat*"
tracking-mode-map
fix random music playback
File modified: emacs/init/ivan-emms.el
Change712 at Tue May 31 14:31:55 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 84718fbfa345 -r 75f8938a90f7 emacs/init/ivan-emms.el
--- a/emacs/init/ivan-emms.el Tue May 31 14:10:50 2011 +0200
+++ b/emacs/init/ivan-emms.el Tue May 31 14:31:55 2011 +0200
@@ -90,8 +90,8 @@
(concat ivan-var-portable-dir dir))))))
(while (< index length)
(aset ret index (aref album index))
- (setq index (1+ index))
- ret)))
+ (setq index (1+ index)))
+ ret))
(defun ivan-emms-play-list (playlist)
(let ((length (length playlist))
fix finding elisp source file
File modified: emacs/init/ivan-load.el
Change711 at Tue May 31 14:10:50 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 8f38f0a356f9 -r 84718fbfa345 emacs/init/ivan-load.el
--- a/emacs/init/ivan-load.el Mon May 30 16:37:25 2011 +0200
+++ b/emacs/init/ivan-load.el Tue May 31 14:10:50 2011 +0200
@@ -36,25 +36,25 @@
(message (concat "Could not load " file)))
(ivan-load-stop-timer file))
+(defmacro ivan-load-path-add (variable path)
+ "Add PATH to the beginning of VARIABLE list."
+ `(when (file-directory-p ,path)
+ (setq ,variable (cons ,path ,variable))))
+
(defun ivan-load-path (module)
- "Add LIST of paths to load-path and take care of autoloads"
+ "Add LIST of modules and load autoloads."
(while module
(when (not noninteractive)
- (setq find-function-source-path
- (cons (concat ivan-var-vc-dir (car module)) load-path)))
- (setq load-path
- (cons (concat (expand-file-name "~/.emacs.d/") (car module))
- load-path))
+ (ivan-load-path-add find-function-source-path
+ (concat ivan-var-vc-dir "emacs/" (car module))))
+ (ivan-load-path-add load-path
+ (concat (expand-file-name "~/.emacs.d/") (car module)))
(ivan-load (concat (car module) "-auto-load"))
(setq module (cdr module))))
(setq ivan-var-vc-dir (concat (getenv "VC_DIR") "/"))
-;; add slime directories (no autoload)
-(add-to-list 'load-path (concat ivan-var-vc-dir "lisp/slime"))
-(add-to-list 'load-path (concat ivan-var-vc-dir "lisp/slime/contrib"))
-;; same for elime
-(add-to-list 'load-path (concat ivan-var-vc-dir "lisp/elim/elisp"))
+(setq find-function-source-path nil)
(ivan-load-path
'(
@@ -62,10 +62,12 @@
...
copy elim client in ~/.emacs
File modified: emacs/elim/Makefile
Change710 at Mon May 30 16:37:25 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r b3f77ae1bb87 -r 8f38f0a356f9 emacs/elim/Makefile
--- a/emacs/elim/Makefile Mon May 30 16:26:56 2011 +0200
+++ b/emacs/elim/Makefile Mon May 30 16:37:25 2011 +0200
@@ -64,7 +64,7 @@
.PHONY: clean diag distclean check-libdeps signed-tar tar
all: $(BINARIES) TAGS
-
+ cp $(BINARIES) $(HOME)/.emacs
############################################################################
# test scripts/utils etc, such as there are:
#test/sexp-test: test/sexp-test.o test/sexp-example.h $(UTIL_OBJ)
fix function lookup in elisp source code
File modified: emacs/init/ivan-load.el
Change709 at Mon May 30 16:26:56 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r d8423dd1ef8f -r b3f77ae1bb87 emacs/init/ivan-load.el
--- a/emacs/init/ivan-load.el Mon May 30 14:09:24 2011 +0200
+++ b/emacs/init/ivan-load.el Mon May 30 16:26:56 2011 +0200
@@ -40,7 +40,7 @@
"Add LIST of paths to load-path and take care of autoloads"
(while module
(when (not noninteractive)
- (setq load-path
+ (setq find-function-source-path
(cons (concat ivan-var-vc-dir (car module)) load-path)))
(setq load-path
(cons (concat (expand-file-name "~/.emacs.d/") (car module))
remove ssl and pop3 from Makefile
File modified: emacs/init/init.el emacs/misc/Makefile
Change708 at Mon May 30 14:09:24 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r b8f1c2abc475 -r d8423dd1ef8f emacs/misc/Makefile
--- a/emacs/misc/Makefile Mon May 30 13:53:34 2011 +0200
+++ b/emacs/misc/Makefile Mon May 30 14:09:24 2011 +0200
@@ -13,7 +13,6 @@
guess-lang.el \
lastfm-submit.el \
php-mode.el \
-pop3.el \
sym-comp.el \
tea-time.el \
twittering-mode.el \
@@ -21,7 +20,6 @@
quotes.el \
sawfish.el \
sqlplus.el \
-ssl.el \
swbuff.el \
swbuff-x.el \
whitespace.el \
switch from macro incf to +1 function
File modified: emacs/init/ivan-emms.el
Change707 at Mon May 30 13:53:34 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r ac9d9135e96e -r b8f1c2abc475 emacs/init/ivan-emms.el
--- a/emacs/init/ivan-emms.el Mon May 30 13:52:44 2011 +0200
+++ b/emacs/init/ivan-emms.el Mon May 30 13:53:34 2011 +0200
@@ -90,8 +90,8 @@
(concat ivan-var-portable-dir dir))))))
(while (< index length)
(aset ret index (aref album index))
- (incf index))
- ret))
+ (setq index (1+ index))
+ ret)))
(defun ivan-emms-play-list (playlist)
(let ((length (length playlist))
@@ -99,7 +99,7 @@
(emms-playlist-current-clear)
(while (< index length)
(emms-add-directory (aref playlist index))
- (incf index))))
+ (setq index (1+ index)))))
(defun ivan-emms-random-album ()
"Play albums from my library at random"
add emacs source path
File modified: emacs/init/ivan-load.el
Change706 at Mon May 30 13:52:44 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r a634ab280ce9 -r ac9d9135e96e emacs/init/ivan-load.el
--- a/emacs/init/ivan-load.el Mon May 30 13:51:03 2011 +0200
+++ b/emacs/init/ivan-load.el Mon May 30 13:52:44 2011 +0200
@@ -25,7 +25,7 @@
(setq ivan-load-time (current-time))))
(defun ivan-load-stop-timer (msg)
- (when ivan-load-time
+ (when (and ivan-load-time (not noninteractive))
(message "Elapsed time %f for %s"
(float-time (time-since ivan-load-time)) msg)))
@@ -39,10 +39,14 @@
(defun ivan-load-path (module)
"Add LIST of paths to load-path and take care of autoloads"
(while module
- (add-to-list
- 'load-path (concat (expand-file-name "~/.emacs.d/") (car module)))
- (ivan-load (concat (car module) "-auto-load"))
- (setq module (cdr module))))
+ (when (not noninteractive)
+ (setq load-path
+ (cons (concat ivan-var-vc-dir (car module)) load-path)))
+ (setq load-path
+ (cons (concat (expand-file-name "~/.emacs.d/") (car module))
+ load-path))
+ (ivan-load (concat (car module) "-auto-load"))
+ (setq module (cdr module))))
(setq ivan-var-vc-dir (concat (getenv "VC_DIR") "/"))
don't show total startup time
File modified: emacs/init/init.el
Change705 at Mon May 30 13:51:03 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 333d89577d47 -r a634ab280ce9 emacs/init/init.el
--- a/emacs/init/init.el Mon May 30 13:50:34 2011 +0200
+++ b/emacs/init/init.el Mon May 30 13:51:03 2011 +0200
@@ -88,8 +88,6 @@
(when (file-exists-p ivan-org-todo)
(ivan-org-agenda)))
-(message "Elapsed time %f" (float-time (time-since ivan-time)))
-
;; silly kludge for windows emacs 23.2
;; height of initial-frame-list is not taken into account
(defun windows-fix-height ()
shutup move message
File modified: emacs/elisp.mk
Change704 at Mon May 30 13:50:34 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r cb82bda3708f -r 333d89577d47 emacs/elisp.mk
--- a/emacs/elisp.mk Mon May 30 10:15:12 2011 +0200
+++ b/emacs/elisp.mk Mon May 30 13:50:34 2011 +0200
@@ -31,7 +31,7 @@
$(BUILD_DIR)/%.elc: %.el
@$(EMACS) -f batch-byte-compile $<
- mv $(subst .el,.elc,$<) $@
+ @mv $(subst .el,.elc,$<) $@
$(AUTO_FILE).el: $(SRC)
@$(EMACS) $(AUTOLOAD) $(SRC)
remove pop3 and ssl, not needed with emacs 23.3
File modified: Makefile emacs/misc/pop3.el emacs/misc/ssl.el
Change703 at Mon May 30 10:15:12 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r df8e99f4306f -r cb82bda3708f emacs/misc/ssl.el
--- a/emacs/misc/ssl.el Sun May 29 16:02:31 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,200 +0,0 @@
-;;; ssl.el,v --- ssl functions for emacsen without them builtin
-;; Author: $Author: yamaoka $
-;; Created: $Date: 2004/01/05 03:24:10 $
-;; Version: $Revision: 1.1.6.1.8.1 $
-;; Keywords: comm
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Copyright (c) 1995, 1996 by William M. Perry <wmperry@cs.indiana.edu>
-;;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
-;;;
-;;; This file is part of GNU Emacs.
-;;;
-;;; GNU Emacs is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your option)
-;;; any later version.
-;;;
-;;; GNU Emacs is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Emacs; see the file COPYING. If not, write to the
-;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;;; Boston, MA 02111-1307, USA.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(eval-when-compile (require 'cl))
-(require 'base64)
-
-(eval-and-compile
- (condition-case ()
- (require 'custom)
- (error nil))
- (if (and (featurep 'custom) (fboundp 'custom-declare-variable))
- nil ;; We've got what we needed
...
remove quote in ivan-keymap-prefix
File modified: emacs/init/ivan-keymap.el
Change702 at Sun May 29 16:02:31 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 9a5acc968b0d -r df8e99f4306f emacs/init/ivan-keymap.el
--- a/emacs/init/ivan-keymap.el Sun May 29 16:01:11 2011 +0200
+++ b/emacs/init/ivan-keymap.el Sun May 29 16:02:31 2011 +0200
@@ -52,61 +52,61 @@
;;; M-i
(ivan-keymap-prefix
ivan-keymap-map-m-i
- "C" 'ivan-org-calendar
- "K" 'ivan-org-keyring
- "R" 'ivan-fun-rename-file-and-buffer
- "a" 'ivan-org-agenda
- "b" 'ivan-bbdb-map
- "c" 'calendar
- "e" 'ivan-keymap-english-map
- "f" 'ivan-keymap-french-map
- "g" 'ivan-w3m-open-or-search
- "i" 'ivan-erc
- "j" 'ivan-keymap-japanese-map
- "k" 'ivan-org-kb
- "l" 'recenter-top-bottom
- "n" 'ivan-gnus
- "o" 'display-time-world
- "r" 'org-capture
- "s" 'ivan-comint-shell
- "t" 'ivan-org
- "v" 'volume
- "w" 'ivan-w3m)
+ "C" ivan-org-calendar
+ "K" ivan-org-keyring
+ "R" ivan-fun-rename-file-and-buffer
+ "a" ivan-org-agenda
+ "b" ivan-bbdb-map
+ "c" calendar
+ "e" ivan-keymap-english-map
+ "f" ivan-keymap-french-map
+ "g" ivan-w3m-open-or-search
+ "i" ivan-erc
+ "j" ivan-keymap-japanese-map
+ "k" ivan-org-kb
+ "l" recenter-top-bottom
+ "n" ivan-gnus
...
refactor ivan-keymap-prefix
File modified: emacs/init/ivan-keymap.el
Change701 at Sun May 29 16:01:11 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r ebbb03af499f -r 9a5acc968b0d emacs/init/ivan-keymap.el
--- a/emacs/init/ivan-keymap.el Sun May 29 14:57:44 2011 +0200
+++ b/emacs/init/ivan-keymap.el Sun May 29 16:01:11 2011 +0200
@@ -7,21 +7,6 @@
(defvar ivan-keymap-global-c-x nil
"List of global keymap C-x.")
-(defvar ivan-keymap-map-m-i nil
- "M-i keymap")
-
-(defvar ivan-keymap-map-m-k nil
- "M-k keymap")
-
-(defvar ivan-keymap-english-map nil
- "Ivan english keymap")
-
-(defvar ivan-keymap-french-map nil
- "Ivan french keymap")
-
-(defvar ivan-keymap-japanese-map nil
- "Ivan japanese keymap")
-
(defmacro ivan-keymap-define (keymap &rest list)
`(ivan-keymap-define-1 ,keymap (quote ,list)))
@@ -33,15 +18,14 @@
(define-key keymap (read-kbd-macro (pop list)) (pop list))))
(defmacro ivan-keymap-prefix (keymap &rest list)
- "Return prefix KEYMAP with LIST of binding."
- `(ivan-keymap-prefix-1 (quote ,keymap) (quote ,list)))
-
-(defun ivan-keymap-prefix-1 (keysym list)
- "Return prefix keymap KEYSYM with LIST of binding."
- (set keysym (make-sparse-keymap))
- (define-prefix-command keysym)
- (while list
- (define-key keysym (read-kbd-macro (pop list)) (eval (pop list)))))
+ "Define prefix KEYMAP with LIST of binding."
+ `(let ((list ',list))
+ (setq ,keymap (make-sparse-keymap))
...
speed up ivan-fun load time
File modified: emacs/init/ivan-fun.el
Change700 at Sun May 29 14:57:44 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 643a3dea9085 -r ebbb03af499f emacs/init/ivan-fun.el
--- a/emacs/init/ivan-fun.el Sun May 29 14:57:20 2011 +0200
+++ b/emacs/init/ivan-fun.el Sun May 29 14:57:44 2011 +0200
@@ -1,11 +1,11 @@
;;; ivan-fun.el --- miscellaneous functions and hooks
-(require 'ivan-keymap)
(eval-when-compile
(defvar init-user "")
(require 'ivan-load)
(require 'ivan-face)
+ (require 'ivan-keymap)
(require 'ivan-var)
(require 'browse-url)
(require 'comint)
move load time to ivan-load
File modified: emacs/init/init.el emacs/init/ivan-load.el
Change699 at Sun May 29 14:57:20 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r b3a4f7cf4cca -r 643a3dea9085 emacs/init/ivan-load.el
--- a/emacs/init/ivan-load.el Sun May 29 14:24:01 2011 +0200
+++ b/emacs/init/ivan-load.el Sun May 29 14:57:20 2011 +0200
@@ -4,39 +4,45 @@
(defvar ivan-var-vc-dir)
(defvar init-user))
-(defvar ivan-load-time nil
- "Set to t to display how long it takes for a library to load.")
+(defvar ivan-load-time t
+ "Set to t to display how long it takes for libraries to load.")
(defun ivan-load (file)
"Load FILE, FILE can be a string or a list of files.
When FILE is a list each files are prepended with the string \"ivan-\"."
- (cond ((stringp file) (ivan-load-file file))
- ((listp file) (mapc (lambda (el)
- (when ivan-load-time
- (set 'ivan-load-time (current-time)))
- (ivan-load-file (concat "ivan-" el))
- (when ivan-load-time
- (message "Elapsed time %f for %s"
- (float-time
- (time-since ivan-load-time))
- el)))
- file))
+ (cond ((stringp file)
+ (ivan-load-file file))
+ ((listp file)
+ (while file
+ (ivan-load-file (concat "ivan-" (car file)))
+ (setq file (cdr file))))
(t (message "Wrong type of argumment in function ivan-load: %s %s"
(type-of file) file))))
+(defun ivan-load-start-timer ()
+ "Start timer."
+ (when ivan-load-time
+ (setq ivan-load-time (current-time))))
+
+(defun ivan-load-stop-timer (msg)
...
.emacs is no longer a link to the source directory
File modified: bin/setup.sh
Change698 at Sun May 29 14:24:01 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 055623eddb1e -r b3a4f7cf4cca bin/setup.sh
--- a/bin/setup.sh Sun May 29 13:32:08 2011 +0200
+++ b/bin/setup.sh Sun May 29 14:24:01 2011 +0200
@@ -136,7 +136,6 @@
make_link () {
make_link2 ~/hg/conf/bashrc ~/.bash_profile
- make_link2 ~/hg/lisp/emacs.d ~/.emacs.d
make_link2 ~/hg/conf/Xresources ~/.Xresources
make_link2 ~/hg/conf/vimrc ~/.vimrc
make_link2 ~/hg/conf/screenrc ~/.screenrc
rename lisp to emacs
File modified: Makefile emacs/Makefile emacs/auctex/CHANGES emacs/auctex/Makefile emacs/auctex/auctex.el emacs/auctex/auctex.el.in emacs/auctex/bib-cite.el emacs/auctex/context-en.el emacs/auctex/context-nl.el emacs/auctex/context.el emacs/auctex/font-latex.el emacs/auctex/latex.el emacs/auctex/lpath.el emacs/auctex/multi-prompt.el emacs/auctex/style/.nosearch emacs/auctex/style/Makefile emacs/auctex/style/MinionPro.el emacs/auctex/style/alltt.el emacs/auctex/style/alphanum.el emacs/auctex/style/amsart.el emacs/auctex/style/amsbook.el emacs/auctex/style/amsbsy.el emacs/auctex/style/amsmath.el emacs/auctex/style/amsopn.el emacs/auctex/style/amstex.el emacs/auctex/style/amstext.el emacs/auctex/style/amsthm.el emacs/auctex/style/article.el emacs/auctex/style/babel.el emacs/auctex/style/beamer.el emacs/auctex/style/book.el emacs/auctex/style/booktabs.el emacs/auctex/style/captcont.el emacs/auctex/style/csquotes.el emacs/auctex/style/czech.el emacs/auctex/style/danish.el emacs/auctex/style/dinbrief.el emacs/auctex/style/dk-bib.el emacs/auctex/style/dk.el emacs/auctex/style/doc.el emacs/auctex/style/dutch.el emacs/auctex/style/emp.el emacs/auctex/style/epsf.el emacs/auctex/style/fancyref.el emacs/auctex/style/foils.el emacs/auctex/style/francais.el emacs/auctex/style/frenchb.el emacs/auctex/style/german.el emacs/auctex/style/graphics.el emacs/auctex/style/graphicx.el emacs/auctex/style/harvard.el emacs/auctex/style/index.el emacs/auctex/style/inputenc.el emacs/auctex/style/italian.el emacs/auctex/style/j-article.el emacs/auctex/style/j-book.el emacs/auctex/style/j-report.el emacs/auctex/style/jarticle.el emacs/auctex/style/jbook.el emacs/auctex/style/jreport.el emacs/auctex/style/jsarticle.el emacs/auctex/style/jsbook.el emacs/auctex/style/jura.el emacs/auctex/style/jurabib.el emacs/auctex/style/latexinfo.el emacs/auctex/style/letter.el emacs/auctex/style/listings.el emacs/auctex/style/ltx-base.el emacs/auctex/style/ltxdoc.el emacs/auctex/style/makeidx.el emacs/auctex/style/mdwlist.el emacs/auctex/style/multind.el emacs/auctex/style/natbib.el emacs/auctex/style/ngerman.el emacs/auctex/style/nicefrac.el emacs/auctex/style/paralist.el emacs/auctex/style/plfonts.el emacs/auctex/style/plhb.el emacs/auctex/style/prosper.el emacs/auctex/style/psfig.el emacs/auctex/style/report.el emacs/auctex/style/scrartcl.el emacs/auctex/style/scrbase.el emacs/auctex/style/scrbook.el emacs/auctex/style/scrlttr2.el emacs/auctex/style/scrpage2.el emacs/auctex/style/scrreprt.el emacs/auctex/style/slides.el emacs/auctex/style/slovak.el emacs/auctex/style/subfigure.el emacs/auctex/style/swedish.el emacs/auctex/style/units.el emacs/auctex/style/url.el emacs/auctex/style/varioref.el emacs/auctex/style/verbatim.el emacs/auctex/style/virtex.el emacs/auctex/tex-bar.el emacs/auctex/tex-buf.el emacs/auctex/tex-fold.el emacs/auctex/tex-font.el emacs/auctex/tex-fptex.el emacs/auctex/tex-info.el emacs/auctex/tex-jp.el emacs/auctex/tex-mik.el emacs/auctex/tex-site.el emacs/auctex/tex-site.el.in emacs/auctex/tex-site.el.out emacs/auctex/tex-style.el emacs/auctex/tex-wizard.el emacs/auctex/tex.el emacs/auctex/texmathp.el emacs/auctex/toolbar-x.el emacs/bbdb/Makefile emacs/bbdb/Makefile.in emacs/bbdb/bbdb-com.el emacs/bbdb/bbdb-ftp.el emacs/bbdb/bbdb-gnus.el emacs/bbdb/bbdb-gui.el emacs/bbdb/bbdb-hooks.el emacs/bbdb/bbdb-merge.el emacs/bbdb/bbdb-mhe.el emacs/bbdb/bbdb-migrate.el emacs/bbdb/bbdb-picture.el emacs/bbdb/bbdb-print.el emacs/bbdb/bbdb-reportmail.el emacs/bbdb/bbdb-rmail.el emacs/bbdb/bbdb-sc.el emacs/bbdb/bbdb-snarf.el emacs/bbdb/bbdb-srv.el emacs/bbdb/bbdb-vm.el emacs/bbdb/bbdb-w3.el emacs/bbdb/bbdb-whois.el emacs/bbdb/bbdb-xemacs.el emacs/bbdb/bbdb.el emacs/bbdb/loadpath.el emacs/dictionary/Makefile emacs/dictionary/connection.el emacs/dictionary/dictionary.el emacs/dictionary/link.el emacs/dictionary/lpath.el emacs/elim/AUTHORS emacs/elim/CHANGES emacs/elim/COPYING emacs/elim/MEDIA emacs/elim/Makefile emacs/elim/README emacs/elim/TODO emacs/elim/crashme.sh emacs/elim/data/init.el emacs/elim/doc/COPYING emacs/elim/doc/client-to-daemon.txt emacs/elim/doc/daemon-to-client.txt emacs/elim/doc/enumerations.txt emacs/elim/doc/protocol.txt emacs/elim/elim-client-queue.h emacs/elim/elim-client-utils.h emacs/elim/elim-client.c emacs/elim/elim-client.h emacs/elim/elim-func-handlers.h emacs/elim/elim-glibcompat.c emacs/elim/elim-glibcompat.h emacs/elim/elim-rpc.c emacs/elim/elim-rpc.h emacs/elim/elisp/Makefile emacs/elim/elisp/dbus-util.el emacs/elim/elisp/elim.el emacs/elim/elisp/garak.el emacs/elim/elisp/incomplete.el emacs/elim/elisp/lui.el emacs/elim/elisp/notify.el emacs/elim/elisp/test.el emacs/elim/elisp/tracking.el emacs/elim/graphics/garak.png emacs/elim/graphics/garak.svg emacs/elim/graphics/garak16.png emacs/elim/graphics/garak64x64.png emacs/elim/graphics/group.xcf emacs/elim/graphics/screenshot.png emacs/elim/graphics/typing.xcf emacs/elim/handlers/README emacs/elim/handlers/account_menu.c emacs/elim/handlers/account_menu.h emacs/elim/handlers/account_menu_action.c emacs/elim/handlers/account_menu_action.h emacs/elim/handlers/account_options.c emacs/elim/handlers/account_options.h emacs/elim/handlers/add_account.c emacs/elim/handlers/add_account.h emacs/elim/handlers/add_buddy.c emacs/elim/handlers/add_buddy.h emacs/elim/handlers/add_chat.c emacs/elim/handlers/add_chat.h emacs/elim/handlers/alias_bnode.c emacs/elim/handlers/alias_bnode.h emacs/elim/handlers/buddy_info.c emacs/elim/handlers/buddy_info.h emacs/elim/handlers/buddy_menu.c emacs/elim/handlers/buddy_menu.h emacs/elim/handlers/buddy_menu_action.c emacs/elim/handlers/buddy_menu_action.h emacs/elim/handlers/buddy_privacy.c emacs/elim/handlers/buddy_privacy.h emacs/elim/handlers/chat_params.c emacs/elim/handlers/chat_params.h emacs/elim/handlers/command.c emacs/elim/handlers/command.h emacs/elim/handlers/connect.c emacs/elim/handlers/connect.h emacs/elim/handlers/debug_mode.c emacs/elim/handlers/debug_mode.h emacs/elim/handlers/default.c emacs/elim/handlers/default.h emacs/elim/handlers/disconnect.c emacs/elim/handlers/disconnect.h emacs/elim/handlers/end_conversation.c emacs/elim/handlers/end_conversation.h emacs/elim/handlers/enumerations.c emacs/elim/handlers/enumerations.h emacs/elim/handlers/get_prefs.c emacs/elim/handlers/get_prefs.h emacs/elim/handlers/image.c emacs/elim/handlers/image.h emacs/elim/handlers/init.c emacs/elim/handlers/init.h emacs/elim/handlers/join_chat.c emacs/elim/handlers/join_chat.h emacs/elim/handlers/list_accounts.c emacs/elim/handlers/list_accounts.h emacs/elim/handlers/list_plugins.c emacs/elim/handlers/list_plugins.h emacs/elim/handlers/list_protocols.c emacs/elim/handlers/list_protocols.h emacs/elim/handlers/load_plugin.c emacs/elim/handlers/load_plugin.h emacs/elim/handlers/message.c emacs/elim/handlers/message.h emacs/elim/handlers/notify_search_callback.c emacs/elim/handlers/notify_search_callback.h emacs/elim/handlers/register.c emacs/elim/handlers/register.h emacs/elim/handlers/remove_account.c emacs/elim/handlers/remove_account.h emacs/elim/handlers/remove_buddy.c emacs/elim/handlers/remove_buddy.h emacs/elim/handlers/response.c emacs/elim/handlers/response.h emacs/elim/handlers/send_file.c emacs/elim/handlers/send_file.h emacs/elim/handlers/set_account_options.c emacs/elim/handlers/set_account_options.h emacs/elim/handlers/set_icon.c emacs/elim/handlers/set_icon.h emacs/elim/handlers/set_prefs.c emacs/elim/handlers/set_prefs.h emacs/elim/handlers/status.c emacs/elim/handlers/status.h emacs/elim/handlers/unregister.c emacs/elim/handlers/unregister.h emacs/elim/icons/available.png emacs/elim/icons/away.png emacs/elim/icons/blocked.png emacs/elim/icons/busy.png emacs/elim/icons/chat.png emacs/elim/icons/connecting.png emacs/elim/icons/extended-away.png emacs/elim/icons/garak.png emacs/elim/icons/garak48x48.png emacs/elim/icons/group.png emacs/elim/icons/invisible.png emacs/elim/icons/log-in.png emacs/elim/icons/log-out.png emacs/elim/icons/off.png emacs/elim/icons/offline.png emacs/elim/icons/on.png emacs/elim/icons/person.png emacs/elim/icons/prpl-aim.png emacs/elim/icons/prpl-bonjour.png emacs/elim/icons/prpl-generic.png emacs/elim/icons/prpl-gg.png emacs/elim/icons/prpl-icq.png emacs/elim/icons/prpl-irc.png emacs/elim/icons/prpl-jabber.png emacs/elim/icons/prpl-meanwhile.png emacs/elim/icons/prpl-msn.png emacs/elim/icons/prpl-novell.png emacs/elim/icons/prpl-qq.png emacs/elim/icons/prpl-silc.png emacs/elim/icons/prpl-simple.png emacs/elim/icons/prpl-yahoo.png emacs/elim/icons/prpl-zephyr.png emacs/elim/icons/scratch/available0.png emacs/elim/icons/scratch/available1.png emacs/elim/icons/scratch/available2.png emacs/elim/icons/scratch/blocked0.png emacs/elim/icons/typing.png emacs/elim/icons/unavailable.png emacs/elim/make/README emacs/elim/make/elim-func-handlers-c.sh emacs/elim/make/elim-ops-h.sh emacs/elim/make/handler-list-h.sh emacs/elim/make/sigsigs-h.sh emacs/elim/prpl/README emacs/elim/prpl/util.c emacs/elim/prpl/util.h emacs/elim/sexp/README emacs/elim/sexp/sexp-util.c emacs/elim/sexp/sexp-util.h emacs/elim/sexp/sexp-xml.c emacs/elim/sexp/sexp-xml.h emacs/elim/signals/file_transfers.c emacs/elim/signals/file_transfers.h emacs/elim/signals/sigs.h emacs/elim/signals/typing.c emacs/elim/signals/typing.h emacs/elim/ui_ops/README emacs/elim/ui_ops/account_ui_ops.c emacs/elim/ui_ops/account_ui_ops.h emacs/elim/ui_ops/blist_ui_ops.c emacs/elim/ui_ops/blist_ui_ops.h emacs/elim/ui_ops/connections_ui_ops.c emacs/elim/ui_ops/connections_ui_ops.h emacs/elim/ui_ops/conversation_ui_ops.c emacs/elim/ui_ops/conversation_ui_ops.h emacs/elim/ui_ops/core_ui_ops.c emacs/elim/ui_ops/core_ui_ops.h emacs/elim/ui_ops/default.m3u emacs/elim/ui_ops/eventloop_ui_ops.c emacs/elim/ui_ops/eventloop_ui_ops.h emacs/elim/ui_ops/idle_ui_ops.c emacs/elim/ui_ops/idle_ui_ops.h emacs/elim/ui_ops/notify_ui_ops.c emacs/elim/ui_ops/notify_ui_ops.h emacs/elim/ui_ops/request_ui_ops.c emacs/elim/ui_ops/request_ui_ops.h emacs/elim/xnode/README emacs/elim/xnode/xnode.c emacs/elim/xnode/xnode.h emacs/elisp.mk emacs/emms/AUTHORS emacs/emms/COPYING emacs/emms/ChangeLog emacs/emms/FAQ emacs/emms/Makefile emacs/emms/NEWS emacs/emms/README emacs/emms/RELEASE emacs/emms/emms-auto.in emacs/emms/emms-bookmarks.el emacs/emms/emms-browser.el emacs/emms/emms-cache.el emacs/emms/emms-compat.el emacs/emms/emms-history.el emacs/emms/emms-i18n.el emacs/emms/emms-info-libtag.el emacs/emms/emms-info-mp3info.el emacs/emms/emms-info-ogg.el emacs/emms/emms-info-ogginfo.el emacs/emms/emms-info-oggperl.el emacs/emms/emms-info.el emacs/emms/emms-last-played.el emacs/emms/emms-lastfm.el emacs/emms/emms-lyrics.el emacs/emms/emms-maint.el emacs/emms/emms-mark.el emacs/emms/emms-metaplaylist-mode.el emacs/emms/emms-mode-line-icon.el emacs/emms/emms-mode-line.el emacs/emms/emms-player-mpd.el emacs/emms/emms-player-mpg321-remote.el emacs/emms/emms-player-mplayer.el emacs/emms/emms-player-simple.el emacs/emms/emms-player-xine.el emacs/emms/emms-playing-time.el emacs/emms/emms-playlist-mode.el emacs/emms/emms-playlist-sort.el emacs/emms/emms-print-metadata.1 emacs/emms/emms-print-metadata.c emacs/emms/emms-score.el emacs/emms/emms-setup.el emacs/emms/emms-source-file.el emacs/emms/emms-source-playlist.el emacs/emms/emms-stream-info.el emacs/emms/emms-streams.el emacs/emms/emms-tag-editor.el emacs/emms/emms-url.el emacs/emms/emms-volume-amixer.el emacs/emms/emms-volume.el emacs/emms/emms.el emacs/emms/emms.texinfo emacs/emms/fdl.texi emacs/emms/gpl.texi emacs/emms/gst-wrapper emacs/emms/jack.el emacs/emms/later-do.el emacs/emms/ogg-comment.el emacs/emms/tq.el emacs/ert/Makefile emacs/ert/ert-batch.el emacs/ert/ert-exp-t.el emacs/ert/ert-exp.el emacs/ert/ert-run.el emacs/ert/ert-tests.el emacs/ert/ert-ui.el emacs/ert/ert.el emacs/ert/ert.texinfo emacs/google-maps/Makefile emacs/google-maps/google-maps-base.el emacs/google-maps/google-maps-geocode.el emacs/google-maps/google-maps-static.el emacs/google-maps/google-maps.el emacs/google-maps/org-location-google-maps.el emacs/haskell/ChangeLog emacs/haskell/Makefile emacs/haskell/NEWS emacs/haskell/README emacs/haskell/fontlock.hs emacs/haskell/haskell-c.el emacs/haskell/haskell-cabal.el emacs/haskell/haskell-decl-scan.el emacs/haskell/haskell-doc.el emacs/haskell/haskell-font-lock.el emacs/haskell/haskell-ghci.el emacs/haskell/haskell-hugs.el emacs/haskell/haskell-indent.el emacs/haskell/haskell-mode.el emacs/haskell/haskell-simple-indent.el emacs/haskell/indent.hs emacs/haskell/inf-haskell.el emacs/init/Makefile emacs/init/init.el emacs/init/ivan-abbrev.el emacs/init/ivan-anki.el emacs/init/ivan-anything.el emacs/init/ivan-auctex.el emacs/init/ivan-autoinsert.el emacs/init/ivan-bbdb.el emacs/init/ivan-bs.el emacs/init/ivan-c.el emacs/init/ivan-calendar.el emacs/init/ivan-comint.el emacs/init/ivan-common-code.el emacs/init/ivan-compile.el emacs/init/ivan-dictionary.el emacs/init/ivan-diff.el emacs/init/ivan-dired.el emacs/init/ivan-elim.el emacs/init/ivan-emms.el emacs/init/ivan-english.el emacs/init/ivan-epg.el emacs/init/ivan-erc.el emacs/init/ivan-face.el emacs/init/ivan-flashcard.el emacs/init/ivan-flyspell.el emacs/init/ivan-font.el emacs/init/ivan-french.el emacs/init/ivan-fun.el emacs/init/ivan-gnus.el emacs/init/ivan-graveyard.el emacs/init/ivan-grep.el emacs/init/ivan-help.el emacs/init/ivan-ibuffer.el emacs/init/ivan-ido.el emacs/init/ivan-info.el emacs/init/ivan-japanese.el emacs/init/ivan-keymap.el emacs/init/ivan-lisp.el emacs/init/ivan-load.el emacs/init/ivan-lookup.el emacs/init/ivan-message.el emacs/init/ivan-muse.el emacs/init/ivan-newsticker.el emacs/init/ivan-nterm.el emacs/init/ivan-nxml.el emacs/init/ivan-org.el emacs/init/ivan-perl.el emacs/init/ivan-psvn.el emacs/init/ivan-python.el emacs/init/ivan-quail.el emacs/init/ivan-re-builder.el emacs/init/ivan-server.el emacs/init/ivan-shell.el emacs/init/ivan-slime.el emacs/init/ivan-speedbar.el emacs/init/ivan-start.el emacs/init/ivan-term.el emacs/init/ivan-tetris.el emacs/init/ivan-twitter.el emacs/init/ivan-var.el emacs/init/ivan-vc.el emacs/init/ivan-vcursor.el emacs/init/ivan-w3m.el emacs/init/ivan-warning.el emacs/init/ivan-wgrep.el emacs/init/ivan-windows.el emacs/init/ivan-woman.el emacs/init/ivan-xcscope.el emacs/ivan-autoload.el emacs/ivan/Makefile emacs/ivan/keyring.el emacs/ivan/normal.txt emacs/ivan/pomodoro.el emacs/ivan/realplay.el emacs/ivan/special.txt emacs/ivan/stopwatch.el emacs/ivan/verbiste.el emacs/ivan/wclock.el emacs/lookup/ChangeLog emacs/lookup/Makefile emacs/lookup/Makefile.in emacs/lookup/README emacs/lookup/VERSION emacs/lookup/evi-mule.el emacs/lookup/evi.el emacs/lookup/lookup-compile.el emacs/lookup/lookup-content.el emacs/lookup/lookup-entry.el emacs/lookup/lookup-kanji.el emacs/lookup/lookup-logo.xbm emacs/lookup/lookup-logo.xpm emacs/lookup/lookup-package.el emacs/lookup/lookup-select.el emacs/lookup/lookup-types.el emacs/lookup/lookup-utils.el emacs/lookup/lookup-vars.el emacs/lookup/lookup-vse.el emacs/lookup/lookup.el emacs/lookup/ndcookie.el emacs/lookup/ndeb-binary.el emacs/lookup/ndeb.el emacs/lookup/ndic.el emacs/lookup/ndict.el emacs/lookup/ndkks.el emacs/lookup/ndmisc.el emacs/lookup/ndnmz.el emacs/lookup/ndspell.el emacs/lookup/ndsrd.el emacs/lookup/ndtp.el emacs/lookup/sdicf.el emacs/lookup/stem-english.el emacs/magit/Makefile emacs/magit/magit-key-mode.el emacs/magit/magit-svn.el emacs/magit/magit-topgit.el emacs/magit/magit.el emacs/misc/Makefile emacs/misc/anki.el emacs/misc/anything.el emacs/misc/appt.el emacs/misc/boxquote.el emacs/misc/caps-mode.el emacs/misc/cmd-mode.el emacs/misc/column-marker.el emacs/misc/erc-goodies.el emacs/misc/fc.el emacs/misc/flashcard-sm5.el emacs/misc/flashcard.el emacs/misc/full-ack.el emacs/misc/gcalc.el emacs/misc/guess-lang.el emacs/misc/lastfm-submit.el emacs/misc/php-mode.el emacs/misc/pop3.el emacs/misc/psvn.el emacs/misc/pwsafe.el emacs/misc/quotes.el emacs/misc/sawfish.el emacs/misc/sqlplus.el emacs/misc/ssl.el emacs/misc/sudo-save.el emacs/misc/swbuff-x.el emacs/misc/swbuff.el emacs/misc/sym-comp.el emacs/misc/tea-time.el emacs/misc/term.el emacs/misc/time.el emacs/misc/twittering-mode.el emacs/misc/volume.el emacs/misc/wgrep.el emacs/misc/whitespace.el emacs/misc/xcscope.el emacs/muse/Makefile emacs/muse/htmlize.el emacs/muse/muse-backlink.el emacs/muse/muse-blosxom.el emacs/muse/muse-book.el emacs/muse/muse-colors.el emacs/muse/muse-context.el emacs/muse/muse-docbook.el emacs/muse/muse-groff.el emacs/muse/muse-html.el emacs/muse/muse-http.el emacs/muse/muse-ikiwiki.el emacs/muse/muse-import-docbook.el emacs/muse/muse-import-latex.el emacs/muse/muse-import-xml.el emacs/muse/muse-journal.el emacs/muse/muse-latex.el emacs/muse/muse-latex2png.el emacs/muse/muse-mode.el emacs/muse/muse-poem.el emacs/muse/muse-project.el emacs/muse/muse-protocols.el emacs/muse/muse-publish.el emacs/muse/muse-regexps.el emacs/muse/muse-texinfo.el emacs/muse/muse-wiki.el emacs/muse/muse-xml-common.el emacs/muse/muse-xml.el emacs/muse/muse.el emacs/newsticker/Makefile emacs/nterm/Makefile emacs/nterm/nterm-gr.el emacs/nterm/nterm-ut.el emacs/nterm/nterm.el emacs/org/ChangeLog emacs/org/Makefile emacs/org/ob-C.el emacs/org/ob-R.el emacs/org/ob-asymptote.el emacs/org/ob-clojure.el emacs/org/ob-comint.el emacs/org/ob-css.el emacs/org/ob-ditaa.el emacs/org/ob-dot.el emacs/org/ob-emacs-lisp.el emacs/org/ob-eval.el emacs/org/ob-exp.el emacs/org/ob-gnuplot.el emacs/org/ob-haskell.el emacs/org/ob-keys.el emacs/org/ob-latex.el emacs/org/ob-lob.el emacs/org/ob-matlab.el emacs/org/ob-mscgen.el emacs/org/ob-ocaml.el emacs/org/ob-octave.el emacs/org/ob-perl.el emacs/org/ob-python.el emacs/org/ob-ref.el emacs/org/ob-ruby.el emacs/org/ob-sass.el emacs/org/ob-screen.el emacs/org/ob-sh.el emacs/org/ob-sql.el emacs/org/ob-sqlite.el emacs/org/ob-table.el emacs/org/ob-tangle.el emacs/org/ob.el emacs/org/org-agenda.el emacs/org/org-archive.el emacs/org/org-ascii.el emacs/org/org-attach.el emacs/org/org-bbdb.el emacs/org/org-beamer.el emacs/org/org-bibtex.el emacs/org/org-capture.el emacs/org/org-clock.el emacs/org/org-colview-xemacs.el emacs/org/org-colview.el emacs/org/org-compat.el emacs/org/org-crypt.el emacs/org/org-ctags.el emacs/org/org-datetree.el emacs/org/org-docbook.el emacs/org/org-docview.el emacs/org/org-entities.el emacs/org/org-exp-blocks.el emacs/org/org-exp.el emacs/org/org-faces.el emacs/org/org-feed.el emacs/org/org-footnote.el emacs/org/org-freemind.el emacs/org/org-gnus.el emacs/org/org-habit.el emacs/org/org-html.el emacs/org/org-icalendar.el emacs/org/org-id.el emacs/org/org-indent.el emacs/org/org-info.el emacs/org/org-inlinetask.el emacs/org/org-install.el emacs/org/org-irc.el emacs/org/org-jsinfo.el emacs/org/org-latex.el emacs/org/org-list.el emacs/org/org-mac-message.el emacs/org/org-macs.el emacs/org/org-mew.el emacs/org/org-mhe.el emacs/org/org-mks.el emacs/org/org-mobile.el emacs/org/org-mouse.el emacs/org/org-plot.el emacs/org/org-protocol.el emacs/org/org-publish.el emacs/org/org-remember.el emacs/org/org-rmail.el emacs/org/org-src.el emacs/org/org-table.el emacs/org/org-taskjuggler.el emacs/org/org-timer.el emacs/org/org-vm.el emacs/org/org-w3m.el emacs/org/org-wl.el emacs/org/org-xoxo.el emacs/org/org.el emacs/slime/ChangeLog emacs/slime/HACKING emacs/slime/Makefile emacs/slime/NEWS emacs/slime/PROBLEMS emacs/slime/README emacs/slime/contrib/ChangeLog emacs/slime/contrib/Makefile emacs/slime/contrib/README emacs/slime/contrib/bridge.el emacs/slime/contrib/inferior-slime.el emacs/slime/contrib/slime-asdf.el emacs/slime/contrib/slime-autodoc.el emacs/slime/contrib/slime-banner.el emacs/slime/contrib/slime-c-p-c.el emacs/slime/contrib/slime-clipboard.el emacs/slime/contrib/slime-compiler-notes-tree.el emacs/slime/contrib/slime-editing-commands.el emacs/slime/contrib/slime-enclosing-context.el emacs/slime/contrib/slime-fancy-inspector.el emacs/slime/contrib/slime-fancy.el emacs/slime/contrib/slime-fontifying-fu.el emacs/slime/contrib/slime-fuzzy.el emacs/slime/contrib/slime-highlight-edits.el emacs/slime/contrib/slime-hyperdoc.el emacs/slime/contrib/slime-indentation-fu.el emacs/slime/contrib/slime-indentation.el emacs/slime/contrib/slime-mdot-fu.el emacs/slime/contrib/slime-media.el emacs/slime/contrib/slime-motd.el emacs/slime/contrib/slime-mrepl.el emacs/slime/contrib/slime-package-fu.el emacs/slime/contrib/slime-parse.el emacs/slime/contrib/slime-presentation-streams.el emacs/slime/contrib/slime-presentations.el emacs/slime/contrib/slime-references.el emacs/slime/contrib/slime-repl.el emacs/slime/contrib/slime-sbcl-exts.el emacs/slime/contrib/slime-scheme.el emacs/slime/contrib/slime-scratch.el emacs/slime/contrib/slime-snapshot.el emacs/slime/contrib/slime-sprof.el emacs/slime/contrib/slime-tramp.el emacs/slime/contrib/slime-typeout-frame.el emacs/slime/contrib/slime-xref-browser.el emacs/slime/contrib/swank-arglists.lisp emacs/slime/contrib/swank-asdf.lisp emacs/slime/contrib/swank-c-p-c.lisp emacs/slime/contrib/swank-clipboard.lisp emacs/slime/contrib/swank-fancy-inspector.lisp emacs/slime/contrib/swank-fuzzy.lisp emacs/slime/contrib/swank-goo.goo emacs/slime/contrib/swank-hyperdoc.lisp emacs/slime/contrib/swank-ikarus.ss emacs/slime/contrib/swank-indentation-fu.lisp emacs/slime/contrib/swank-indentation.lisp emacs/slime/contrib/swank-jolt.k emacs/slime/contrib/swank-kawa.scm emacs/slime/contrib/swank-larceny.scm emacs/slime/contrib/swank-listener-hooks.lisp emacs/slime/contrib/swank-media.lisp emacs/slime/contrib/swank-mit-scheme.scm emacs/slime/contrib/swank-motd.lisp emacs/slime/contrib/swank-package-fu.lisp emacs/slime/contrib/swank-presentation-streams.lisp emacs/slime/contrib/swank-presentations.lisp emacs/slime/contrib/swank-r6rs.scm emacs/slime/contrib/swank-sbcl-exts.lisp emacs/slime/contrib/swank-snapshot.lisp emacs/slime/contrib/swank-sprof.lisp emacs/slime/contrib/swank.rb emacs/slime/hyperspec.el emacs/slime/metering.lisp emacs/slime/mkdist.sh emacs/slime/nregex.lisp emacs/slime/sbcl-pprint-patch.lisp emacs/slime/slime-autoloads.el emacs/slime/slime.el emacs/slime/start-swank.lisp emacs/slime/swank-abcl.lisp emacs/slime/swank-allegro.lisp emacs/slime/swank-backend.lisp emacs/slime/swank-ccl.lisp emacs/slime/swank-clisp.lisp emacs/slime/swank-cmucl.lisp emacs/slime/swank-corman.lisp emacs/slime/swank-ecl.lisp emacs/slime/swank-gray.lisp emacs/slime/swank-lispworks.lisp emacs/slime/swank-loader.lisp emacs/slime/swank-match.lisp emacs/slime/swank-openmcl.lisp emacs/slime/swank-rpc.lisp emacs/slime/swank-sbcl.lisp emacs/slime/swank-scl.lisp emacs/slime/swank-source-file-cache.lisp emacs/slime/swank-source-path-parser.lisp emacs/slime/swank.asd emacs/slime/swank.lisp emacs/slime/test-all.sh emacs/slime/test.sh emacs/slime/xref.lisp emacs/w3m/Makefile emacs/w3m/mew-w3m.el emacs/w3m/mime-w3m.el emacs/w3m/mkinstalldirs emacs/w3m/octet.el emacs/w3m/w3m-antenna.el emacs/w3m/w3m-bitmap.el emacs/w3m/w3m-bookmark.el emacs/w3m/w3m-bug.el emacs/w3m/w3m-ccl.el emacs/w3m/w3m-cookie.el emacs/w3m/w3m-dtree.el emacs/w3m/w3m-e19.el emacs/w3m/w3m-e20.el emacs/w3m/w3m-e21.el emacs/w3m/w3m-ems.el emacs/w3m/w3m-favicon.el emacs/w3m/w3m-fb.el emacs/w3m/w3m-filter.el emacs/w3m/w3m-form.el emacs/w3m/w3m-fsf.el emacs/w3m/w3m-hist.el emacs/w3m/w3m-image.el emacs/w3m/w3m-lnum.el emacs/w3m/w3m-mail.el emacs/w3m/w3m-namazu.el emacs/w3m/w3m-om.el emacs/w3m/w3m-perldoc.el emacs/w3m/w3m-proc.el emacs/w3m/w3m-rss.el emacs/w3m/w3m-search.el emacs/w3m/w3m-session.el emacs/w3m/w3m-symbol.el emacs/w3m/w3m-tabmenu.el emacs/w3m/w3m-ucs.el emacs/w3m/w3m-util.el emacs/w3m/w3m-weather.el emacs/w3m/w3m-xmas.el emacs/w3m/w3m.el emacs/w3m/w3mhack.el emacs/wget/ChangeLog emacs/wget/Makefile emacs/wget/README emacs/wget/USAGE emacs/wget/wget-sysdep.el emacs/wget/wget.el lisp/Makefile lisp/auctex/CHANGES lisp/auctex/Makefile lisp/auctex/auctex.el lisp/auctex/auctex.el.in lisp/auctex/bib-cite.el lisp/auctex/context-en.el lisp/auctex/context-nl.el lisp/auctex/context.el lisp/auctex/font-latex.el lisp/auctex/latex.el lisp/auctex/lpath.el lisp/auctex/multi-prompt.el lisp/auctex/style/.nosearch lisp/auctex/style/Makefile lisp/auctex/style/MinionPro.el lisp/auctex/style/alltt.el lisp/auctex/style/alphanum.el lisp/auctex/style/amsart.el lisp/auctex/style/amsbook.el lisp/auctex/style/amsbsy.el lisp/auctex/style/amsmath.el lisp/auctex/style/amsopn.el lisp/auctex/style/amstex.el lisp/auctex/style/amstext.el lisp/auctex/style/amsthm.el lisp/auctex/style/article.el lisp/auctex/style/babel.el lisp/auctex/style/beamer.el lisp/auctex/style/book.el lisp/auctex/style/booktabs.el lisp/auctex/style/captcont.el lisp/auctex/style/csquotes.el lisp/auctex/style/czech.el lisp/auctex/style/danish.el lisp/auctex/style/dinbrief.el lisp/auctex/style/dk-bib.el lisp/auctex/style/dk.el lisp/auctex/style/doc.el lisp/auctex/style/dutch.el lisp/auctex/style/emp.el lisp/auctex/style/epsf.el lisp/auctex/style/fancyref.el lisp/auctex/style/foils.el lisp/auctex/style/francais.el lisp/auctex/style/frenchb.el lisp/auctex/style/german.el lisp/auctex/style/graphics.el lisp/auctex/style/graphicx.el lisp/auctex/style/harvard.el lisp/auctex/style/index.el lisp/auctex/style/inputenc.el lisp/auctex/style/italian.el lisp/auctex/style/j-article.el lisp/auctex/style/j-book.el lisp/auctex/style/j-report.el lisp/auctex/style/jarticle.el lisp/auctex/style/jbook.el lisp/auctex/style/jreport.el lisp/auctex/style/jsarticle.el lisp/auctex/style/jsbook.el lisp/auctex/style/jura.el lisp/auctex/style/jurabib.el lisp/auctex/style/latexinfo.el lisp/auctex/style/letter.el lisp/auctex/style/listings.el lisp/auctex/style/ltx-base.el lisp/auctex/style/ltxdoc.el lisp/auctex/style/makeidx.el lisp/auctex/style/mdwlist.el lisp/auctex/style/multind.el lisp/auctex/style/natbib.el lisp/auctex/style/ngerman.el lisp/auctex/style/nicefrac.el lisp/auctex/style/paralist.el lisp/auctex/style/plfonts.el lisp/auctex/style/plhb.el lisp/auctex/style/prosper.el lisp/auctex/style/psfig.el lisp/auctex/style/report.el lisp/auctex/style/scrartcl.el lisp/auctex/style/scrbase.el lisp/auctex/style/scrbook.el lisp/auctex/style/scrlttr2.el lisp/auctex/style/scrpage2.el lisp/auctex/style/scrreprt.el lisp/auctex/style/slides.el lisp/auctex/style/slovak.el lisp/auctex/style/subfigure.el lisp/auctex/style/swedish.el lisp/auctex/style/units.el lisp/auctex/style/url.el lisp/auctex/style/varioref.el lisp/auctex/style/verbatim.el lisp/auctex/style/virtex.el lisp/auctex/tex-bar.el lisp/auctex/tex-buf.el lisp/auctex/tex-fold.el lisp/auctex/tex-font.el lisp/auctex/tex-fptex.el lisp/auctex/tex-info.el lisp/auctex/tex-jp.el lisp/auctex/tex-mik.el lisp/auctex/tex-site.el lisp/auctex/tex-site.el.in lisp/auctex/tex-site.el.out lisp/auctex/tex-style.el lisp/auctex/tex-wizard.el lisp/auctex/tex.el lisp/auctex/texmathp.el lisp/auctex/toolbar-x.el lisp/bbdb/Makefile lisp/bbdb/Makefile.in lisp/bbdb/bbdb-com.el lisp/bbdb/bbdb-ftp.el lisp/bbdb/bbdb-gnus.el lisp/bbdb/bbdb-gui.el lisp/bbdb/bbdb-hooks.el lisp/bbdb/bbdb-merge.el lisp/bbdb/bbdb-mhe.el lisp/bbdb/bbdb-migrate.el lisp/bbdb/bbdb-picture.el lisp/bbdb/bbdb-print.el lisp/bbdb/bbdb-reportmail.el lisp/bbdb/bbdb-rmail.el lisp/bbdb/bbdb-sc.el lisp/bbdb/bbdb-snarf.el lisp/bbdb/bbdb-srv.el lisp/bbdb/bbdb-vm.el lisp/bbdb/bbdb-w3.el lisp/bbdb/bbdb-whois.el lisp/bbdb/bbdb-xemacs.el lisp/bbdb/bbdb.el lisp/bbdb/loadpath.el lisp/dictionary/Makefile lisp/dictionary/connection.el lisp/dictionary/dictionary.el lisp/dictionary/link.el lisp/dictionary/lpath.el lisp/elim/AUTHORS lisp/elim/CHANGES lisp/elim/COPYING lisp/elim/MEDIA lisp/elim/Makefile lisp/elim/README lisp/elim/TODO lisp/elim/crashme.sh lisp/elim/data/init.el lisp/elim/doc/COPYING lisp/elim/doc/client-to-daemon.txt lisp/elim/doc/daemon-to-client.txt lisp/elim/doc/enumerations.txt lisp/elim/doc/protocol.txt lisp/elim/elim-client-queue.h lisp/elim/elim-client-utils.h lisp/elim/elim-client.c lisp/elim/elim-client.h lisp/elim/elim-func-handlers.h lisp/elim/elim-glibcompat.c lisp/elim/elim-glibcompat.h lisp/elim/elim-rpc.c lisp/elim/elim-rpc.h lisp/elim/elisp/Makefile lisp/elim/elisp/dbus-util.el lisp/elim/elisp/elim.el lisp/elim/elisp/garak.el lisp/elim/elisp/incomplete.el lisp/elim/elisp/lui.el lisp/elim/elisp/notify.el lisp/elim/elisp/test.el lisp/elim/elisp/tracking.el lisp/elim/graphics/garak.png lisp/elim/graphics/garak.svg lisp/elim/graphics/garak16.png lisp/elim/graphics/garak64x64.png lisp/elim/graphics/group.xcf lisp/elim/graphics/screenshot.png lisp/elim/graphics/typing.xcf lisp/elim/handlers/README lisp/elim/handlers/account_menu.c lisp/elim/handlers/account_menu.h lisp/elim/handlers/account_menu_action.c lisp/elim/handlers/account_menu_action.h lisp/elim/handlers/account_options.c lisp/elim/handlers/account_options.h lisp/elim/handlers/add_account.c lisp/elim/handlers/add_account.h lisp/elim/handlers/add_buddy.c lisp/elim/handlers/add_buddy.h lisp/elim/handlers/add_chat.c lisp/elim/handlers/add_chat.h lisp/elim/handlers/alias_bnode.c lisp/elim/handlers/alias_bnode.h lisp/elim/handlers/buddy_info.c lisp/elim/handlers/buddy_info.h lisp/elim/handlers/buddy_menu.c lisp/elim/handlers/buddy_menu.h lisp/elim/handlers/buddy_menu_action.c lisp/elim/handlers/buddy_menu_action.h lisp/elim/handlers/buddy_privacy.c lisp/elim/handlers/buddy_privacy.h lisp/elim/handlers/chat_params.c lisp/elim/handlers/chat_params.h lisp/elim/handlers/command.c lisp/elim/handlers/command.h lisp/elim/handlers/connect.c lisp/elim/handlers/connect.h lisp/elim/handlers/debug_mode.c lisp/elim/handlers/debug_mode.h lisp/elim/handlers/default.c lisp/elim/handlers/default.h lisp/elim/handlers/disconnect.c lisp/elim/handlers/disconnect.h lisp/elim/handlers/end_conversation.c lisp/elim/handlers/end_conversation.h lisp/elim/handlers/enumerations.c lisp/elim/handlers/enumerations.h lisp/elim/handlers/get_prefs.c lisp/elim/handlers/get_prefs.h lisp/elim/handlers/image.c lisp/elim/handlers/image.h lisp/elim/handlers/init.c lisp/elim/handlers/init.h lisp/elim/handlers/join_chat.c lisp/elim/handlers/join_chat.h lisp/elim/handlers/list_accounts.c lisp/elim/handlers/list_accounts.h lisp/elim/handlers/list_plugins.c lisp/elim/handlers/list_plugins.h lisp/elim/handlers/list_protocols.c lisp/elim/handlers/list_protocols.h lisp/elim/handlers/load_plugin.c lisp/elim/handlers/load_plugin.h lisp/elim/handlers/message.c lisp/elim/handlers/message.h lisp/elim/handlers/notify_search_callback.c lisp/elim/handlers/notify_search_callback.h lisp/elim/handlers/register.c lisp/elim/handlers/register.h lisp/elim/handlers/remove_account.c lisp/elim/handlers/remove_account.h lisp/elim/handlers/remove_buddy.c lisp/elim/handlers/remove_buddy.h lisp/elim/handlers/response.c lisp/elim/handlers/response.h lisp/elim/handlers/send_file.c lisp/elim/handlers/send_file.h lisp/elim/handlers/set_account_options.c lisp/elim/handlers/set_account_options.h lisp/elim/handlers/set_icon.c lisp/elim/handlers/set_icon.h lisp/elim/handlers/set_prefs.c lisp/elim/handlers/set_prefs.h lisp/elim/handlers/status.c lisp/elim/handlers/status.h lisp/elim/handlers/unregister.c lisp/elim/handlers/unregister.h lisp/elim/icons/available.png lisp/elim/icons/away.png lisp/elim/icons/blocked.png lisp/elim/icons/busy.png lisp/elim/icons/chat.png lisp/elim/icons/connecting.png lisp/elim/icons/extended-away.png lisp/elim/icons/garak.png lisp/elim/icons/garak48x48.png lisp/elim/icons/group.png lisp/elim/icons/invisible.png lisp/elim/icons/log-in.png lisp/elim/icons/log-out.png lisp/elim/icons/off.png lisp/elim/icons/offline.png lisp/elim/icons/on.png lisp/elim/icons/person.png lisp/elim/icons/prpl-aim.png lisp/elim/icons/prpl-bonjour.png lisp/elim/icons/prpl-generic.png lisp/elim/icons/prpl-gg.png lisp/elim/icons/prpl-icq.png lisp/elim/icons/prpl-irc.png lisp/elim/icons/prpl-jabber.png lisp/elim/icons/prpl-meanwhile.png lisp/elim/icons/prpl-msn.png lisp/elim/icons/prpl-novell.png lisp/elim/icons/prpl-qq.png lisp/elim/icons/prpl-silc.png lisp/elim/icons/prpl-simple.png lisp/elim/icons/prpl-yahoo.png lisp/elim/icons/prpl-zephyr.png lisp/elim/icons/scratch/available0.png lisp/elim/icons/scratch/available1.png lisp/elim/icons/scratch/available2.png lisp/elim/icons/scratch/blocked0.png lisp/elim/icons/typing.png lisp/elim/icons/unavailable.png lisp/elim/make/README lisp/elim/make/elim-func-handlers-c.sh lisp/elim/make/elim-ops-h.sh lisp/elim/make/handler-list-h.sh lisp/elim/make/sigsigs-h.sh lisp/elim/prpl/README lisp/elim/prpl/util.c lisp/elim/prpl/util.h lisp/elim/sexp/README lisp/elim/sexp/sexp-util.c lisp/elim/sexp/sexp-util.h lisp/elim/sexp/sexp-xml.c lisp/elim/sexp/sexp-xml.h lisp/elim/signals/file_transfers.c lisp/elim/signals/file_transfers.h lisp/elim/signals/sigs.h lisp/elim/signals/typing.c lisp/elim/signals/typing.h lisp/elim/ui_ops/README lisp/elim/ui_ops/account_ui_ops.c lisp/elim/ui_ops/account_ui_ops.h lisp/elim/ui_ops/blist_ui_ops.c lisp/elim/ui_ops/blist_ui_ops.h lisp/elim/ui_ops/connections_ui_ops.c lisp/elim/ui_ops/connections_ui_ops.h lisp/elim/ui_ops/conversation_ui_ops.c lisp/elim/ui_ops/conversation_ui_ops.h lisp/elim/ui_ops/core_ui_ops.c lisp/elim/ui_ops/core_ui_ops.h lisp/elim/ui_ops/default.m3u lisp/elim/ui_ops/eventloop_ui_ops.c lisp/elim/ui_ops/eventloop_ui_ops.h lisp/elim/ui_ops/idle_ui_ops.c lisp/elim/ui_ops/idle_ui_ops.h lisp/elim/ui_ops/notify_ui_ops.c lisp/elim/ui_ops/notify_ui_ops.h lisp/elim/ui_ops/request_ui_ops.c lisp/elim/ui_ops/request_ui_ops.h lisp/elim/xnode/README lisp/elim/xnode/xnode.c lisp/elim/xnode/xnode.h lisp/elisp.mk lisp/emms/AUTHORS lisp/emms/COPYING lisp/emms/ChangeLog lisp/emms/FAQ lisp/emms/Makefile lisp/emms/NEWS lisp/emms/README lisp/emms/RELEASE lisp/emms/emms-auto.in lisp/emms/emms-bookmarks.el lisp/emms/emms-browser.el lisp/emms/emms-cache.el lisp/emms/emms-compat.el lisp/emms/emms-history.el lisp/emms/emms-i18n.el lisp/emms/emms-info-libtag.el lisp/emms/emms-info-mp3info.el lisp/emms/emms-info-ogg.el lisp/emms/emms-info-ogginfo.el lisp/emms/emms-info-oggperl.el lisp/emms/emms-info.el lisp/emms/emms-last-played.el lisp/emms/emms-lastfm.el lisp/emms/emms-lyrics.el lisp/emms/emms-maint.el lisp/emms/emms-mark.el lisp/emms/emms-metaplaylist-mode.el lisp/emms/emms-mode-line-icon.el lisp/emms/emms-mode-line.el lisp/emms/emms-player-mpd.el lisp/emms/emms-player-mpg321-remote.el lisp/emms/emms-player-mplayer.el lisp/emms/emms-player-simple.el lisp/emms/emms-player-xine.el lisp/emms/emms-playing-time.el lisp/emms/emms-playlist-mode.el lisp/emms/emms-playlist-sort.el lisp/emms/emms-print-metadata.1 lisp/emms/emms-print-metadata.c lisp/emms/emms-score.el lisp/emms/emms-setup.el lisp/emms/emms-source-file.el lisp/emms/emms-source-playlist.el lisp/emms/emms-stream-info.el lisp/emms/emms-streams.el lisp/emms/emms-tag-editor.el lisp/emms/emms-url.el lisp/emms/emms-volume-amixer.el lisp/emms/emms-volume.el lisp/emms/emms.el lisp/emms/emms.texinfo lisp/emms/fdl.texi lisp/emms/gpl.texi lisp/emms/gst-wrapper lisp/emms/jack.el lisp/emms/later-do.el lisp/emms/ogg-comment.el lisp/emms/tq.el lisp/ert/Makefile lisp/ert/ert-batch.el lisp/ert/ert-exp-t.el lisp/ert/ert-exp.el lisp/ert/ert-run.el lisp/ert/ert-tests.el lisp/ert/ert-ui.el lisp/ert/ert.el lisp/ert/ert.texinfo lisp/google-maps/Makefile lisp/google-maps/google-maps-base.el lisp/google-maps/google-maps-geocode.el lisp/google-maps/google-maps-static.el lisp/google-maps/google-maps.el lisp/google-maps/org-location-google-maps.el lisp/haskell/ChangeLog lisp/haskell/Makefile lisp/haskell/NEWS lisp/haskell/README lisp/haskell/fontlock.hs lisp/haskell/haskell-c.el lisp/haskell/haskell-cabal.el lisp/haskell/haskell-decl-scan.el lisp/haskell/haskell-doc.el lisp/haskell/haskell-font-lock.el lisp/haskell/haskell-ghci.el lisp/haskell/haskell-hugs.el lisp/haskell/haskell-indent.el lisp/haskell/haskell-mode.el lisp/haskell/haskell-simple-indent.el lisp/haskell/indent.hs lisp/haskell/inf-haskell.el lisp/init/Makefile lisp/init/init.el lisp/init/ivan-abbrev.el lisp/init/ivan-anki.el lisp/init/ivan-anything.el lisp/init/ivan-auctex.el lisp/init/ivan-autoinsert.el lisp/init/ivan-bbdb.el lisp/init/ivan-bs.el lisp/init/ivan-c.el lisp/init/ivan-calendar.el lisp/init/ivan-comint.el lisp/init/ivan-common-code.el lisp/init/ivan-compile.el lisp/init/ivan-dictionary.el lisp/init/ivan-diff.el lisp/init/ivan-dired.el lisp/init/ivan-elim.el lisp/init/ivan-emms.el lisp/init/ivan-english.el lisp/init/ivan-epg.el lisp/init/ivan-erc.el lisp/init/ivan-face.el lisp/init/ivan-flashcard.el lisp/init/ivan-flyspell.el lisp/init/ivan-font.el lisp/init/ivan-french.el lisp/init/ivan-fun.el lisp/init/ivan-gnus.el lisp/init/ivan-graveyard.el lisp/init/ivan-grep.el lisp/init/ivan-help.el lisp/init/ivan-ibuffer.el lisp/init/ivan-ido.el lisp/init/ivan-info.el lisp/init/ivan-japanese.el lisp/init/ivan-keymap.el lisp/init/ivan-lisp.el lisp/init/ivan-load.el lisp/init/ivan-lookup.el lisp/init/ivan-message.el lisp/init/ivan-muse.el lisp/init/ivan-newsticker.el lisp/init/ivan-nterm.el lisp/init/ivan-nxml.el lisp/init/ivan-org.el lisp/init/ivan-perl.el lisp/init/ivan-psvn.el lisp/init/ivan-python.el lisp/init/ivan-quail.el lisp/init/ivan-re-builder.el lisp/init/ivan-server.el lisp/init/ivan-shell.el lisp/init/ivan-slime.el lisp/init/ivan-speedbar.el lisp/init/ivan-start.el lisp/init/ivan-term.el lisp/init/ivan-tetris.el lisp/init/ivan-twitter.el lisp/init/ivan-var.el lisp/init/ivan-vc.el lisp/init/ivan-vcursor.el lisp/init/ivan-w3m.el lisp/init/ivan-warning.el lisp/init/ivan-wgrep.el lisp/init/ivan-windows.el lisp/init/ivan-woman.el lisp/init/ivan-xcscope.el lisp/ivan-autoload.el lisp/ivan/Makefile lisp/ivan/keyring.el lisp/ivan/normal.txt lisp/ivan/pomodoro.el lisp/ivan/realplay.el lisp/ivan/special.txt lisp/ivan/stopwatch.el lisp/ivan/verbiste.el lisp/ivan/wclock.el lisp/lookup/ChangeLog lisp/lookup/Makefile lisp/lookup/Makefile.in lisp/lookup/README lisp/lookup/VERSION lisp/lookup/evi-mule.el lisp/lookup/evi.el lisp/lookup/lookup-compile.el lisp/lookup/lookup-content.el lisp/lookup/lookup-entry.el lisp/lookup/lookup-kanji.el lisp/lookup/lookup-logo.xbm lisp/lookup/lookup-logo.xpm lisp/lookup/lookup-package.el lisp/lookup/lookup-select.el lisp/lookup/lookup-types.el lisp/lookup/lookup-utils.el lisp/lookup/lookup-vars.el lisp/lookup/lookup-vse.el lisp/lookup/lookup.el lisp/lookup/ndcookie.el lisp/lookup/ndeb-binary.el lisp/lookup/ndeb.el lisp/lookup/ndic.el lisp/lookup/ndict.el lisp/lookup/ndkks.el lisp/lookup/ndmisc.el lisp/lookup/ndnmz.el lisp/lookup/ndspell.el lisp/lookup/ndsrd.el lisp/lookup/ndtp.el lisp/lookup/sdicf.el lisp/lookup/stem-english.el lisp/magit/Makefile lisp/magit/magit-key-mode.el lisp/magit/magit-svn.el lisp/magit/magit-topgit.el lisp/magit/magit.el lisp/misc/Makefile lisp/misc/anki.el lisp/misc/anything.el lisp/misc/appt.el lisp/misc/boxquote.el lisp/misc/caps-mode.el lisp/misc/cmd-mode.el lisp/misc/column-marker.el lisp/misc/erc-goodies.el lisp/misc/fc.el lisp/misc/flashcard-sm5.el lisp/misc/flashcard.el lisp/misc/full-ack.el lisp/misc/gcalc.el lisp/misc/guess-lang.el lisp/misc/lastfm-submit.el lisp/misc/php-mode.el lisp/misc/pop3.el lisp/misc/psvn.el lisp/misc/pwsafe.el lisp/misc/quotes.el lisp/misc/sawfish.el lisp/misc/sqlplus.el lisp/misc/ssl.el lisp/misc/sudo-save.el lisp/misc/swbuff-x.el lisp/misc/swbuff.el lisp/misc/sym-comp.el lisp/misc/tea-time.el lisp/misc/term.el lisp/misc/time.el lisp/misc/twittering-mode.el lisp/misc/volume.el lisp/misc/wgrep.el lisp/misc/whitespace.el lisp/misc/xcscope.el lisp/muse/Makefile lisp/muse/htmlize.el lisp/muse/muse-backlink.el lisp/muse/muse-blosxom.el lisp/muse/muse-book.el lisp/muse/muse-colors.el lisp/muse/muse-context.el lisp/muse/muse-docbook.el lisp/muse/muse-groff.el lisp/muse/muse-html.el lisp/muse/muse-http.el lisp/muse/muse-ikiwiki.el lisp/muse/muse-import-docbook.el lisp/muse/muse-import-latex.el lisp/muse/muse-import-xml.el lisp/muse/muse-journal.el lisp/muse/muse-latex.el lisp/muse/muse-latex2png.el lisp/muse/muse-mode.el lisp/muse/muse-poem.el lisp/muse/muse-project.el lisp/muse/muse-protocols.el lisp/muse/muse-publish.el lisp/muse/muse-regexps.el lisp/muse/muse-texinfo.el lisp/muse/muse-wiki.el lisp/muse/muse-xml-common.el lisp/muse/muse-xml.el lisp/muse/muse.el lisp/newsticker/Makefile lisp/nterm/Makefile lisp/nterm/nterm-gr.el lisp/nterm/nterm-ut.el lisp/nterm/nterm.el lisp/org/ChangeLog lisp/org/Makefile lisp/org/ob-C.el lisp/org/ob-R.el lisp/org/ob-asymptote.el lisp/org/ob-clojure.el lisp/org/ob-comint.el lisp/org/ob-css.el lisp/org/ob-ditaa.el lisp/org/ob-dot.el lisp/org/ob-emacs-lisp.el lisp/org/ob-eval.el lisp/org/ob-exp.el lisp/org/ob-gnuplot.el lisp/org/ob-haskell.el lisp/org/ob-keys.el lisp/org/ob-latex.el lisp/org/ob-lob.el lisp/org/ob-matlab.el lisp/org/ob-mscgen.el lisp/org/ob-ocaml.el lisp/org/ob-octave.el lisp/org/ob-perl.el lisp/org/ob-python.el lisp/org/ob-ref.el lisp/org/ob-ruby.el lisp/org/ob-sass.el lisp/org/ob-screen.el lisp/org/ob-sh.el lisp/org/ob-sql.el lisp/org/ob-sqlite.el lisp/org/ob-table.el lisp/org/ob-tangle.el lisp/org/ob.el lisp/org/org-agenda.el lisp/org/org-archive.el lisp/org/org-ascii.el lisp/org/org-attach.el lisp/org/org-bbdb.el lisp/org/org-beamer.el lisp/org/org-bibtex.el lisp/org/org-capture.el lisp/org/org-clock.el lisp/org/org-colview-xemacs.el lisp/org/org-colview.el lisp/org/org-compat.el lisp/org/org-crypt.el lisp/org/org-ctags.el lisp/org/org-datetree.el lisp/org/org-docbook.el lisp/org/org-docview.el lisp/org/org-entities.el lisp/org/org-exp-blocks.el lisp/org/org-exp.el lisp/org/org-faces.el lisp/org/org-feed.el lisp/org/org-footnote.el lisp/org/org-freemind.el lisp/org/org-gnus.el lisp/org/org-habit.el lisp/org/org-html.el lisp/org/org-icalendar.el lisp/org/org-id.el lisp/org/org-indent.el lisp/org/org-info.el lisp/org/org-inlinetask.el lisp/org/org-install.el lisp/org/org-irc.el lisp/org/org-jsinfo.el lisp/org/org-latex.el lisp/org/org-list.el lisp/org/org-mac-message.el lisp/org/org-macs.el lisp/org/org-mew.el lisp/org/org-mhe.el lisp/org/org-mks.el lisp/org/org-mobile.el lisp/org/org-mouse.el lisp/org/org-plot.el lisp/org/org-protocol.el lisp/org/org-publish.el lisp/org/org-remember.el lisp/org/org-rmail.el lisp/org/org-src.el lisp/org/org-table.el lisp/org/org-taskjuggler.el lisp/org/org-timer.el lisp/org/org-vm.el lisp/org/org-w3m.el lisp/org/org-wl.el lisp/org/org-xoxo.el lisp/org/org.el lisp/slime/ChangeLog lisp/slime/HACKING lisp/slime/Makefile lisp/slime/NEWS lisp/slime/PROBLEMS lisp/slime/README lisp/slime/contrib/ChangeLog lisp/slime/contrib/Makefile lisp/slime/contrib/README lisp/slime/contrib/bridge.el lisp/slime/contrib/inferior-slime.el lisp/slime/contrib/slime-asdf.el lisp/slime/contrib/slime-autodoc.el lisp/slime/contrib/slime-banner.el lisp/slime/contrib/slime-c-p-c.el lisp/slime/contrib/slime-clipboard.el lisp/slime/contrib/slime-compiler-notes-tree.el lisp/slime/contrib/slime-editing-commands.el lisp/slime/contrib/slime-enclosing-context.el lisp/slime/contrib/slime-fancy-inspector.el lisp/slime/contrib/slime-fancy.el lisp/slime/contrib/slime-fontifying-fu.el lisp/slime/contrib/slime-fuzzy.el lisp/slime/contrib/slime-highlight-edits.el lisp/slime/contrib/slime-hyperdoc.el lisp/slime/contrib/slime-indentation-fu.el lisp/slime/contrib/slime-indentation.el lisp/slime/contrib/slime-mdot-fu.el lisp/slime/contrib/slime-media.el lisp/slime/contrib/slime-motd.el lisp/slime/contrib/slime-mrepl.el lisp/slime/contrib/slime-package-fu.el lisp/slime/contrib/slime-parse.el lisp/slime/contrib/slime-presentation-streams.el lisp/slime/contrib/slime-presentations.el lisp/slime/contrib/slime-references.el lisp/slime/contrib/slime-repl.el lisp/slime/contrib/slime-sbcl-exts.el lisp/slime/contrib/slime-scheme.el lisp/slime/contrib/slime-scratch.el lisp/slime/contrib/slime-snapshot.el lisp/slime/contrib/slime-sprof.el lisp/slime/contrib/slime-tramp.el lisp/slime/contrib/slime-typeout-frame.el lisp/slime/contrib/slime-xref-browser.el lisp/slime/contrib/swank-arglists.lisp lisp/slime/contrib/swank-asdf.lisp lisp/slime/contrib/swank-c-p-c.lisp lisp/slime/contrib/swank-clipboard.lisp lisp/slime/contrib/swank-fancy-inspector.lisp lisp/slime/contrib/swank-fuzzy.lisp lisp/slime/contrib/swank-goo.goo lisp/slime/contrib/swank-hyperdoc.lisp lisp/slime/contrib/swank-ikarus.ss lisp/slime/contrib/swank-indentation-fu.lisp lisp/slime/contrib/swank-indentation.lisp lisp/slime/contrib/swank-jolt.k lisp/slime/contrib/swank-kawa.scm lisp/slime/contrib/swank-larceny.scm lisp/slime/contrib/swank-listener-hooks.lisp lisp/slime/contrib/swank-media.lisp lisp/slime/contrib/swank-mit-scheme.scm lisp/slime/contrib/swank-motd.lisp lisp/slime/contrib/swank-package-fu.lisp lisp/slime/contrib/swank-presentation-streams.lisp lisp/slime/contrib/swank-presentations.lisp lisp/slime/contrib/swank-r6rs.scm lisp/slime/contrib/swank-sbcl-exts.lisp lisp/slime/contrib/swank-snapshot.lisp lisp/slime/contrib/swank-sprof.lisp lisp/slime/contrib/swank.rb lisp/slime/hyperspec.el lisp/slime/metering.lisp lisp/slime/mkdist.sh lisp/slime/nregex.lisp lisp/slime/sbcl-pprint-patch.lisp lisp/slime/slime-autoloads.el lisp/slime/slime.el lisp/slime/start-swank.lisp lisp/slime/swank-abcl.lisp lisp/slime/swank-allegro.lisp lisp/slime/swank-backend.lisp lisp/slime/swank-ccl.lisp lisp/slime/swank-clisp.lisp lisp/slime/swank-cmucl.lisp lisp/slime/swank-corman.lisp lisp/slime/swank-ecl.lisp lisp/slime/swank-gray.lisp lisp/slime/swank-lispworks.lisp lisp/slime/swank-loader.lisp lisp/slime/swank-match.lisp lisp/slime/swank-openmcl.lisp lisp/slime/swank-rpc.lisp lisp/slime/swank-sbcl.lisp lisp/slime/swank-scl.lisp lisp/slime/swank-source-file-cache.lisp lisp/slime/swank-source-path-parser.lisp lisp/slime/swank.asd lisp/slime/swank.lisp lisp/slime/test-all.sh lisp/slime/test.sh lisp/slime/xref.lisp lisp/w3m/Makefile lisp/w3m/mew-w3m.el lisp/w3m/mime-w3m.el lisp/w3m/mkinstalldirs lisp/w3m/octet.el lisp/w3m/w3m-antenna.el lisp/w3m/w3m-bitmap.el lisp/w3m/w3m-bookmark.el lisp/w3m/w3m-bug.el lisp/w3m/w3m-ccl.el lisp/w3m/w3m-cookie.el lisp/w3m/w3m-dtree.el lisp/w3m/w3m-e19.el lisp/w3m/w3m-e20.el lisp/w3m/w3m-e21.el lisp/w3m/w3m-ems.el lisp/w3m/w3m-favicon.el lisp/w3m/w3m-fb.el lisp/w3m/w3m-filter.el lisp/w3m/w3m-form.el lisp/w3m/w3m-fsf.el lisp/w3m/w3m-hist.el lisp/w3m/w3m-image.el lisp/w3m/w3m-lnum.el lisp/w3m/w3m-mail.el lisp/w3m/w3m-namazu.el lisp/w3m/w3m-om.el lisp/w3m/w3m-perldoc.el lisp/w3m/w3m-proc.el lisp/w3m/w3m-rss.el lisp/w3m/w3m-search.el lisp/w3m/w3m-session.el lisp/w3m/w3m-symbol.el lisp/w3m/w3m-tabmenu.el lisp/w3m/w3m-ucs.el lisp/w3m/w3m-util.el lisp/w3m/w3m-weather.el lisp/w3m/w3m-xmas.el lisp/w3m/w3m.el lisp/w3m/w3mhack.el lisp/wget/ChangeLog lisp/wget/Makefile lisp/wget/README lisp/wget/USAGE lisp/wget/wget-sysdep.el lisp/wget/wget.el
Change697 at Sun May 29 13:32:08 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 6a733adb7f96 -r 055623eddb1e lisp/wget/wget.el
--- a/lisp/wget/wget.el Sun May 29 13:25:13 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1061 +0,0 @@
-;;; wget.el --- Interface program of wget on Emacs
-
-;; Copyright (C) 2001, 2002, 2003, 2004 Masayuki Ataka <ataka@milk.freemail.ne.jp>
-;; $Id: wget.el,v 1.94 2004/10/16 06:43:43 ataka Exp $
-
-;; Author: Masayuki Ataka <ataka@milk.freemail.ne.jp>
-;; Keywords: hypermedia, WWW
-
-
-;; This file is the main part of emacs-wget.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
-
-
-;;; Commentary:
-
-;; emacs-wget is an interface program of GNU wget on Emacs. For more
-;; details about emacs-wget, see:
-;;
-;; http://pop-club.hp.infoseek.co.jp/emacs/emacs-wget/
-
-
-;;; How to install:
-
...
update makefile with new init directory
File modified: lisp/Makefile
Change696 at Sun May 29 13:25:13 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r c6d98edbd163 -r 6a733adb7f96 lisp/Makefile
--- a/lisp/Makefile Sun May 29 13:24:26 2011 +0200
+++ b/lisp/Makefile Sun May 29 13:25:13 2011 +0200
@@ -22,7 +22,7 @@
slime/contrib \
w3m \
wget \
-emacs.d
+init
ifndef ComSpec
SUBDIR += elim
rename emacs.d to init
File modified: lisp/emacs.d/Makefile lisp/emacs.d/init.el lisp/emacs.d/ivan-abbrev.el lisp/emacs.d/ivan-anki.el lisp/emacs.d/ivan-anything.el lisp/emacs.d/ivan-auctex.el lisp/emacs.d/ivan-autoinsert.el lisp/emacs.d/ivan-bbdb.el lisp/emacs.d/ivan-bs.el lisp/emacs.d/ivan-c.el lisp/emacs.d/ivan-calendar.el lisp/emacs.d/ivan-comint.el lisp/emacs.d/ivan-common-code.el lisp/emacs.d/ivan-compile.el lisp/emacs.d/ivan-dictionary.el lisp/emacs.d/ivan-diff.el lisp/emacs.d/ivan-dired.el lisp/emacs.d/ivan-elim.el lisp/emacs.d/ivan-emms.el lisp/emacs.d/ivan-english.el lisp/emacs.d/ivan-epg.el lisp/emacs.d/ivan-erc.el lisp/emacs.d/ivan-face.el lisp/emacs.d/ivan-flashcard.el lisp/emacs.d/ivan-flyspell.el lisp/emacs.d/ivan-font.el lisp/emacs.d/ivan-french.el lisp/emacs.d/ivan-fun.el lisp/emacs.d/ivan-gnus.el lisp/emacs.d/ivan-graveyard.el lisp/emacs.d/ivan-grep.el lisp/emacs.d/ivan-help.el lisp/emacs.d/ivan-ibuffer.el lisp/emacs.d/ivan-ido.el lisp/emacs.d/ivan-info.el lisp/emacs.d/ivan-japanese.el lisp/emacs.d/ivan-keymap.el lisp/emacs.d/ivan-lisp.el lisp/emacs.d/ivan-load.el lisp/emacs.d/ivan-lookup.el lisp/emacs.d/ivan-message.el lisp/emacs.d/ivan-muse.el lisp/emacs.d/ivan-newsticker.el lisp/emacs.d/ivan-nterm.el lisp/emacs.d/ivan-nxml.el lisp/emacs.d/ivan-org.el lisp/emacs.d/ivan-perl.el lisp/emacs.d/ivan-psvn.el lisp/emacs.d/ivan-python.el lisp/emacs.d/ivan-quail.el lisp/emacs.d/ivan-re-builder.el lisp/emacs.d/ivan-server.el lisp/emacs.d/ivan-shell.el lisp/emacs.d/ivan-slime.el lisp/emacs.d/ivan-speedbar.el lisp/emacs.d/ivan-start.el lisp/emacs.d/ivan-term.el lisp/emacs.d/ivan-tetris.el lisp/emacs.d/ivan-twitter.el lisp/emacs.d/ivan-var.el lisp/emacs.d/ivan-vc.el lisp/emacs.d/ivan-vcursor.el lisp/emacs.d/ivan-w3m.el lisp/emacs.d/ivan-warning.el lisp/emacs.d/ivan-wgrep.el lisp/emacs.d/ivan-windows.el lisp/emacs.d/ivan-woman.el lisp/emacs.d/ivan-xcscope.el lisp/init/Makefile lisp/init/init.el lisp/init/ivan-abbrev.el lisp/init/ivan-anki.el lisp/init/ivan-anything.el lisp/init/ivan-auctex.el lisp/init/ivan-autoinsert.el lisp/init/ivan-bbdb.el lisp/init/ivan-bs.el lisp/init/ivan-c.el lisp/init/ivan-calendar.el lisp/init/ivan-comint.el lisp/init/ivan-common-code.el lisp/init/ivan-compile.el lisp/init/ivan-dictionary.el lisp/init/ivan-diff.el lisp/init/ivan-dired.el lisp/init/ivan-elim.el lisp/init/ivan-emms.el lisp/init/ivan-english.el lisp/init/ivan-epg.el lisp/init/ivan-erc.el lisp/init/ivan-face.el lisp/init/ivan-flashcard.el lisp/init/ivan-flyspell.el lisp/init/ivan-font.el lisp/init/ivan-french.el lisp/init/ivan-fun.el lisp/init/ivan-gnus.el lisp/init/ivan-graveyard.el lisp/init/ivan-grep.el lisp/init/ivan-help.el lisp/init/ivan-ibuffer.el lisp/init/ivan-ido.el lisp/init/ivan-info.el lisp/init/ivan-japanese.el lisp/init/ivan-keymap.el lisp/init/ivan-lisp.el lisp/init/ivan-load.el lisp/init/ivan-lookup.el lisp/init/ivan-message.el lisp/init/ivan-muse.el lisp/init/ivan-newsticker.el lisp/init/ivan-nterm.el lisp/init/ivan-nxml.el lisp/init/ivan-org.el lisp/init/ivan-perl.el lisp/init/ivan-psvn.el lisp/init/ivan-python.el lisp/init/ivan-quail.el lisp/init/ivan-re-builder.el lisp/init/ivan-server.el lisp/init/ivan-shell.el lisp/init/ivan-slime.el lisp/init/ivan-speedbar.el lisp/init/ivan-start.el lisp/init/ivan-term.el lisp/init/ivan-tetris.el lisp/init/ivan-twitter.el lisp/init/ivan-var.el lisp/init/ivan-vc.el lisp/init/ivan-vcursor.el lisp/init/ivan-w3m.el lisp/init/ivan-warning.el lisp/init/ivan-wgrep.el lisp/init/ivan-windows.el lisp/init/ivan-woman.el lisp/init/ivan-xcscope.el
Change695 at Sun May 29 13:24:26 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r ea72009973fc -r c6d98edbd163 lisp/init/ivan-xcscope.el
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/init/ivan-xcscope.el Sun May 29 13:24:26 2011 +0200
@@ -0,0 +1,79 @@
+;;; ivan-xcscope.el --- cscope support
+
+;;; Commentary:
+
+;;; THANKS:
+
+;;; BUGS:
+
+;;; INSTALLATION:
+
+;;; Code:
+
+(require 'ivan-keymap)
+(require 'ivan-face)
+(eval-when-compile
+ (defvar cscope:map))
+
+;; prevent xcscope from polluting C-c s
+(setq cscope:map (make-keymap))
+(require 'xcscope)
+
+(defvar ivan-xcscope-key-map
+ "xcscope keymap")
+
+(ivan-keymap-prefix
+ ivan-xcscope-key-map
+ "s" 'cscope-find-this-symbol
+ "d" 'cscope-find-global-definition
+ "g" 'cscope-find-global-definition
+ "G" 'cscope-find-global-definition-no-prompting
+ "c" 'cscope-find-functions-calling-this-function
+ "C" 'cscope-find-called-functions
+ "t" 'cscope-find-this-text-string
+ "e" 'cscope-find-egrep-pattern
+ "f" 'cscope-find-this-file
+ "i" 'cscope-find-files-including-file
+ "b" 'cscope-display-buffer
...
update emacs script with a --user argument
File modified: bin/emacs.sh
Change694 at Sun May 29 13:22:20 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 2240f0728bbe -r ea72009973fc bin/emacs.sh
--- a/bin/emacs.sh Sun May 29 12:53:38 2011 +0200
+++ b/bin/emacs.sh Sun May 29 13:22:20 2011 +0200
@@ -1,17 +1,14 @@
#!/bin/sh
-if test "X${1}" = "Xlucia"
-then
- IVAN_USER="lucia"
-else
- IVAN_USER="ivan"
+if test x${1} = x--user ; then
+ export IVAN_USER=${2}
+ shift
+ shift
fi
-export IVAN_USER
-# prevent GUI agent
+# prevent GUI agent window popping up
unset GPG_AGENT_INFO
-
-emacs
+emacs $*
# Local Variables:
# compile-command: "sh emacs.sh"
merge
File modified: lisp/edict/Makefile lisp/edict/dui-registry.el lisp/edict/dui.el lisp/edict/edict-edit.el lisp/edict/edict-english.el lisp/edict/edict-japanese.el lisp/edict/edict-morphology.el lisp/edict/edict-test.el lisp/edict/edict.el lisp/edict/ts-mode.el lisp/emacs.d/ivan-bongo.el lisp/emacs.d/ivan-keyring.el lisp/misc/bongo.el lisp/newsticker/newst-backend.el lisp/newsticker/newst-plainview.el lisp/newsticker/newst-reader.el lisp/newsticker/newst-ticker.el lisp/newsticker/newst-treeview.el lisp/newsticker/newsticker-testsuite.el lisp/newsticker/newsticker.el lisp/newsticker/newsticker.texi
Change693 at Sun May 29 12:53:38 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 0e710ee49dce -r 2240f0728bbe lisp/newsticker/newsticker.texi
--- a/lisp/newsticker/newsticker.texi Sun May 29 11:32:09 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,318 +0,0 @@
-\input texinfo @c -*-texinfo-*-
-@comment %**start of header
-@setfilename ../../info/newsticker
-@set VERSION 1.99
-@set UPDATED June 2008
-@settitle Newsticker @value{VERSION}
-@syncodeindex vr cp
-@syncodeindex fn cp
-@syncodeindex pg cp
-@comment %**end of header
-
-@copying
-This manual is for Newsticker (version @value{VERSION}, @value{UPDATED}).
-
-@noindent
-Copyright @copyright{} 2004, 2005, 2006, 2007, 2008
-Free Software Foundation, Inc.
-
-@quotation
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
-and with the Back-Cover Texts as in (a) below. A copy of the license
-is included in the section entitled ``GNU Free Documentation License''.
-
-(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
-modify this GNU manual. Buying copies from the FSF supports it in
-developing GNU and promoting software freedom.''
-@end quotation
-@end copying
-
-@dircategory Emacs
-@direntry
-* Newsticker: (newsticker). A Newsticker for Emacs.
-@end direntry
-
...
compile all emacs lisp file without error or warning
File modified: lisp/Makefile lisp/auctex/Makefile lisp/auctex/tex-site.el lisp/dictionary/Makefile lisp/elim/elisp/Makefile lisp/elim/elisp/garak.el lisp/elisp.mk lisp/emacs.d/Makefile lisp/emacs.d/init.el lisp/emacs.d/ivan-erc.el lisp/emacs.d/ivan-keyring.el lisp/emacs.d/ivan-load.el lisp/emacs.d/ivan-shell.el lisp/emacs.d/ivan-slime.el lisp/emacs.d/ivan-start.el lisp/emacs.d/ivan-twitter.el lisp/emacs.d/ivan-wgrep.el lisp/nterm/Makefile lisp/w3m/Makefile
Change692 at Sun May 29 03:32:09 2011 -0700 by Ivan Kanis <ivan@kanis>
diff -r 2ff758569f02 -r 5293c6525c23 lisp/w3m/Makefile
--- a/lisp/w3m/Makefile Sun May 29 03:25:32 2011 -0700
+++ b/lisp/w3m/Makefile Sun May 29 03:32:09 2011 -0700
@@ -9,6 +9,7 @@
w3m-ems.el \
w3m.el \
w3m-favicon.el \
+w3m-fb.el \
w3m-filter.el \
w3m-form.el \
w3m-fsf.el \
fix slime compilation warnings
File modified: lisp/slime/Makefile lisp/slime/contrib/Makefile lisp/slime/contrib/inferior-slime.el lisp/slime/contrib/slime-autodoc.el lisp/slime/contrib/slime-banner.el lisp/slime/contrib/slime-c-p-c.el lisp/slime/contrib/slime-clipboard.el lisp/slime/contrib/slime-compiler-notes-tree.el lisp/slime/contrib/slime-editing-commands.el lisp/slime/contrib/slime-enclosing-context.el lisp/slime/contrib/slime-fancy-inspector.el lisp/slime/contrib/slime-fancy.el lisp/slime/contrib/slime-fontifying-fu.el lisp/slime/contrib/slime-fuzzy.el lisp/slime/contrib/slime-highlight-edits.el lisp/slime/contrib/slime-indentation.el lisp/slime/contrib/slime-mdot-fu.el lisp/slime/contrib/slime-motd.el lisp/slime/contrib/slime-mrepl.el lisp/slime/contrib/slime-package-fu.el lisp/slime/contrib/slime-parse.el lisp/slime/contrib/slime-presentation-streams.el lisp/slime/contrib/slime-presentations.el lisp/slime/contrib/slime-references.el lisp/slime/contrib/slime-repl.el lisp/slime/contrib/slime-sbcl-exts.el lisp/slime/contrib/slime-scratch.el lisp/slime/contrib/slime-tramp.el lisp/slime/contrib/slime-typeout-frame.el lisp/slime/contrib/slime-xref-browser.el lisp/slime/slime.el
Change691 at Sun May 29 03:25:32 2011 -0700 by Ivan Kanis <ivan@kanis>
diff -r 8f1ed42030ff -r 2ff758569f02 lisp/slime/slime.el
--- a/lisp/slime/slime.el Sun May 29 01:57:04 2011 -0700
+++ b/lisp/slime/slime.el Sun May 29 03:25:32 2011 -0700
@@ -90,6 +90,7 @@
(defvar slime-lisp-modes '(lisp-mode))
(defvar slime-setup-contribs nil)
+;;;###autoload
(defun slime-setup (&optional contribs)
"Setup Emacs so that lisp-mode buffers always use SLIME.
CONTRIBS is a list of contrib packages to load."
fix warning in dbus-util.el
File modified: lisp/elim/elisp/dbus-util.el
Change690 at Sun May 29 01:57:04 2011 -0700 by Ivan Kanis <ivan@kanis>
diff -r c8a5dd4d5b43 -r 8f1ed42030ff lisp/elim/elisp/dbus-util.el
--- a/lisp/elim/elisp/dbus-util.el Sat May 28 09:43:06 2011 -0700
+++ b/lisp/elim/elisp/dbus-util.el Sun May 29 01:57:04 2011 -0700
@@ -87,11 +87,11 @@
(let ((sig0 (aref type 0))
(sig1 (substring type 1)))
(if (stringp value) (setq value (encode-coding-string value 'utf-8)))
- (case sig0
- (?s (list :string value))
- (?u (list :uint32 value))
- (?i (list :int32 value))
- (?a (list
+ (cond
+ ((eq sig0 ?s) (list :string value))
+ ((eq sig0 ?u) (list :uint32 value))
+ ((eq sig0 ?i) (list :int32 value))
+ ((eq sig0 ?a) (list
(if (not value)
(apply 'list :array :signature sig1 nil)
(cons :array
remove all old-styp backquote warnings
File modified: lisp/bbdb/bbdb-com.el lisp/elisp.mk lisp/lookup/lookup-utils.el lisp/lookup/lookup.el lisp/lookup/ndeb.el lisp/lookup/ndict.el lisp/lookup/ndtp.el
Change689 at Sat May 28 09:43:06 2011 -0700 by Ivan Kanis <ivan@kanis>
diff -r 2a1d86ff018e -r c8a5dd4d5b43 lisp/lookup/ndtp.el
--- a/lisp/lookup/ndtp.el Thu May 26 21:26:46 2011 -0700
+++ b/lisp/lookup/ndtp.el Sat May 28 09:43:06 2011 -0700
@@ -128,27 +128,27 @@
(put 'ndtp-with-agent 'lisp-indent-function 1)
(defmacro ndtp-with-agent (agent &rest body)
- (` (let ((ndtp-current-agent (, agent))
- (ndtp-current-process (ndtp-agent-process (, agent))))
- (,@ body))))
+ `(let ((ndtp-current-agent ,agent)
+ (ndtp-current-process (ndtp-agent-process ,agent)))
+ ,@body))
(put 'ndtp-with-dictionary 'lisp-indent-function 1)
(defmacro ndtp-with-dictionary (dictionary &rest body)
- (` (ndtp-with-agent (lookup-dictionary-agent (, dictionary))
- (let ((ndtp-current-dictionary (, dictionary)))
- (unless (eq (, dictionary)
+ `(ndtp-with-agent (lookup-dictionary-agent ,dictionary)
+ (let ((ndtp-current-dictionary ,dictionary))
+ (unless (eq ,dictionary
(lookup-agent-get-property ndtp-current-agent 'ndtp-dict))
;; $BI,MW$J$H$-$@$1<-=q$r(B select $B$9$k!#(B
;; $B30It%W%m%;%9$H$d$j$H$j$9$k$h$j$3$NJ}$,9bB.$@$m$&$7!"(B
;; $B%G%P%C%0$N$H$-%P%C%U%!$,$4$A$c$4$A$c$9$k$N$O$&$6$C$?$$!#(B
- (ndtp-require-select (, dictionary))
+ (ndtp-require-select ,dictionary)
(lookup-agent-put-property ndtp-current-agent 'ndtp-dict
- (, dictionary))
+ ,dictionary)
;; $B<-=qKh$KJ8;z%3!<%I$r@_Dj$9$k!#(B
- (let ((code (ndtp-dictionary-coding (, dictionary))))
+ (let ((code (ndtp-dictionary-coding ,dictionary)))
(when code
(set-process-coding-system ndtp-current-process code code))))
- (,@ body)))))
+ ,@body)))
(defun ndtp-agent-process (agent)
(let ((process (lookup-agent-get-property agent 'ndtp-process)))
...
remove compile warning in slime
File modified: lisp/slime/slime.el
Change688 at Thu May 26 21:26:46 2011 -0700 by Ivan Kanis <ivan@kanis>
diff -r 8fa1e6693a00 -r 2a1d86ff018e lisp/slime/slime.el
--- a/lisp/slime/slime.el Thu May 26 09:01:54 2011 -0700
+++ b/lisp/slime/slime.el Thu May 26 21:26:46 2011 -0700
@@ -5922,7 +5922,7 @@
(assert sldb-restarts () "sldb-quit called outside of sldb buffer")
(slime-rex () ('(swank:throw-to-toplevel))
((:ok x) (error "sldb-quit returned [%s]" x))
- ((:abort _))))
+ ((:abort _) (message "abort"))))
(defun sldb-continue ()
"Invoke the \"continue\" restart."
@@ -5933,7 +5933,7 @@
((:ok _)
(message "No restart named continue")
(ding))
- ((:abort _))))
+ ((:abort _) (message "abort"))))
(defun sldb-abort ()
"Invoke the \"abort\" restart."
@@ -5950,7 +5950,7 @@
(slime-rex ()
((list 'swank:invoke-nth-restart-for-emacs sldb-level restart))
((:ok value) (message "Restart returned: %s" value))
- ((:abort _)))))
+ ((:abort _) (message "abort")))))
(defun sldb-invoke-restart-by-name (restart-name)
(interactive (list (let ((completion-ignore-case t))
@@ -5967,7 +5967,7 @@
((list 'swank:sldb-break-with-default-debugger
(not (not dont-unwind)))
nil slime-current-thread)
- ((:abort _))))
+ ((:abort _) (message "abort"))))
(defun sldb-break-with-system-debugger (&optional lightweight)
"Enter system debugger (gdb)."
@@ -6053,7 +6053,7 @@
(slime-rex ()
...
fix old-style backquotes
File modified: lisp/auctex/texmathp.el lisp/elim/elisp/Makefile lisp/lookup/evi.el lisp/lookup/lookup-types.el lisp/misc/ssl.el
Change687 at Thu May 26 09:01:54 2011 -0700 by Ivan Kanis <ivan@kanis>
diff -r 28c7f1899f46 -r 8fa1e6693a00 lisp/misc/ssl.el
--- a/lisp/misc/ssl.el Thu May 26 02:55:29 2011 -0700
+++ b/lisp/misc/ssl.el Thu May 26 09:01:54 2011 -0700
@@ -39,7 +39,7 @@
(defmacro defgroup (&rest args)
nil)
(defmacro defcustom (var value doc &rest args)
- (` (defvar (, var) (, value) (, doc))))))
+ `(defvar (, var) (, value) (, doc)))))
(defgroup ssl nil
"Support for `Secure Sockets Layer' encryption."
@@ -192,9 +192,8 @@
(let* ((process-connection-type nil)
(port service)
(proc (eval
- (`
- (start-process name buffer ssl-program-name
- (,@ ssl-program-arguments))))))
+ `(start-process name buffer ssl-program-name
+ (,@ ssl-program-arguments)))))
(process-kill-without-query proc)
proc))
support out of tree build
File modified: lisp/Makefile lisp/auctex/Makefile lisp/auctex/style/Makefile lisp/bbdb/Makefile lisp/dictionary/Makefile lisp/edict/Makefile lisp/edict/dui-registry.el lisp/edict/dui.el lisp/edict/edict-edit.el lisp/edict/edict-english.el lisp/edict/edict-japanese.el lisp/edict/edict-morphology.el lisp/edict/edict-test.el lisp/edict/edict.el lisp/edict/ts-mode.el lisp/elim/Makefile lisp/elim/elisp/Makefile lisp/elisp.mk lisp/emacs.d/Makefile lisp/emacs.d/ivan-load.el lisp/emms/Makefile lisp/ert/Makefile lisp/google-maps/Makefile lisp/haskell/Makefile lisp/ivan/Makefile lisp/lookup/Makefile lisp/magit/Makefile lisp/misc/Makefile lisp/muse/Makefile lisp/newsticker/Makefile lisp/newsticker/newst-backend.el lisp/newsticker/newst-plainview.el lisp/newsticker/newst-reader.el lisp/newsticker/newst-ticker.el lisp/newsticker/newst-treeview.el lisp/newsticker/newsticker-testsuite.el lisp/newsticker/newsticker.el lisp/newsticker/newsticker.texi lisp/nterm/Makefile lisp/org/Makefile lisp/slime/Makefile lisp/slime/contrib/Makefile lisp/w3m/Makefile lisp/w3m/w3m-e21.el lisp/wget/Makefile
Change686 at Thu May 26 02:55:29 2011 -0700 by Ivan Kanis <ivan@kanis>
diff -r 3ff883ede78b -r 28c7f1899f46 lisp/wget/Makefile
--- a/lisp/wget/Makefile Thu May 19 12:21:50 2011 -0700
+++ b/lisp/wget/Makefile Thu May 26 02:55:29 2011 -0700
@@ -2,14 +2,8 @@
ELC = ${SRC:.el=.elc}
-AUTOFILE = wget-auto-load
+AUTO_FILE = wget-auto-load
-INSTALLDIR = ${HOME}/build/lisp/wget
-
-all: $(ELC) $(AUTOFILE).elc
-
-$(AUTOFILE).el: $(SRC)
- @$(EMACS) $(AUTOLOAD) $(SRC)
- @rm -f $(AUTOFILE).el~
+INSTALL_DIR = wget
include ../elisp.mk
remove bongo
File modified: lisp/emacs.d/ivan-bongo.el
Change685 at Thu May 19 12:21:50 2011 -0700 by Ivan Kanis <ivan@kanis>
diff -r 41941ebca0af -r 3ff883ede78b lisp/emacs.d/ivan-bongo.el
--- a/lisp/emacs.d/ivan-bongo.el Thu May 19 12:19:48 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-;;; ivan-bongo.el --- flexible and usable media player
-
-;;; Commentary:
-
-;;; THANKS:
-
-;;; BUGS:
-
-;;; INSTALLATION:
-
-;;; Code:
-
-(require 'bongo)
-
-(eval-when-compile
- (require 'ivan-face))
-
-(defvar ivan-bongo-library-file "~/keep/library.bongo"
- "String defining default library to load")
-
-(define-bongo-backend oggdec
- :pretty-name "Oggdec"
- :constructor 'ivan-bongo-start-oggdec-player
- :matcher '(local-file "ogg")
- :extra-program-arguments '("-p"))
-
-(defun ivan-bongo ()
- (interactive)
- (require 'cl)
- (if (and ivan-bongo-library-file
- (file-exists-p ivan-bongo-library-file)
- (not (get-buffer bongo-default-library-buffer-name))
- (find-file ivan-bongo-library-file))
- (progn
- (set-visited-file-name nil)
- (rename-buffer bongo-default-library-buffer-name)
- (ivan-bongo-toggle-collapse-all))
...
remove bongo
File modified: lisp/misc/bongo.el
Change684 at Thu May 19 12:19:48 2011 -0700 by Ivan Kanis <ivan@${us_hostname}>
diff -r f57e041ed041 -r 41941ebca0af lisp/misc/bongo.el
--- a/lisp/misc/bongo.el Thu May 19 20:18:46 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10567 +0,0 @@
-;;; bongo.el --- flexible and usable media player for Emacs
-
-;; Copyright (C) 2005, 2006, 2007 Daniel Brockman
-;; Copyright (C) 2006, 2007 Daniel Jensen
-;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, 2005
-;; Free Software Foundation, Inc.
-
-;; Author: Daniel Brockman <daniel@brockman.se>
-;; URL: http://bongo.nongnu.org/
-;; Created: September 3, 2005
-;; Updated: June 19, 2007
-
-;; This file is part of Bongo.
-
-;; Bongo is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2 of
-;; the License, or (at your option) any later version.
-
-;; Bongo is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty
-;; of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-;; See the GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public
-;; License along with Bongo (see the file `COPYING'); if not,
-;; write to the Free Software Foundation, 51 Franklin Street,
-;; Fifth Floor, Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; The `lastfm-submit' library, necessary for Last.fm
-;; functionality, is available at the following URL:
-
-;; <http://www.brockman.se/software/lastfm-submit.el>
-
-;;; TODO:
...
forgot to put stumpwm in background
File modified: bin/bgn.sh
Change683 at Sun May 29 11:32:09 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 0f5623e95c97 -r 0e710ee49dce bin/bgn.sh
--- a/bin/bgn.sh Sat May 28 19:10:41 2011 +0200
+++ b/bin/bgn.sh Sun May 29 11:32:09 2011 +0200
@@ -82,6 +82,7 @@
fi
tao () {
+ ~/src/stumpwm/stumpwm &
update_web
backup_kanis_fr
fn_cp ~/lucia/gnus/.newsrc.eld ~/tmp/.newsrc.lucia
remove elim xnode.c warning
File modified: lisp/elim/xnode/xnode.c
Change682 at Sat May 28 19:10:41 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 8ae6d57aa40f -r 0f5623e95c97 lisp/elim/xnode/xnode.c
--- a/lisp/elim/xnode/xnode.c Fri May 27 19:14:51 2011 +0200
+++ b/lisp/elim/xnode/xnode.c Sat May 28 19:10:41 2011 +0200
@@ -34,8 +34,10 @@
xmlnode *
xnode_first_child_tag ( xmlnode *node )
{
- for( node && (node = node->child); node; node = node->next )
- if( node->type == XMLNODE_TYPE_TAG ) return node;
+ if ( node ) {
+ for( node = node->child ; node; node = node->next )
+ if( node->type == XMLNODE_TYPE_TAG ) return node;
+ }
return NULL;
}
meditation script
File modified: bin/meditate.ogg bin/meditate.sh
Change681 at Fri May 27 19:14:51 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 2523d631bb24 -r 8ae6d57aa40f bin/meditate.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/meditate.sh Fri May 27 19:14:51 2011 +0200
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# simple script to meditate. After 10 minutes a sound will play.
+
+cur_dir=`dirname $0`
+cur_dir=`cd ${cur_dir} ; pwd`
+sleep 600
+mplayer ${cur_dir}/meditate.ogg
+
merge
File modified:
Change680 at Fri May 27 18:40:16 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 144bb8672529 -r 2523d631bb24 bin/setup.sh
--- a/bin/setup.sh Thu May 26 18:08:50 2011 +0200
+++ b/bin/setup.sh Fri May 27 18:40:16 2011 +0200
@@ -329,6 +329,7 @@
man-db \
manpages-dev \
mercurial \
+ntfs3g \
genisoimage \
mp3info \
mplayer \
add ntfs 3g
File modified: bin/setup.sh
Change679 at Fri May 27 15:22:49 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r f3d7ef82c207 -r fa7d40ee67af bin/setup.sh
--- a/bin/setup.sh Tue May 24 20:11:01 2011 +0200
+++ b/bin/setup.sh Fri May 27 15:22:49 2011 +0200
@@ -329,6 +329,7 @@
man-db \
manpages-dev \
mercurial \
+ntfs3g \
genisoimage \
mp3info \
mplayer \
fix warnings
File modified: lisp/nterm/nterm-ut.el lisp/nterm/nterm.el
Change678 at Thu May 26 18:08:50 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r f3d7ef82c207 -r 144bb8672529 lisp/nterm/nterm.el
--- a/lisp/nterm/nterm.el Tue May 24 20:11:01 2011 +0200
+++ b/lisp/nterm/nterm.el Thu May 26 18:08:50 2011 +0200
@@ -220,7 +220,7 @@
(while (< line nterm-height)
(let ((assert-width
(progn
- (goto-line (1+ line))
+ (goto-char (point-min)) (forward-line (1- line))
(- (line-end-position) (point))))
(assert-expected-width
(if (nterm-mem-line-dwl line)
@@ -1390,10 +1390,11 @@
(defun nterm-vt100-el (char)
"EL -- Erase In Line - host to vt100."
- (if nterm-debug-vt100
- (message "EL par=%d" el-number))
- (nterm-vt100-el-ex (car (nterm-argument-to-list 1 0)) nil)
- (nterm-vt100-escape-end char))
+ (let ((el-number (car (nterm-argument-to-list 1 0))))
+ (if nterm-debug-vt100
+ (message "EL par=%d" el-number))
+ (nterm-vt100-el-ex el-number nil)
+ (nterm-vt100-escape-end char)))
(defun nterm-vt100-el-ex (el-ex-number el-ex-reset)
"Erase line, used by ED and EL.
@@ -2780,7 +2781,7 @@
(parse-gobble-index 0)
line-string line-binary)
(while (< parse-index parse-end)
- (goto-line parse-index)
+ (goto-char (point-min)) (forward-line (1- parse-index))
(setq line-string (buffer-substring (point-at-bol) (point-at-eol)))
(cond
((and (> (length line-string) 9)
add bottom scrollbar in vimperator
File modified: conf/vimperatorrc
Change677 at Tue May 24 20:11:01 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 5dba16875cfb -r f3d7ef82c207 conf/vimperatorrc
--- a/conf/vimperatorrc Mon May 23 14:21:29 2011 +0200
+++ b/conf/vimperatorrc Tue May 24 20:11:01 2011 +0200
@@ -1,2 +1,3 @@
map <BS> <PageUp>
map b <PageUp>
+" :set guioptions=bmrBT
only display hostname within screen
File modified: bin/setup.sh conf/bashrc
Change676 at Mon May 23 14:21:29 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 806afc841138 -r 5dba16875cfb conf/bashrc
--- a/conf/bashrc Mon May 23 14:20:54 2011 +0200
+++ b/conf/bashrc Mon May 23 14:21:29 2011 +0200
@@ -8,12 +8,6 @@
# fink
test -r /sw/bin/init.sh && . /sw/bin/init.sh
-# set xterm and screen title
-case ${TERM} in
- xterm) printf "\033]0;`hostname`\007" ;;
- screen) printf "\033k`hostname`\033\\" ;;
-esac
-
# setup environment with a script
file=/tmp/setenv.$$
${HOME}/hg/bin/setup.sh --interactive > ${file}
skype takes too much memory out of tny
File modified: bin/bgn.sh
Change675 at Mon May 23 14:20:54 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r f57e041ed041 -r 806afc841138 bin/bgn.sh
--- a/bin/bgn.sh Thu May 19 20:18:46 2011 +0200
+++ b/bin/bgn.sh Mon May 23 14:20:54 2011 +0200
@@ -98,7 +98,6 @@
tny () {
killall compiz &
${HOME}/src/stumpwm/stumpwm &
- skype &
exec screen ${SHELL}
}
fix institute in letter tex template
File modified: lisp/emacs.d/ivan-autoinsert.el
Change674 at Thu May 19 20:18:46 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 01fb69ffe2c9 -r f57e041ed041 lisp/emacs.d/ivan-autoinsert.el
--- a/lisp/emacs.d/ivan-autoinsert.el Thu May 19 18:40:58 2011 +0200
+++ b/lisp/emacs.d/ivan-autoinsert.el Thu May 19 20:18:46 2011 +0200
@@ -225,12 +225,13 @@
\\begin{document}
\\institut{"
- (substring (read-file-name
- "Institut: "
- (concat "~/texmf/tex/latex/lettre/"
- (if ivan-var-letter-english "en" "fr") "-"
- (and (not v2) "li.ins")) nil t)
- 25 -4)
+ (file-name-sans-extension
+ (file-name-nondirectory
+ (read-file-name
+ "Institut: "
+ (concat ivan-var-keel-dir "letter/"
+ (if ivan-var-letter-english "en" "fr") "-"
+ (and (not v2) "li.ins")) nil t)))
"}
\\begin{letter}{\n"
map M-k k in ido to jump to keel directory
File modified: lisp/emacs.d/ivan-ido.el
Change673 at Thu May 19 18:40:58 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 97403a790870 -r 01fb69ffe2c9 lisp/emacs.d/ivan-ido.el
--- a/lisp/emacs.d/ivan-ido.el Thu May 19 17:40:05 2011 +0200
+++ b/lisp/emacs.d/ivan-ido.el Thu May 19 18:40:58 2011 +0200
@@ -4,8 +4,16 @@
(require 'ivan-keymap)
(eval-when-compile
+ (require 'ivan-var)
(require 'ido))
+(defvar ivan-ido-map-m-k nil
+ "M-k keymap")
+
+(ivan-keymap-prefix
+ ivan-ido-map-m-k
+ "k" 'ivan-ido-keel)
+
(defun ivan-ido-dir ()
"Dired, late bind ido."
(interactive)
@@ -31,19 +39,31 @@
(ido-switch-buffer))
(defun ivan-ido-late-bind ()
+ "Load ido after starting emacs."
(unless ido-mode
(require 'uniquify)
(ido-mode 'both))
(ivan-keymap-define ido-common-completion-map
"C-n" ido-next-match
"C-p" ido-prev-match
- "~" ivan-ido-home)))
+ "~" ivan-ido-home)
+ (ivan-keymap-define ido-file-dir-completion-map
+ "M-k" ivan-ido-map-m-k))
(defun ivan-ido-home ()
- "Set home path on ido prompt"
+ "Open home dir."
(interactive)
+ (ivan-ido-set-path))
...
fix obscure bug where custom ido mapping doesn't work
File modified: lisp/emacs.d/ivan-ido.el
Change672 at Thu May 19 17:40:05 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 9deeca34aa2a -r 97403a790870 lisp/emacs.d/ivan-ido.el
--- a/lisp/emacs.d/ivan-ido.el Wed May 18 16:56:08 2011 +0200
+++ b/lisp/emacs.d/ivan-ido.el Thu May 19 17:40:05 2011 +0200
@@ -33,11 +33,11 @@
(defun ivan-ido-late-bind ()
(unless ido-mode
(require 'uniquify)
- (ido-mode 'both)
- (ivan-keymap-define ido-common-completion-map
- "C-n" ido-next-match
- "C-p" ido-prev-match
- "~" ivan-ido-home)))
+ (ido-mode 'both))
+ (ivan-keymap-define ido-common-completion-map
+ "C-n" ido-next-match
+ "C-p" ido-prev-match
+ "~" ivan-ido-home)))
(defun ivan-ido-home ()
"Set home path on ido prompt"
add silly wrapper to ssh
File modified: bin/setup.sh bin/ssh.sh
Change671 at Wed May 18 16:56:08 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r e266f727fd3e -r 9deeca34aa2a bin/ssh.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/ssh.sh Wed May 18 16:56:08 2011 +0200
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+ssh $*
+
+case ${TERM} in
+ xterm) printf "\033]0;`hostname -s`\007" ;;
+ screen) printf "\033k`hostname -s`\033\\\\" ;;
+esac
+
add variable to rename garak ui buffer
File modified: lisp/elim/elisp/garak.el lisp/emacs.d/ivan-elim.el
Change670 at Tue May 17 11:43:01 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 5c27fd82f569 -r e266f727fd3e lisp/emacs.d/ivan-elim.el
--- a/lisp/emacs.d/ivan-elim.el Tue May 17 11:28:51 2011 +0200
+++ b/lisp/emacs.d/ivan-elim.el Tue May 17 11:43:01 2011 +0200
@@ -17,19 +17,21 @@
(defun ivan-elim ()
"Start elim."
+ (interactive)
(save-window-excursion
- (and (not (get-buffer "*garak*"))
+ (and (not (get-buffer garak-ui-buffer-name))
(file-exists-p elim-executable)
(garak))))
-(defun ivan-elim-pop-buffer ()
+(defun ivan-elim-pop-buffer
+ (process buffer ctype flags who title is-new text args)
"Pop buffer on incoming messages."
(pop-to-buffer buffer)
(raise-frame (selected-frame)))
-(add-hook 'garak-alert-user-hook 'ivan-elim-pop-buffer)
-
(setq
+ garak-alert-methods '(ivan-elim-pop-buffer)
+ garak-ui-buffer-name "*chat*"
tracking-mode-map
(let ((map (make-sparse-keymap)))
(define-key map (kbd "C-c SPC") 'tracking-next-buffer)
remove garak hook
File modified: lisp/elim/elisp/garak.el
Change669 at Tue May 17 11:28:51 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r c8bc75b73084 -r 5c27fd82f569 lisp/elim/elisp/garak.el
--- a/lisp/elim/elisp/garak.el Sat May 14 15:48:59 2011 +0200
+++ b/lisp/elim/elisp/garak.el Tue May 17 11:28:51 2011 +0200
@@ -96,11 +96,6 @@
(function :tag "Custom Sort Function"))
:group 'garak)
-(defcustom garak-alert-user-hook nil
- "Hook to run after an alert is received"
- :type 'hook
- :group 'garak)
-
(defcustom garak-display-splash t
"Whether to display the garak splash logo while initialising the elim daemon"
:type '(boolean)
@@ -225,6 +220,7 @@
:tag "Flyspell Dictionary Chooser"
:type '(choice (function :tag "Function")
(const :tag "None (use default)" nil)))
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; buffer tracking data structures
(defvar garak-conversation-buffers nil)
@@ -942,8 +938,7 @@
(defun garak-alert-user (process buffer ctype flags who title is-new text args)
"Potentially alert the user to a new message, depending on the
content of `garak-alert-when'. The alert method(s) will depend on
-`garak-alert-sound', `garak-alert-desktop-notice' and `garak-alert-custom'.
-
+the value of `garak-alert-methods'.\n
PROCESS : the elim process
BUFFER : the buffer we are raising an alert for
WHO : the name (or alias) of the message sender, as displayed in BUFFER
@@ -986,6 +981,9 @@
(mapc
(lambda (how)
(cond ((stringp how) (play-sound-file how))
+ ((functionp how)
+ (funcall how
+ process buffer ctype flags who title is-new text args))
((eq :notify how)
...
disable internal muse publish command
File modified: lisp/emacs.d/ivan-muse.el
Change668 at Sat May 14 15:48:59 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 1597c7f22525 -r c8bc75b73084 lisp/emacs.d/ivan-muse.el
--- a/lisp/emacs.d/ivan-muse.el Fri May 13 19:13:17 2011 +0200
+++ b/lisp/emacs.d/ivan-muse.el Sat May 14 15:48:59 2011 +0200
@@ -31,6 +31,7 @@
(defun ivan-muse-hook ()
(ivan-keymap-keep-global muse-mode-map)
(ivan-keymap-define muse-mode-map
+ "C-c C-p" nil
"M-j p" ivan-muse-publish)
(auto-fill-mode)
(if (member (file-name-nondirectory buffer-file-name)
backup .newsrc.eld
File modified: bin/bgn.sh
Change667 at Fri May 13 19:13:17 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 6697ef9de87a -r 1597c7f22525 bin/bgn.sh
--- a/bin/bgn.sh Fri May 13 18:50:07 2011 +0200
+++ b/bin/bgn.sh Fri May 13 19:13:17 2011 +0200
@@ -84,6 +84,7 @@
tao () {
update_web
backup_kanis_fr
+ fn_cp ~/lucia/gnus/.newsrc.eld ~/tmp/.newsrc.lucia
exec screen ${0} --rsync
}
@@ -150,6 +151,7 @@
misc_stuff () {
mkdir -p ~/tmp/emacs/.emacs-w3m
xset b off
+ fn_cp ${KEEL_DIR}/gnus/.newsrc.eld ~/tmp
}
if test x${1} = x--rsync ; then
merg
File modified: bin/setup.sh
Change666 at Fri May 13 18:50:07 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r d68b13032fda -r 6697ef9de87a bin/setup.sh
--- a/bin/setup.sh Fri May 13 18:49:53 2011 +0200
+++ b/bin/setup.sh Fri May 13 18:50:07 2011 +0200
@@ -286,8 +286,8 @@
aspell-en \
aspell-fr \
aptitude \
-autoconf \
-automake \
+autoconf \
+automake \
bzip2 \
cl-clx-sbcl \
cl-ppcre \
@@ -338,6 +338,7 @@
pwgen \
rsync \
sbcl \
+screen \
strace \
subversion \
sudo \
fix elim to wget for out of tree build
File modified: lisp/elim/elisp/Makefile
Change665 at Fri May 13 18:49:53 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 287a0c1e12b1 -r d68b13032fda lisp/elim/elisp/Makefile
--- a/lisp/elim/elisp/Makefile Thu May 12 19:44:03 2011 +0200
+++ b/lisp/elim/elisp/Makefile Fri May 13 18:49:53 2011 +0200
@@ -10,7 +10,7 @@
AUTOFILE = elim-auto-load
-INSTALLDIR = ${HOME}/build/lisp/wget
+INSTALLDIR = ${HOME}/build/lisp/elim
all: $(ELC)
add screen to list of package to install
File modified: bin/setup.sh
Change664 at Fri May 13 15:08:36 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 3fdf71cd1a9b -r 47b5557a749f bin/setup.sh
--- a/bin/setup.sh Thu May 12 14:21:36 2011 +0200
+++ b/bin/setup.sh Fri May 13 15:08:36 2011 +0200
@@ -291,8 +291,8 @@
aspell-en \
aspell-fr \
aptitude \
-autoconf \
-automake \
+autoconf \
+automake \
bzip2 \
cl-clx-sbcl \
cl-ppcre \
@@ -341,6 +341,7 @@
pwgen \
rsync \
sbcl \
+screen \
strace \
subversion \
sudo \
compile elim elisp
File modified: lisp/Makefile
Change663 at Thu May 12 19:44:03 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r d84bb7c57c56 -r 287a0c1e12b1 lisp/Makefile
--- a/lisp/Makefile Thu May 12 19:40:33 2011 +0200
+++ b/lisp/Makefile Thu May 12 19:44:03 2011 +0200
@@ -6,6 +6,7 @@
dictionary \
edict \
elim \
+elim/elisp \
emms \
ert \
google-maps \
merge
File modified: bin/setup.sh
Change662 at Thu May 12 19:40:33 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 5765526b09f1 -r d84bb7c57c56 bin/setup.sh
--- a/bin/setup.sh Thu May 12 19:40:15 2011 +0200
+++ b/bin/setup.sh Thu May 12 19:40:33 2011 +0200
@@ -142,6 +142,7 @@
make_link2 ~/hg/conf/screenrc ~/.screenrc
make_link2 ~/hg/conf/vimperatorrc ~/.vimperatorrc
make_link2 ~/hg/conf/stumpwmrc ~/.stumpwmrc
+ make_link2 ~/hg/conf/mailcap ~/.mailcap
if test x${option_procede} = xy ; then
make_link2 ${KEEL_DIR}/.aspell.en.pws ~/.aspell.en.pws
make_link2 ${KEEL_DIR}/.aspell.fr.pws ~/.aspell.fr.pws
@@ -483,6 +484,7 @@
printf "export HISTFILESIZE=10000\n"
printf "export HISTCONTROL=ignoreboth\n"
printf "export HISTIGNORE=\"&:ls:[bf]g:exit\"\n"
+ printf "export MANWIDTH=80\n"
# Prompt
printf "export PS1='\h:\w\\$ '\n"
@@ -560,22 +562,15 @@
print_alias() {
cat <<EOF
alias agi='sudo apt-get install'
-alias ags='apt-get source'
-alias afs='apt-file search'
-alias acs='apt-cache search'
alias aptitude='TERM=vt100 sudo aptitude'
-alias dpkg-buildpackage='dpkg-buildpackage -rfakeroot'
-alias dp='sudo dpkg --purge'
+alias bgn='bgn.sh'
alias emacs='emacs.sh'
alias excel='excel.sh'
alias ifdown='sudo ifdown'
alias ifup='sudo ifup'
-alias lynx='lynx -nounderline'
-alias make-kpkg='nice make-kpkg --rootcmd fakeroot'
alias mount='sudo mount'
-alias bgn='bgn.sh'
+alias r='remote.sh'
alias stop='stop.sh'
-alias skype='skype.sh'
...
add library for elim
File modified: bin/setup.sh
Change661 at Thu May 12 19:40:15 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 3ab3a1d83eef -r 5765526b09f1 bin/setup.sh
--- a/bin/setup.sh Wed May 11 20:03:32 2011 +0200
+++ b/bin/setup.sh Thu May 12 19:40:15 2011 +0200
@@ -315,6 +315,7 @@
libotf-dev \
libncurses5-dev \
libpng12-dev \
+libpurple-dev \
librep-dev \
librsvg2-dev \
libtemplate-perl \
@@ -322,6 +323,7 @@
libtimedate-perl \
libpurple-dev \
libxml-simple-perl \
+libxml2-dev \
libxpm-dev \
man-db \
manpages-dev \
map m to month view in org agenda
File modified: lisp/emacs.d/ivan-org.el
Change660 at Thu May 12 14:21:36 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r b1c74adbde15 -r 3fdf71cd1a9b lisp/emacs.d/ivan-org.el
--- a/lisp/emacs.d/ivan-org.el Thu May 12 14:16:59 2011 +0200
+++ b/lisp/emacs.d/ivan-org.el Thu May 12 14:21:36 2011 +0200
@@ -74,7 +74,8 @@
"w" ivan-org-agenda-wait)
(ivan-keymap-define org-agenda-mode-map
- "M" org-agenda-month-view)
+ "m" org-agenda-month-view
+ "M" org-agenda-bulk-mark)
(define-key org-agenda-mode-map "\M-j" ivan-org-agenda-meta-j-map))
set manual width to 80
File modified: bin/setup.sh
Change659 at Thu May 12 14:16:59 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 6b2d6d5b586f -r b1c74adbde15 bin/setup.sh
--- a/bin/setup.sh Thu May 12 09:05:49 2011 +0200
+++ b/bin/setup.sh Thu May 12 14:16:59 2011 +0200
@@ -487,6 +487,7 @@
printf "export HISTFILESIZE=10000\n"
printf "export HISTCONTROL=ignoreboth\n"
printf "export HISTIGNORE=\"&:ls:[bf]g:exit\"\n"
+ printf "export MANWIDTH=80\n"
# Prompt
printf "export PS1='\h:\w\\$ '\n"
add alias r
File modified: bin/setup.sh
Change658 at Thu May 12 09:05:49 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 173094feb39f -r 6b2d6d5b586f bin/setup.sh
--- a/bin/setup.sh Wed May 11 11:33:20 2011 +0200
+++ b/bin/setup.sh Thu May 12 09:05:49 2011 +0200
@@ -564,22 +564,15 @@
print_alias() {
cat <<EOF
alias agi='sudo apt-get install'
-alias ags='apt-get source'
-alias afs='apt-file search'
-alias acs='apt-cache search'
alias aptitude='TERM=vt100 sudo aptitude'
-alias dpkg-buildpackage='dpkg-buildpackage -rfakeroot'
-alias dp='sudo dpkg --purge'
+alias bgn='bgn.sh'
alias emacs='emacs.sh'
alias excel='excel.sh'
alias ifdown='sudo ifdown'
alias ifup='sudo ifup'
-alias lynx='lynx -nounderline'
-alias make-kpkg='nice make-kpkg --rootcmd fakeroot'
alias mount='sudo mount'
-alias bgn='bgn.sh'
+alias r='remote.sh'
alias stop='stop.sh'
-alias skype='skype.sh'
alias umount='sudo umount'
alias word='word.sh'
EOF
link mailcap
File modified: bin/setup.sh
Change657 at Wed May 11 11:33:20 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 871a5d32510b -r 173094feb39f bin/setup.sh
--- a/bin/setup.sh Tue May 10 16:42:38 2011 +0200
+++ b/bin/setup.sh Wed May 11 11:33:20 2011 +0200
@@ -147,6 +147,7 @@
make_link2 ~/hg/conf/screenrc ~/.screenrc
make_link2 ~/hg/conf/vimperatorrc ~/.vimperatorrc
make_link2 ~/hg/conf/stumpwmrc ~/.stumpwmrc
+ make_link2 ~/hg/conf/mailcap ~/.mailcap
if test x${option_procede} = xy ; then
make_link2 ${KEEL_DIR}/.aspell.en.pws ~/.aspell.en.pws
make_link2 ${KEEL_DIR}/.aspell.fr.pws ~/.aspell.fr.pws
compile elim
File modified: lisp/Makefile
Change656 at Wed May 11 20:03:32 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 6f0b1425cbb1 -r 3ab3a1d83eef lisp/Makefile
--- a/lisp/Makefile Tue May 10 20:35:43 2011 +0200
+++ b/lisp/Makefile Wed May 11 20:03:32 2011 +0200
@@ -5,6 +5,7 @@
bbdb \
dictionary \
edict \
+elim \
emms \
ert \
google-maps \
check emacs tar ball if ~/.gnupg exists + small refactoring
File modified: bin/setup.sh
Change655 at Tue May 10 20:35:43 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r cfac51261599 -r 6f0b1425cbb1 bin/setup.sh
--- a/bin/setup.sh Tue May 10 20:08:50 2011 +0200
+++ b/bin/setup.sh Tue May 10 20:35:43 2011 +0200
@@ -11,20 +11,18 @@
## main routines
-user_setup () {
+setup_user () {
touch ~/.hushlogin
setup_crypto
- vc_config
- vc_install
- make_dir ~/tmp
- make_dir ~/local
- make_dir ~/src
+ configure_vc
+ install_vc
+ make_dir
build_emacs
build_stumpwm
make_link
}
-root_setup () {
+setup_root () {
which yum > /dev/null 2>&1
if test $? -eq 0
then
@@ -99,7 +97,7 @@
fn_check "Failed installing debian packages."
}
-vc_install () {
+install_vc () {
vi_file=hg.tar.bz2
vi_pwd=`pwd`
@@ -112,7 +110,7 @@
fn_cd ${vi_pwd}
}
...
resurect hg2rss.py
File modified: bin/hg2rss.py
Change654 at Tue May 10 20:08:50 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 52a5353dff60 -r cfac51261599 bin/hg2rss.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/hg2rss.py Tue May 10 20:08:50 2011 +0200
@@ -0,0 +1,256 @@
+#!/usr/bin/env python
+# turn hg log into rss
+# -*- coding: utf-8 -*-
+
+import os, re, cgi
+
+web_dir = os.getenv("WEB_DIR") + "/"
+single_page_dir = web_dir + "hgrss/"
+version_control_dir = os.getenv("VC_DIR")
+
+matches = {'changeset' : re.compile("changeset: (.*):"),
+ 'user' : re.compile("user: (.*)"),
+ 'date' : re.compile("date: (.*)"),
+ 'files' : re.compile("files: (.*)"),
+ }
+
+def output_prelude_xml(out_xml):
+ out_xml.write("""<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0">
+ <channel>
+ <title>Mercurial commits</title>
+ <link>http://kanis.fr/hg.html</link>
+ <description>List of Mercurial commits</description>
+ <language>en-us</language>
+ <generator>hg2rss.py</generator>""")
+
+def output_prelude_html(out_html, title, big_page=True):
+ out_html.write(
+ """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+ <head>
+ <title>""" + title + """</title>
+ <meta name="generator" content="hg2rsss.py">
+ <meta http-equiv="Content-Type"
+ content="text/html; charset=utf-8">
+ <link rel="stylesheet"
+type="text/css" charset="utf-8" media="all" href=""")
...
jiggle tea-time
File modified: info/version.texi lisp/misc/tea-time.el
Change653 at Tue May 10 20:07:37 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 871a5d32510b -r 52a5353dff60 lisp/misc/tea-time.el
--- a/lisp/misc/tea-time.el Tue May 10 16:42:38 2011 +0200
+++ b/lisp/misc/tea-time.el Tue May 10 20:07:37 2011 +0200
@@ -48,7 +48,7 @@
;; 2b. Press Enter without giving any number - if you would like to know
;; how much time is remaining before the timer expires
;;
-;; Use (tea-timer-cancel) to cancel currently running timer.
+;; Use (tea-time-cancel) to cancel currently running timer.
;;
;; Suggested binding:
;; (define-key global-map "\C-ct" 'tea-time)
@@ -63,47 +63,32 @@
;; Origin comes from http://www.hack.org/mc/files/.emacs.el
-(defcustom tea-time-sound nil
- "sound that will play once timer is expired.
-If you don't have alsa, it is better to be .wav file"
- :group 'tea-time
- :type 'string)
(defun tea-timer (sec)
- "Ding and show notification when tea is ready.
-Store current timer in a global variable."
+ "Call function in SEC seconds."
(interactive)
- (run-at-time sec nil (lambda (seconds)
- (tea-time-play-sound)
- (show-notification (format "Time is up! %d minutes" (/ seconds 60)))
- ) sec))
+ (run-at-time sec nil 'tea-time-display))
-(defun tea-time-play-sound ()
- "Play sound"
- (if (not (eq nil tea-time-sound))
- (if (program-exists "aplay")
- (start-process "tea-time-play-notification" nil "aplay" tea-time-sound)
- (play-sound-file tea-time-sound))
- (progn (beep t) (beep t))))
+(defun tea-time-display ())
...
compile stumpwm
File modified: bin/bgn.sh bin/setup.sh
Change652 at Tue May 10 16:42:38 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r e3dcd990569b -r 871a5d32510b bin/setup.sh
--- a/bin/setup.sh Tue May 10 16:42:10 2011 +0200
+++ b/bin/setup.sh Tue May 10 16:42:38 2011 +0200
@@ -20,6 +20,7 @@
make_dir ~/local
make_dir ~/src
build_emacs
+ build_stumpwm
make_link
}
@@ -234,6 +235,22 @@
fn_cd ${be_pwd}
}
+build_stumpwm () {
+ bs_pwd=`pwd`
+
+ fn_cd ~/src
+ git clone git://git.savannah.nongnu.org/stumpwm.git
+ fn_check "Git clone of stumpwm failed."
+ fn_cd ~/src/stumpwm
+ autoconf
+ fn_check "Generating configure file failed."
+ ./configure
+ fn_check "Configure of stumpwm failed."
+ make
+ fn_check "Compilation of stumpwm failed."
+ fn_cd ${bs_pwd}
+}
+
yum_install () {
yum install \
apr-devel \
@@ -278,7 +295,6 @@
bzip2 \
cl-clx-sbcl \
cl-ppcre \
-clisp \
diff \
dnsutils \
...
don't show menubar and url bar in vimperator
File modified: conf/vimperatorrc
Change651 at Tue May 10 16:42:10 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 08b236547d22 -r e3dcd990569b conf/vimperatorrc
--- a/conf/vimperatorrc Tue May 10 15:39:04 2011 +0200
+++ b/conf/vimperatorrc Tue May 10 16:42:10 2011 +0200
@@ -1,3 +1,2 @@
map <BS> <PageUp>
map b <PageUp>
-:set guioptions=mrBT
make xterm the default terminal emulator
File modified: bin/setup.sh
Change650 at Tue May 10 15:39:04 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 9c2ce4301ad9 -r 08b236547d22 bin/setup.sh
--- a/bin/setup.sh Tue May 10 15:16:42 2011 +0200
+++ b/bin/setup.sh Tue May 10 15:39:04 2011 +0200
@@ -36,6 +36,7 @@
apt_install
fi
install_sudo
+ make_link2 /usr/bin/xterm /etc/alternatives/x-terminal-emulator
}
## setup code
remove cad, add tny
File modified: bin/bgn.sh
Change649 at Tue May 10 15:16:42 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 5cf95c790610 -r 9c2ce4301ad9 bin/bgn.sh
--- a/bin/bgn.sh Tue May 10 15:14:44 2011 +0200
+++ b/bin/bgn.sh Tue May 10 15:16:42 2011 +0200
@@ -94,6 +94,13 @@
${SHELL}
}
+tny () {
+ killall compiz &
+ stumpwm &
+ skype &
+ exec screen ${SHELL}
+}
+
yan () {
killall compiz &
${HOME}/src/stumpwm/stumpwm &
@@ -111,11 +118,6 @@
${SHELL}
}
-cad () {
- killall metacity &
- ${HOME}/src/stumpwm/stumpwm &
-}
-
# 1 name of function
function_exists () {
type "${1}" 2>&1 | grep -q "function"
add function for apt-get
File modified: bin/setup.sh
Change648 at Tue May 10 15:14:44 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 0cf2ecf7c487 -r 5cf95c790610 bin/setup.sh
--- a/bin/setup.sh Tue May 10 14:24:07 2011 +0200
+++ b/bin/setup.sh Tue May 10 15:14:44 2011 +0200
@@ -2,17 +2,20 @@
#set -x
cur_dir=`dirname $0`
+cur_dir=`cd ${cur_dir}; pwd`
local_path=${HOME}/local
uname=`uname`
-. ${cur_dir}/function.sh
+if test -f ${cur_dir}/function.sh ; then
+ . ${cur_dir}/function.sh
+fi
## main routines
user_setup () {
- rm -f ${fn_log}
touch ~/.hushlogin
setup_crypto
vc_config
+ vc_install
make_dir ~/tmp
make_dir ~/local
make_dir ~/src
@@ -38,7 +41,7 @@
## setup code
prompt_option () {
- printf "The log file is ${fn_log}.\n\n"
+ printf "The log file is ${fn_log}.\n"
if test ! -d ${PORTABLE_DIR} ; then
cat << EOF
Couldn't find the external drive. Proceding with install means that
@@ -69,7 +72,7 @@
if test x${bool_yum} = xy ; then
yum install sudo
else
- apt-get -y install sudo >> ${fn_log}
+ apt_get_install sudo >> ${fn_log}
...
warn if source directory doesn't exist when running rsync
File modified: bin/function.sh
Change647 at Tue May 10 14:24:07 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 4547aed0f686 -r 0cf2ecf7c487 bin/function.sh
--- a/bin/function.sh Tue May 10 14:12:52 2011 +0200
+++ b/bin/function.sh Tue May 10 14:24:07 2011 +0200
@@ -11,6 +11,10 @@
if test $? -eq 0; then
fr_ionice="ionice -c3"
fi
+ if test ! -d ${fr_src} ; then
+ printf "Warning ${fr_src} does not exist.\n"
+ return 0
+ fi
${fr_ionice} rsync -a ${*} "${fr_src}" "${fr_dest}"
fn_check "Failed to rsync from ${fr_src} to ${fr_dest}"
}
merge
File modified: lisp/emacs.d/ivan-outline.el
Change646 at Tue May 10 14:12:52 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 53494f8a1270 -r 4547aed0f686 lisp/emacs.d/ivan-outline.el
--- a/lisp/emacs.d/ivan-outline.el Sat May 07 19:01:42 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-;;; ivan-outline.el --- outline customization
-
-(require 'ivan-keymap)
-(require 'ivan-face)
-
-(eval-when-compile
- (require 'outline))
-
-(ivan-keymap-prefix
- outline-mode-prefix-map
- "<" 'outline-promote
- ">" 'outline-demote
- "@" 'outline-mark-subtree
- "RET" 'outline-insert-heading
- "^" 'outline-move-subtree-up
- "a" 'show-all
- "b" 'outline-backward-same-level
- "c" 'hide-entry
- "d" 'hide-subtree
- "e" 'show-entry
- "f" 'outline-forward-same-level
- "i" 'show-children
- "k" 'show-branches
- "l" 'hide-leaves
- "n" 'outline-next-visible-heading
- "o" 'hide-other
- "p" 'outline-previous-visible-heading
- "q" 'hide-sublevels
- "s" 'show-subtree
- "t" 'hide-body
- "u" 'outline-up-heading
- "v" 'outline-move-subtree-down)
-
-(setq outline-minor-mode-prefix (kbd "C-c o"))
-
-(ivan-face-gradient "outline-" 5 "yellow" "purple")
-
...
erase log
File modified: bin/setup.sh
Change645 at Sat May 07 19:01:42 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r a154ec76344a -r 53494f8a1270 bin/setup.sh
--- a/bin/setup.sh Sat May 07 18:18:05 2011 +0200
+++ b/bin/setup.sh Sat May 07 19:01:42 2011 +0200
@@ -9,6 +9,7 @@
## main routines
user_setup () {
+ rm -f ${fn_log}
touch ~/.hushlogin
setup_crypto
vc_config
optionaly proceed without external hard disk
File modified: bin/setup.sh
Change644 at Sat May 07 18:18:05 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 23375b00b5af -r a154ec76344a bin/setup.sh
--- a/bin/setup.sh Sat May 07 17:42:38 2011 +0200
+++ b/bin/setup.sh Sat May 07 18:18:05 2011 +0200
@@ -9,14 +9,12 @@
## main routines
user_setup () {
-# test -d ${PORTABLE_DIR}
-# fn_check "Failed to find external disk."
touch ~/.hushlogin
setup_crypto
vc_config
make_dir ~/tmp
make_dir ~/local
- make_dir ~/src
+ make_dir ~/src
build_emacs
make_link
}
@@ -39,11 +37,23 @@
## setup code
prompt_option () {
+ printf "The log file is ${fn_log}.\n\n"
+ if test ! -d ${PORTABLE_DIR} ; then
+ cat << EOF
+Couldn't find the external drive. Proceding with install means that
+source code will not be under version control. It also means that
+the signature of the emacs compressed file will not be checked.
+EOF
+ printf "Procede with install ? [Y/n]: "
+ read option_procede
+ if test x${option_procede} = xn ; then
+ exit 0
+ fi
+ fi
cat <<EOF
-The log file is ${fn_log}.
-Answering y will introduce a huge security hole.
-Don't do this when setting up a server
...
clean up unused script in bin directory
File modified: bin/aps.bat bin/archive-notice.py bin/autologin-ivan bin/bintohex.py bin/blastwave.pl bin/blog.pl bin/cdlabelgen.pl bin/clean-zic.py bin/debug-thunderbird.sh bin/dig.sh bin/divx2cvcd.sh bin/download-stream.py bin/emacs.py bin/euc2uni.pl bin/everyday.py bin/expire-email.py bin/external-backup.py bin/gfind.bat bin/hg-tar.sh bin/hg2rss.py bin/impressive.py bin/ivan-screen-info.c bin/ivan-xterm.bat bin/ivanx.c bin/job-filter.py bin/logwatch-filter.py bin/lolix.py bin/mysql-backup.sh bin/push-random-music.py bin/quote.py bin/report-filter.py bin/rmbadlinks.sh bin/rtraceback.py bin/screen-ssh-agent.py bin/setup.sh bin/shell-interactive.py bin/signature.pl bin/skype.sh bin/soji.py bin/ssh.sh bin/string-to-image.py bin/stripcr.sh bin/svn-change-repo.py bin/timer.py bin/update-source.sh bin/util.py bin/vi.bat bin/wallpaper.py bin/winmixer.py bin/wrap-svn bin/wrap-svn.bat bin/xserver.py bin/xsession.py
Change643 at Sat May 07 17:42:38 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 9a1aa986c179 -r 23375b00b5af bin/xsession.py
--- a/bin/xsession.py Sat May 07 16:11:29 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +0,0 @@
-#!/usr/bin/env python
-
-# import ivanx
-import glob, os, string, util
-
-# global
-name = util.host_name()
-
-def cmd(cmd):
- "Run cmd, command ending in semi colon will wait"
- home = os.getenv('HOME')
- if home:
- cmd = string.replace(cmd, '~', home)
- if cmd[-1:] == ';':
- mode = os.P_WAIT
- cmd = cmd[:-1]
- else:
- mode = os.P_NOWAIT
- cmd = cmd.split(" ")
- os.spawnvp(mode, cmd[0], cmd)
-
-def cmdv(*cmd):
- os.spawnvp(os.P_NOWAIT, cmd[0], cmd)
-
-class Xmodmap:
- map = ''
- def add(self, string):
- self.map += '\n' + string
-
- def apply(self):
- if self.map == '':
- return
- home = os.getenv('HOME')
- if home:
- tmpfile = home + '/.modmap.' + str(os.getpid())
- file = open(tmpfile, 'w')
- file.write(self.map)
...
generate bootstrap.sh
File modified: bin/bgn.sh
Change642 at Sat May 07 16:11:29 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 3d93f5bb92db -r 9a1aa986c179 bin/bgn.sh
--- a/bin/bgn.sh Sat May 07 16:06:41 2011 +0200
+++ b/bin/bgn.sh Sat May 07 16:11:29 2011 +0200
@@ -15,6 +15,7 @@
fn_check "Failed to update RSS mercurial blog"
python "${VC_DIR}/bin/blog-archive.py"
fn_check "Failed to update archive blog"
+ cat ${VC_DIR}/function.sh ${VC_DIR}/setup.sh > ${WEB_DIR}/bootstrap.sh
fn_rsync_net "${WEB_DIR}/" "${uw_dest}"
if test ! -d ${uw_hg}; then
mkdir -p ${uw_hg}
fold setenv.sh in setup.sh
File modified: bin/setenv.sh bin/setup.sh conf/bashrc
Change641 at Sat May 07 16:06:41 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 41e17be028dd -r 3d93f5bb92db conf/bashrc
--- a/conf/bashrc Sat May 07 15:41:32 2011 +0200
+++ b/conf/bashrc Sat May 07 16:06:41 2011 +0200
@@ -16,7 +16,7 @@
# setup environment with a script
file=/tmp/setenv.$$
-${HOME}/hg/bin/setenv.sh --interactive > ${file}
+${HOME}/hg/bin/setup.sh --interactive > ${file}
source ${file}
# Copyright (C) 2006-10 Ivan Kanis
add sudo without password
File modified: bin/setenv.sh bin/setup.sh
Change640 at Sat May 07 15:41:32 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 5d94472dc72e -r 41e17be028dd bin/setup.sh
--- a/bin/setup.sh Sat May 07 14:22:34 2011 +0200
+++ b/bin/setup.sh Sat May 07 15:41:32 2011 +0200
@@ -1,5 +1,5 @@
#!/bin/sh
-
+#set -x
cur_dir=`dirname $0`
. ${cur_dir}/function.sh
. ${cur_dir}/setenv.sh > ~/.profile
@@ -13,11 +13,53 @@
make_dir ~/tmp
make_dir ~/local
make_dir ~/src
- build_emacs
- build_elisp
+ build_emacs
make_link
}
+root_setup () {
+ which yum > /dev/null 2>&1
+ if test $? -eq 0
+ then
+ bool_yum=y
+ yum_install
+ fi
+ which apt-get > /dev/null 2>&1
+ if test $? -eq 0
+ then
+ apt_install
+ fi
+ install_sudo
+}
+
+prompt_option () {
+ cat <<EOF
+The log file is ${fn_log}.
+
+Answering y will introduce a huge security hole.
+Don't do this when setting up a server
...
remove tydy, add stumpwm
File modified: bin/setup.sh
Change639 at Sat May 07 14:22:34 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 8c6590020d14 -r 5d94472dc72e bin/setup.sh
--- a/bin/setup.sh Sat May 07 14:12:00 2011 +0200
+++ b/bin/setup.sh Sat May 07 14:22:34 2011 +0200
@@ -247,10 +247,10 @@
rsync \
sbcl \
strace \
+stumpwm \
subversion \
sudo \
texinfo \
-tidy \
ttf-mscorefonts-installer \
unrar \
unzip \
@@ -276,7 +276,7 @@
fi
else
user_setup
-# sudo ${cur_dir}/setup.sh --root
+ sudo ${cur_dir}/setup.sh --root
fi
# vim:et:sw=4:ts=4:
move make link out of main routine, compile elisp
File modified: bin/function.sh bin/setenv.sh bin/setup.sh
Change638 at Sat May 07 14:12:00 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r b58e3c89855a -r 8c6590020d14 bin/setup.sh
--- a/bin/setup.sh Fri May 06 18:52:01 2011 +0200
+++ b/bin/setup.sh Sat May 07 14:12:00 2011 +0200
@@ -2,24 +2,22 @@
cur_dir=`dirname $0`
. ${cur_dir}/function.sh
-. ${cur_dir}/setenv.sh
+. ${cur_dir}/setenv.sh > ~/.profile
user_setup () {
test -d ${PORTABLE_DIR}
fn_check "Failed to find external disk."
+ touch ~/.hushlogin
setup_crypto
vc_config
make_dir ~/tmp
make_dir ~/local
make_dir ~/src
- build_emacs
- make_link ~/hg/conf/bashrc ${HOME}/.bash_profile
- make_link ~/hg/lisp/emacs.d ${HOME}/.emacs.d
- make_link ~/hg/conf/Xresources ${HOME}/.Xresources
- make_link ~/hg/conf/vimrc ${HOME}/.vimrc
- make_link ${KEEL_DIR}/.aspell.en.pws ~/.aspell.en.pws
- make_link ${KEEL}/.aspell.fr.pws ~/.aspell.fr.pws
+ build_emacs
+ build_elisp
+ make_link
}
+
setup_crypto () {
if test ! -d ~/.gnupg ; then
fn_cpr /media/portable/keel/gnupg ~/.gnupg
@@ -69,22 +67,35 @@
}
make_link () {
- source=${1}
- target=${2}
- if test -e ${source} -a -d `dirname ${source}`
...
move language switch from M-k to M-i
- disable C-\ to force me to use M-i
- vc-dir is now bound to M-k e
File modified: lisp/emacs.d/ivan-keymap.el
Change637 at Mon May 09 10:50:19 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 9cd9ee26dce5 -r eaf53f159332 lisp/emacs.d/ivan-keymap.el
--- a/lisp/emacs.d/ivan-keymap.el Mon May 09 10:46:25 2011 +0200
+++ b/lisp/emacs.d/ivan-keymap.el Mon May 09 10:50:19 2011 +0200
@@ -74,10 +74,11 @@
"a" 'ivan-org-agenda
"b" 'ivan-bbdb-map
"c" 'calendar
- "e" 'vc-dir
- "f" 'ivan-fun-full-screen
+ "e" 'ivan-keymap-english-map
+ "f" 'ivan-keymap-french-map
"g" 'ivan-w3m-open-or-search
"i" 'ivan-erc
+ "j" 'ivan-keymap-japanese-map
"k" 'ivan-org-kb
"l" 'recenter-top-bottom
"n" 'ivan-gnus
@@ -94,10 +95,9 @@
"M-r" 'ivan-compile-recompile
"a" 'anything
"c" 'ivan-compile
- "e" 'ivan-keymap-english-map
- "f" 'ivan-keymap-french-map
+ "e" 'vc-dir
+ "f" 'ivan-fun-full-screen
"g" 'ivan-grep
- "j" 'ivan-keymap-japanese-map
"k" 'ivan-fun-portable-dired
"l" 'find-library
"m" 'woman
@@ -135,6 +135,7 @@
"<kp-begin>" next-line
"<kp-insert>" ivan-lookup
"<select>" end-of-buffer
+ "C-\\" nil
"C-l" open-line
"C-o" other-window
"M-#" calc-dispatch
substitue C-c to M-j
File modified: lisp/emacs.d/Makefile lisp/emacs.d/init.el lisp/emacs.d/ivan-auctex.el lisp/emacs.d/ivan-common-code.el lisp/emacs.d/ivan-keymap.el lisp/emacs.d/ivan-nxml.el lisp/emacs.d/ivan-outline.el
Change636 at Mon May 09 10:46:25 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 4b7c4179dae9 -r 9cd9ee26dce5 lisp/emacs.d/ivan-outline.el
--- a/lisp/emacs.d/ivan-outline.el Mon May 09 10:36:29 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-;;; ivan-outline.el --- outline customization
-
-(require 'ivan-keymap)
-(require 'ivan-face)
-
-(eval-when-compile
- (require 'outline))
-
-(ivan-keymap-prefix
- outline-mode-prefix-map
- "<" 'outline-promote
- ">" 'outline-demote
- "@" 'outline-mark-subtree
- "RET" 'outline-insert-heading
- "^" 'outline-move-subtree-up
- "a" 'show-all
- "b" 'outline-backward-same-level
- "c" 'hide-entry
- "d" 'hide-subtree
- "e" 'show-entry
- "f" 'outline-forward-same-level
- "i" 'show-children
- "k" 'show-branches
- "l" 'hide-leaves
- "n" 'outline-next-visible-heading
- "o" 'hide-other
- "p" 'outline-previous-visible-heading
- "q" 'hide-sublevels
- "s" 'show-subtree
- "t" 'hide-body
- "u" 'outline-up-heading
- "v" 'outline-move-subtree-down)
-
-(setq outline-minor-mode-prefix (kbd "C-c o"))
-
-(ivan-face-gradient "outline-" 5 "yellow" "purple")
-
...
rename *garak* to *elim-repl*
File modified: lisp/elim/elisp/garak.el
Change635 at Mon May 09 10:36:29 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 8a2d6e47bde5 -r 4b7c4179dae9 lisp/elim/elisp/garak.el
--- a/lisp/elim/elisp/garak.el Sun May 08 15:56:32 2011 +0200
+++ b/lisp/elim/elisp/garak.el Mon May 09 10:36:29 2011 +0200
@@ -2893,10 +2893,10 @@
(defun garak ()
(interactive)
(let ((display-buffer-reuse-frames t)
- (buffer (get-buffer "*garak*")) proc point)
+ (buffer (get-buffer "*elim-repl*")) proc point)
(if (garak-buffer-reusable nil buffer)
(switch-to-buffer buffer)
- (switch-to-buffer (setq buffer (generate-new-buffer "*garak*")))
+ (switch-to-buffer (setq buffer (generate-new-buffer "*elim-repl*")))
(setq point (point))
(garak-load-logo)
(when (and garak-display-splash garak-logo)
add find texinfo doc
File modified: info/find.texi info/getdate.texi info/perm.texi info/regexprops.texi
Change634 at Sun May 08 15:56:32 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 80a529942985 -r 8a2d6e47bde5 info/regexprops.texi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/info/regexprops.texi Sun May 08 15:56:32 2011 +0200
@@ -0,0 +1,646 @@
+@c Copyright (C) 1994, 1996, 1998, 2000, 2001, 2003, 2004, 2005, 2006, 2007
+@c Free Software Foundation, Inc.
+@c
+@c Permission is granted to copy, distribute and/or modify this document
+@c under the terms of the GNU Free Documentation License, Version 1.2 or
+@c any later version published by the Free Software Foundation; with no
+@c Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+@c Texts. A copy of the license is included in the ``GNU Free
+@c Documentation License'' file as part of this distribution.
+
+@c this regular expression description is for: findutils
+
+@menu
+* findutils-default regular expression syntax::
+* awk regular expression syntax::
+* egrep regular expression syntax::
+* emacs regular expression syntax::
+* gnu-awk regular expression syntax::
+* grep regular expression syntax::
+* posix-awk regular expression syntax::
+* posix-basic regular expression syntax::
+* posix-egrep regular expression syntax::
+* posix-extended regular expression syntax::
+@end menu
+
+@node findutils-default regular expression syntax
+@subsection @samp{findutils-default} regular expression syntax
+
+
+The character @samp{.} matches any single character.
+
+
+@table @samp
+
+@item +
+indicates that the regular expression should match one or more occurrences of the previous atom or regexp.
+@item ?
...
add tea time for emacs
File modified: lisp/misc/Makefile lisp/misc/tea-time.el
Change633 at Sun May 08 12:15:33 2011 +0200 by Ivan Kanis <ivan@tao>
diff -r b58e3c89855a -r 80a529942985 lisp/misc/tea-time.el
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/misc/tea-time.el Sun May 08 12:15:33 2011 +0200
@@ -0,0 +1,136 @@
+;;; tea-time.el --- Simple timer package.
+
+;; Author: konsty <antipin.konstantin@googlemail.com>
+;; Keywords: timer tea-time
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING. If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; This package allows you to set up time intervals and after this
+;; inteval is elapsed Emacs will notify you with sound and notification.
+;; It could be useful if you like make a tea or if you would like to
+;; be more productive by setting time limit for a task.
+;;
+;; If available, notification would be done with great tool
+;; mumbles ( http://www.mumbles-project.org )
+;; If not, then simply use standard emacs message.
+
+;;; Requirements:
+
+;; tested on Emacs 23
+
+;;; Installation:
+
...
merge
File modified:
Change632 at Fri May 06 18:52:01 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 3a22b8ddf20f -r b58e3c89855a lisp/emacs.d/ivan-muse.el
--- a/lisp/emacs.d/ivan-muse.el Fri May 06 18:51:20 2011 +0200
+++ b/lisp/emacs.d/ivan-muse.el Fri May 06 18:52:01 2011 +0200
@@ -31,7 +31,7 @@
(defun ivan-muse-hook ()
(ivan-keymap-keep-global muse-mode-map)
(ivan-keymap-define muse-mode-map
- "C-c C-p" ivan-muse-publish)
+ "M-j p" ivan-muse-publish)
(auto-fill-mode)
(if (member (file-name-nondirectory buffer-file-name)
'("blog-fr.muse"
finish build emacs code
File modified: bin/setenv.sh bin/setup.sh
Change631 at Fri May 06 18:51:20 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r e3eebb4ac588 -r 3a22b8ddf20f bin/setup.sh
--- a/bin/setup.sh Fri May 06 17:34:07 2011 +0200
+++ b/bin/setup.sh Fri May 06 18:51:20 2011 +0200
@@ -2,29 +2,43 @@
cur_dir=`dirname $0`
. ${cur_dir}/function.sh
+. ${cur_dir}/setenv.sh
user_setup () {
+ test -d ${PORTABLE_DIR}
+ fn_check "Failed to find external disk."
+ setup_crypto
vc_config
- make_dir ${HOME}/tmp
- make_dir ${HOME}/local
- make_dir ${HOME}/src
+ make_dir ~/tmp
+ make_dir ~/local
+ make_dir ~/src
build_emacs
- make_link ${HOME}/hg/conf/bashrc ${HOME}/.bash_profile
- make_link ${HOME}/hg/lisp/emacs.d ${HOME}/.emacs.d
- make_link ${HOME}/hg/conf/Xresources ${HOME}/.Xresources
- make_link ${HOME}/hg/conf/vimrc ${HOME}/.vimrc
- make_link ${KEEL_DIR}/.aspell.en.pws ${HOME}/.aspell.en.pws
- make_link ${KEEL}/.aspell.fr.pws ${HOME}/.aspell.fr.pws
+ make_link ~/hg/conf/bashrc ${HOME}/.bash_profile
+ make_link ~/hg/lisp/emacs.d ${HOME}/.emacs.d
+ make_link ~/hg/conf/Xresources ${HOME}/.Xresources
+ make_link ~/hg/conf/vimrc ${HOME}/.vimrc
+ make_link ${KEEL_DIR}/.aspell.en.pws ~/.aspell.en.pws
+ make_link ${KEEL}/.aspell.fr.pws ~/.aspell.fr.pws
+}
+setup_crypto () {
+ if test ! -d ~/.gnupg ; then
+ fn_cpr /media/portable/keel/gnupg ~/.gnupg
+ fi
+ if test ! -d ~/.ssh ; then
+ fn_cpr /media/portable/keel/ssh ~/.ssh
+ chmod 700 ~/.ssh
...
move user_setup to the top as it's the main function
- add version control configuration function
- start a stub to build emacs
File modified: bin/setup.sh
Change630 at Fri May 06 17:34:07 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 2d8a477fa960 -r e3eebb4ac588 bin/setup.sh
--- a/bin/setup.sh Fri May 06 17:29:17 2011 +0200
+++ b/bin/setup.sh Fri May 06 17:34:07 2011 +0200
@@ -1,6 +1,39 @@
#!/bin/sh
-set -x
+
cur_dir=`dirname $0`
+. ${cur_dir}/function.sh
+
+user_setup () {
+ vc_config
+ make_dir ${HOME}/tmp
+ make_dir ${HOME}/local
+ make_dir ${HOME}/src
+ build_emacs
+ make_link ${HOME}/hg/conf/bashrc ${HOME}/.bash_profile
+ make_link ${HOME}/hg/lisp/emacs.d ${HOME}/.emacs.d
+ make_link ${HOME}/hg/conf/Xresources ${HOME}/.Xresources
+ make_link ${HOME}/hg/conf/vimrc ${HOME}/.vimrc
+ make_link ${KEEL_DIR}/.aspell.en.pws ${HOME}/.aspell.en.pws
+ make_link ${KEEL}/.aspell.fr.pws ${HOME}/.aspell.fr.pws
+}
+
+vc_config () {
+ us_hostname=`hostname -s`
+ cat <<EOF > ${HOME}/.hgrc
+[ui]
+username = Ivan Kanis <ivan@${us_hostname}>
+
+EOF
+ cat <<EOF > ${HOME}/.gitconfig
+[user]
+ name = Ivan Kanis
+ email = ivan@${us_hostname}
+
+[core]
+ autocrlf = false
+
+EOF
+}
...
harmoniz functions
File modified: bin/function.sh
Change629 at Fri May 06 17:29:17 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 6db0d40d91ae -r 2d8a477fa960 bin/function.sh
--- a/bin/function.sh Fri May 06 17:19:42 2011 +0200
+++ b/bin/function.sh Fri May 06 17:29:17 2011 +0200
@@ -1,4 +1,5 @@
# common functions
+fn_log=${HOME}/`basename ${0}`.log
fn_rsync () {
fr_src="${1}"
@@ -24,13 +25,6 @@
fn_check "Failed to rsync from ${frn_src} to ${frn_dest}"
}
-fn_check () {
- if test $? -ne 0 ; then
- printf "${1}.\n"
- exit 1
- fi
-}
-
fn_sync_keel () {
fsk_direction=$1
@@ -148,7 +142,7 @@
fn_tee_hook
fi
- cat tee.log >> "${build_log}"
+ cat tee.log >> "${fn_log}"
fn_check "Failed copying ${ft_name} log"
# sometime tee.log is not relased so try for ten seconds
@@ -259,7 +253,7 @@
if test "X${fc_err_ret}" != "X0"
then
fn_print "${fc_err_msg}"
- date >> "${build_log}"
+ date >> "${fn_log}"
if test "X${error_warning}" = "Xyes"
then
return
...
add functions
File modified: bin/function.sh
Change628 at Fri May 06 17:19:42 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 81fb05d4399d -r 6db0d40d91ae bin/function.sh
--- a/bin/function.sh Fri May 06 16:59:31 2011 +0200
+++ b/bin/function.sh Fri May 06 17:19:42 2011 +0200
@@ -52,4 +52,446 @@
fi
}
+# 1 = directory to change to
+fn_cd () {
+ cd "${1}"
+ fn_check "Could not go in directory ${1}"
+}
+
+fn_ln () {
+ if test -e "${2}"
+ then
+ rm "${2}"
+ fn_check "Failed to remove target ${2}"
+ fi
+ ln -s "${1}" "${2}"
+ fn_check "Failed to link ${1} to ${2}"
+}
+
+# 1 = script
+# 2 = file
+# run sed trying to be plaftrom agnostic
+# issue a warning if file has not been modified
+fn_sed ()
+{
+ script="${1}"
+ file="${2}"
+
+ test -f "${file}"
+ fn_check "File ${file} does not exist"
+
+ sed -i.bak -e "${script}" "${file}"
+
+ cmp -s "${file}" "${file}.bak"
+ if test "X${?}" = "X0"
+ then
+ fn_print "Warning sed did not modify file ${file}"
...
don't set soft tab for vim
File modified: conf/vimrc
Change627 at Fri May 06 16:59:31 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 41581ce7e2e5 -r 81fb05d4399d conf/vimrc
--- a/conf/vimrc Fri May 06 11:12:27 2011 +0200
+++ b/conf/vimrc Fri May 06 16:59:31 2011 +0200
@@ -1,3 +1,2 @@
syntax off
set modeline
-set ts=4
fix == in shell script
File modified: bin/setup.sh
Change626 at Fri May 06 11:12:27 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 9a5fc024d43a -r 41581ce7e2e5 bin/setup.sh
--- a/bin/setup.sh Thu May 05 18:49:39 2011 +0200
+++ b/bin/setup.sh Fri May 06 11:12:27 2011 +0200
@@ -1,5 +1,5 @@
#!/bin/sh
-
+set -x
cur_dir=`dirname $0`
check () {
@@ -162,18 +162,19 @@
xterm
}
-if test `id -u` -eq 0
+if test x${1} = x--root
then
which yum > /dev/null 2>&1
- if test X$? == X0
+ if test $? -eq 0
then
yum_install
fi
which apt-get > /dev/null 2>&1
- if test X$? == X0
+ if test $? -eq 0
then
apt_install
fi
else
user_setup
+ sudo ${cur_dir}/setup.sh --root
fi
fix stupid bug
File modified: bin/setup.sh
Change625 at Thu May 05 18:49:39 2011 +0200 by Ivan Kanis <ivan@tny>
diff -r 659d75d81026 -r 9a5fc024d43a bin/setup.sh
--- a/bin/setup.sh Thu May 05 18:48:14 2011 +0200
+++ b/bin/setup.sh Thu May 05 18:49:39 2011 +0200
@@ -53,7 +53,7 @@
us_hostname=`hostname -s`
cat <<EOF > ${HOME}/.hgrc
[ui]
-username = Ivan Kanis <ivan@${hostname}>
+username = Ivan Kanis <ivan@${us_hostname}>
EOF
}
fix bugs introduced by keel
File modified: bin/setup.sh
Change624 at Thu May 05 18:48:14 2011 +0200 by Ivan Kanis <ivan@>
diff -r 73bf98be0230 -r 659d75d81026 bin/setup.sh
--- a/bin/setup.sh Thu May 05 10:57:41 2011 +0200
+++ b/bin/setup.sh Thu May 05 18:48:14 2011 +0200
@@ -2,8 +2,6 @@
cur_dir=`dirname $0`
-. ${cur_dir}/keel.sh
-
check () {
error=${?}
msg=${1}
@@ -43,7 +41,7 @@
fi
}
-function user_setup () {
+user_setup () {
make_dir ${HOME}/tmp
make_dir ${HOME}/local
make_link ${HOME}/hg/conf/bashrc ${HOME}/.bash_profile
@@ -52,9 +50,15 @@
make_link ${HOME}/hg/conf/vimrc ${HOME}/.vimrc
make_link ${KEEL_DIR}/.aspell.en.pws ${HOME}/.aspell.en.pws
make_link ${KEEL}/.aspell.fr.pws ${HOME}/.aspell.fr.pws
+ us_hostname=`hostname -s`
+ cat <<EOF > ${HOME}/.hgrc
+[ui]
+username = Ivan Kanis <ivan@${hostname}>
+
+EOF
}
-function yum_install () {
+yum_install () {
yum install \
apr-devel \
apr-util-devel \
@@ -88,7 +92,7 @@
zlib-devel
}
...
Set muse publishing to M-j p
File modified: lisp/emacs.d/ivan-muse.el
Change623 at Thu May 05 22:20:42 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 73bf98be0230 -r 94b1ff19820a lisp/emacs.d/ivan-muse.el
--- a/lisp/emacs.d/ivan-muse.el Thu May 05 10:57:41 2011 +0200
+++ b/lisp/emacs.d/ivan-muse.el Thu May 05 22:20:42 2011 +0200
@@ -31,7 +31,7 @@
(defun ivan-muse-hook ()
(ivan-keymap-keep-global muse-mode-map)
(ivan-keymap-define muse-mode-map
- "C-c C-p" ivan-muse-publish)
+ "M-j p" ivan-muse-publish)
(auto-fill-mode)
(if (member (file-name-nondirectory buffer-file-name)
'("blog-fr.muse"
raise emacs frame on incoming im in elim
File modified: lisp/emacs.d/ivan-elim.el
Change622 at Thu May 05 10:57:41 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 3e4737150a81 -r 73bf98be0230 lisp/emacs.d/ivan-elim.el
--- a/lisp/emacs.d/ivan-elim.el Thu May 05 10:52:12 2011 +0200
+++ b/lisp/emacs.d/ivan-elim.el Thu May 05 10:57:41 2011 +0200
@@ -24,7 +24,8 @@
(defun ivan-elim-pop-buffer ()
"Pop buffer on incoming messages."
- (pop-to-buffer buffer))
+ (pop-to-buffer buffer)
+ (raise-frame (selected-frame)))
(add-hook 'garak-alert-user-hook 'ivan-elim-pop-buffer)
add eldoc to elisp buffers
File modified: lisp/emacs.d/ivan-lisp.el
Change621 at Thu May 05 10:52:12 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r a7bd11e6b3e0 -r 3e4737150a81 lisp/emacs.d/ivan-lisp.el
--- a/lisp/emacs.d/ivan-lisp.el Tue May 03 11:10:09 2011 +0200
+++ b/lisp/emacs.d/ivan-lisp.el Thu May 05 10:52:12 2011 +0200
@@ -4,6 +4,7 @@
(require 'ivan-common-code)
(require 'ivan-keymap)
(require 'ivan-load)
+ (require 'eldoc)
(require 'ring))
(defvar ivan-lisp-mark-ring (make-ring 16)
@@ -13,6 +14,7 @@
(ivan-keymap-keep-global emacs-lisp-mode-map)
(ivan-common-code-key-binding emacs-lisp-mode-map)
(ivan-lisp-emacs-key-binding emacs-lisp-mode-map)
+ (eldoc-mode 1)
(unless (string= "*scratch*" (buffer-name))
(outline-minor-mode))
(ivan-common-code))
use stumpwm in fullscreen mode
File modified: conf/stumpwmrc
Change620 at Tue May 03 11:10:09 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 3bf8c19eab0a -r a7bd11e6b3e0 conf/stumpwmrc
--- a/conf/stumpwmrc Tue May 03 11:08:03 2011 +0200
+++ b/conf/stumpwmrc Tue May 03 11:10:09 2011 +0200
@@ -5,5 +5,3 @@
;; change the prefix key to something else
(set-prefix-key (kbd "C-j"))
(define-key *root-map* (kbd "l") "windowlist")
-
-(split-frame-in-dir (current-group) :column 990)
start skype on yan
File modified: bin/bgn.sh
Change619 at Tue May 03 11:08:03 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 6625b9dd5a93 -r 3bf8c19eab0a bin/bgn.sh
--- a/bin/bgn.sh Tue May 03 10:16:51 2011 +0200
+++ b/bin/bgn.sh Tue May 03 11:08:03 2011 +0200
@@ -96,6 +96,7 @@
yan () {
killall compiz &
${HOME}/src/stumpwm/stumpwm &
+ skype &
exec screen ${0} --rsync
}
b pages up in vimperator
File modified: conf/vimperatorrc
Change618 at Tue May 03 10:16:51 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 91b428daf23c -r 6625b9dd5a93 conf/vimperatorrc
--- a/conf/vimperatorrc Tue May 03 08:47:53 2011 +0200
+++ b/conf/vimperatorrc Tue May 03 10:16:51 2011 +0200
@@ -1,3 +1,3 @@
map <BS> <PageUp>
-map v <PageUp>
+map b <PageUp>
:set guioptions=mrBT
vimperator config
File modified: conf/vimperatorrc
Change617 at Tue May 03 08:47:53 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 72bf3c054448 -r 91b428daf23c conf/vimperatorrc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/vimperatorrc Tue May 03 08:47:53 2011 +0200
@@ -0,0 +1,3 @@
+map <BS> <PageUp>
+map v <PageUp>
+:set guioptions=mrBT
fix screen on tao
File modified: bin/bgn.sh
Change616 at Tue May 03 07:28:40 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 447e802158b3 -r 72bf3c054448 bin/bgn.sh
--- a/bin/bgn.sh Mon May 02 20:30:26 2011 +0200
+++ b/bin/bgn.sh Tue May 03 07:28:40 2011 +0200
@@ -90,6 +90,7 @@
fn_rsync ~/lucia ${PORTABLE_DIR}/backup
fn_rsync ${PORTABLE_DIR}/listen ~/backup --delete
fn_rsync ${KEEL_DIR} ~/backup
+ ${SHELL}
}
yan () {
add screen on tao
File modified: bin/bgn.sh
Change615 at Mon May 02 20:30:26 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r d9f59676cb87 -r 447e802158b3 bin/bgn.sh
--- a/bin/bgn.sh Mon May 02 20:10:01 2011 +0200
+++ b/bin/bgn.sh Mon May 02 20:30:26 2011 +0200
@@ -83,6 +83,10 @@
tao () {
update_web
backup_kanis_fr
+ exec screen ${0} --rsync
+}
+
+tao_rsync () {
fn_rsync ~/lucia ${PORTABLE_DIR}/backup
fn_rsync ${PORTABLE_DIR}/listen ~/backup --delete
fn_rsync ${KEEL_DIR} ~/backup
merge
File modified:
Change614 at Mon May 02 20:10:01 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r eafb66a52bf8 -r d9f59676cb87 bin/bgn.sh
--- a/bin/bgn.sh Sun May 01 19:15:15 2011 +0200
+++ b/bin/bgn.sh Mon May 02 20:10:01 2011 +0200
@@ -91,12 +91,17 @@
yan () {
killall compiz &
${HOME}/src/stumpwm/stumpwm &
+ exec screen ${0} --rsync
+}
+
+yan_rsync () {
fn_rsync ${PORTABLE_DIR}/backup/lucia ~/backup
fn_rsync ${KEEL_DIR} ~/backup
fn_rsync ~/bob ${PORTABLE_DIR}/backup/yan
fn_rsync bld:~/keep ${PORTABLE_DIR}/backup/bld --delete
fn_rsync bldmac:~/keep ${PORTABLE_DIR}/backup/bldmac --delete
fn_rsync zen:~/keep ${PORTABLE_DIR}/backup/zen --delete
+ ${SHELL}
}
cad () {
@@ -119,6 +124,13 @@
fi
}
+# rsync can take a long time so launch it within screen
+host_rsync () {
+ if function_exists "${host_name}_rsync" ; then
+ ${host_name}_rsync
+ fi
+}
+
mount_keel () {
if test ! -d "${KEEL_DIR}" ; then
sudo mount "${PORTABLE_DIR}"
@@ -131,18 +143,22 @@
xset b off
}
-set_alsa_mixer
-set_xmodmap
...
run screen on yan since rsync takes so long
File modified: bin/bgn.sh
Change613 at Mon May 02 10:41:37 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 57030dcf34a2 -r c9651c6f0f1d bin/bgn.sh
--- a/bin/bgn.sh Fri Apr 29 16:43:06 2011 +0200
+++ b/bin/bgn.sh Mon May 02 10:41:37 2011 +0200
@@ -91,12 +91,17 @@
yan () {
killall compiz &
${HOME}/src/stumpwm/stumpwm &
+ exec screen ${0} --rsync
+}
+
+yan_rsync () {
fn_rsync ${PORTABLE_DIR}/backup/lucia ~/backup
fn_rsync ${KEEL_DIR} ~/backup
fn_rsync ~/bob ${PORTABLE_DIR}/backup/yan
fn_rsync bld:~/keep ${PORTABLE_DIR}/backup/bld --delete
fn_rsync bldmac:~/keep ${PORTABLE_DIR}/backup/bldmac --delete
fn_rsync zen:~/keep ${PORTABLE_DIR}/backup/zen --delete
+ ${SHELL}
}
cad () {
@@ -119,6 +124,13 @@
fi
}
+# rsync can take a long time so launch it within screen
+host_rsync () {
+ if function_exists "${host_name}_rsync" ; then
+ ${host_name}_rsync
+ fi
+}
+
mount_keel () {
if test ! -d "${KEEL_DIR}" ; then
sudo mount "${PORTABLE_DIR}"
@@ -131,18 +143,22 @@
xset b off
}
-set_alsa_mixer
-set_xmodmap
...
fix up some binding in slime
M-j M-j eval last expression
M-j d shortcut for documentation
File modified: lisp/emacs.d/ivan-slime.el
Change612 at Sun May 01 19:15:15 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r e566a9e47f57 -r eafb66a52bf8 lisp/emacs.d/ivan-slime.el
--- a/lisp/emacs.d/ivan-slime.el Sun May 01 17:58:27 2011 +0200
+++ b/lisp/emacs.d/ivan-slime.el Sun May 01 19:15:15 2011 +0200
@@ -22,9 +22,10 @@
(defun ivan-slime-mode-hook ()
(ivan-keymap-define slime-mode-map
+ "M-j d" slime-doc-map
"M-j i" slime-inspect
- "M-j j" slime-compile-defun
- "M-j M-j" slime-compile-defun)
+ "M-j j" slime-eval-last-expression
+ "M-j M-j" slime-eval-last-expression)
(show-paren-mode 1))
(add-hook 'slime-mode-hook 'ivan-slime-mode-hook)
fix swmbo environment
File modified: bin/setenv.sh
Change611 at Sun May 01 17:58:27 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 60b1094d5a53 -r e566a9e47f57 bin/setenv.sh
--- a/bin/setenv.sh Sun May 01 17:57:56 2011 +0200
+++ b/bin/setenv.sh Sun May 01 17:58:27 2011 +0200
@@ -202,7 +202,6 @@
bash_setup
vi_setup
solaris
- portable_dir
print_misc
}
@@ -233,12 +232,12 @@
# main
if test "x$1" = x--interactive ; then
- path
interactive
else
- printf "# This file is generated by ~/hg/bin/setenv.sh\n"
- path
+ printf "# This file is generated by ${0}\n"
fi
+path
+portable_dir
# Local Variables:
# compile-command: "sh setenv.sh"
use acrobat reader as it gives better rendering than xpdf
File modified: conf/mailcap
Change610 at Sun May 01 17:57:56 2011 +0200 by Ivan Kanis <ivan@foo>
diff -r 57030dcf34a2 -r 60b1094d5a53 conf/mailcap
--- a/conf/mailcap Fri Apr 29 16:43:06 2011 +0200
+++ b/conf/mailcap Sun May 01 17:57:56 2011 +0200
@@ -40,4 +40,5 @@
image/x-xwindowdump; eog '%s'; test=test -n "$DISPLAY"
image/x-icon; eog '%s'; test=test -n "$DISPLAY"
image/yuv; eog '%s'; test=test -n "$DISPLAY"
-
+application/pdf; acroread '%s'; test=test "$DISPLAY" != ""; description=Portable Document Format; nametemplate=%s.pdf
+application/x-pdf; acroread '%s'; test=test "$DISPLAY" != ""; description=Portable Document Format; nametemplate=%s.pdf
finish stopwatch human representation of time
File modified: lisp/ivan/stopwatch.el
Change609 at Fri Apr 29 16:43:06 2011 +0200 by Ivan Kanis <ivan@mac.foo>
diff -r 4b14f7560ca7 -r 57030dcf34a2 lisp/ivan/stopwatch.el
--- a/lisp/ivan/stopwatch.el Fri Apr 29 10:41:57 2011 +0200
+++ b/lisp/ivan/stopwatch.el Fri Apr 29 16:43:06 2011 +0200
@@ -29,14 +29,20 @@
map))
;; internal variables
-(defvar stopwatch-start)
+(defvar stopwatch-start nil)
+(defvar stopwatch-timer nil)
(defun stopwatch ()
(interactive)
(with-current-buffer (get-buffer-create stopwatch-buffer-name)
- (erase-buffer))
+ (erase-buffer)
+ (setq buffer-read-only t
+ buffer-undo-list t))
(pop-to-buffer stopwatch-buffer-name)
(fit-window-to-buffer)
+ (when (not stopwatch-timer)
+ (setq stopwatch-timer
+ (run-at-time t stopwatch-update-interval 'stopwatch-display)))
(stopwatch-mode))
(defun stopwatch-mode ()
@@ -50,32 +56,53 @@
(interactive)
(let ((window (get-buffer-window stopwatch-buffer-name)))
(kill-buffer stopwatch-buffer-name)
+ (when stopwatch-timer
+ (cancel-timer stopwatch-timer))
(when (and window (not (one-window-p window)))
(delete-window window))))
(defun stopwatch-toggle ()
(interactive)
- (if stopwatch-start
- (let ((delta (time-subtract (current-time) stopwatch-start)))
- (insert (pp delta))
- (setq stopwatch-start nil))
...
don't use flyspell on erc server buffer
File modified: lisp/emacs.d/ivan-erc.el
Change608 at Fri Apr 29 10:41:57 2011 +0200 by Ivan Kanis <ivan@mac.foo>
diff -r b6c932223757 -r 4b14f7560ca7 lisp/emacs.d/ivan-erc.el
--- a/lisp/emacs.d/ivan-erc.el Thu Apr 28 19:51:41 2011 +0200
+++ b/lisp/emacs.d/ivan-erc.el Fri Apr 29 10:41:57 2011 +0200
@@ -23,8 +23,9 @@
(english . "#emacs\\|#arpnetworks"))
"Alist of language associated with channel regex")
-(defvar ivan-erc-flyspell-off '("#japanese" "#arpnetworks")
- "List of channels that do not need flyspell")
+(defvar ivan-erc-flyspell-off
+ "japanese\\|arpnetworks\\|freenode\\|2ch"
+ "Regex of buffers that do not need flyspell")
(defun ivan-erc ()
"IRC entry point"
@@ -35,7 +36,7 @@
(defun erc-spelling-init (buffer)
"Enable flyspell mode except for `ivan-erc-flyspell-off'"
(with-current-buffer buffer
- (when (not (member (buffer-name) ivan-erc-flyspell-off))
+ (when (not (string-match ivan-erc-flyspell-off (buffer-name)))
(setq flyspell-generic-check-word-p 'erc-spelling-flyspell-verify)
(flyspell-mode 1))))
don't load flyspell for given IRC channels
File modified: lisp/emacs.d/ivan-erc.el
Change607 at Thu Apr 28 19:51:41 2011 +0200 by Ivan Kanis <ivan@mac.foo>
diff -r 11c69ee0c710 -r b6c932223757 lisp/emacs.d/ivan-erc.el
--- a/lisp/emacs.d/ivan-erc.el Thu Apr 28 19:48:00 2011 +0200
+++ b/lisp/emacs.d/ivan-erc.el Thu Apr 28 19:51:41 2011 +0200
@@ -18,15 +18,27 @@
(defun ivan-private-erc()))
(defvar ivan-erc-channel-language
- '((japanese . "#japanese\\|#nihongo")
- (french . "#org-fr")
+ '((japanese . "#japanese")
+ (french . "#org-mode-fr")
(english . "#emacs\\|#arpnetworks"))
"Alist of language associated with channel regex")
+(defvar ivan-erc-flyspell-off '("#japanese" "#arpnetworks")
+ "List of channels that do not need flyspell")
+
(defun ivan-erc ()
"IRC entry point"
(interactive)
+ (require 'erc-spelling)
+ ;; override the function from 'erc-spelling
+ (defun erc-spelling-init (buffer)
+ "Enable flyspell mode except for `ivan-erc-flyspell-off'"
+ (with-current-buffer buffer
+ (when (not (member (buffer-name) ivan-erc-flyspell-off))
+ (setq flyspell-generic-check-word-p 'erc-spelling-flyspell-verify)
+ (flyspell-mode 1))))
+
(if (get-buffer "#emacs")
(switch-to-buffer "#emacs")
(ivan-private-erc)
@@ -59,7 +71,6 @@
(goto-char (point-max))
(forward-char -1)
(insert (concat "\n" (ivan-japanese-kakasi string))))))
-;; (erc-restore-text-properties))))
(add-hook 'erc-insert-modify-hook 'ivan-erc-furigana)
...
add more stop watch code, not yet useful
File modified: lisp/ivan/stopwatch.el
Change606 at Thu Apr 28 19:48:00 2011 +0200 by Ivan Kanis <ivan@mac.foo>
diff -r a872c111d146 -r 11c69ee0c710 lisp/ivan/stopwatch.el
--- a/lisp/ivan/stopwatch.el Thu Apr 28 19:47:21 2011 +0200
+++ b/lisp/ivan/stopwatch.el Thu Apr 28 19:48:00 2011 +0200
@@ -16,17 +16,66 @@
(defvar stopwatch-update-interval 60
"Time in seconds of the stop watch update.")
+(defvar stopwatch-mode-map
+ (let ((map (make-sparse-keymap)))
+ (define-key map "q" 'kill-this-buffer)
+ map)
+ "Keymap of the stop watch mode")
+
+(setq stopwatch-mode-map
+ (let ((map (make-sparse-keymap)))
+ (define-key map " " 'stopwatch-toggle)
+ (define-key map "q" 'stopwatch-exit)
+ map))
+
;; internal variables
(defvar stopwatch-start)
(defun stopwatch ()
(interactive)
- (setq stopwatch-start (current-ti