Mercurial > emacs
annotate .gitignore @ 104277:affb617d6101
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-cmd.el (viper-insert-isearch-string): new function.
(viper-if-string): redefine C-s in the minibuffer to insert the last
incremental search string.
* ediff-init.el (ediff-coding-system): use escape-quoted in case of
XEmacs.
* ediff-merg.el (ediff-merge-region-is-non-clash-to-skip,
ediff-merge-region-is-non-clash,
ediff-skip-merge-region-if-changed-from-default-p): use defun.
Also check if the job is really a merge job.
* ediff.el (ediff-current-file): new function.
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Sat, 15 Aug 2009 05:57:08 +0000 |
parents | 762408a9ef5d |
children | 9a2d92bd2a3e |
rev | line source |
---|---|
102379 | 1 autom4te.cache |
102380
762408a9ef5d
Add .gitignore rules for in-place builds.
Juanma Barranquero <lekktu@gmail.com>
parents:
102379
diff
changeset
|
2 makefile |
762408a9ef5d
Add .gitignore rules for in-place builds.
Juanma Barranquero <lekktu@gmail.com>
parents:
102379
diff
changeset
|
3 |
762408a9ef5d
Add .gitignore rules for in-place builds.
Juanma Barranquero <lekktu@gmail.com>
parents:
102379
diff
changeset
|
4 /bin/ |
762408a9ef5d
Add .gitignore rules for in-place builds.
Juanma Barranquero <lekktu@gmail.com>
parents:
102379
diff
changeset
|
5 /site-lisp/ |
102379 | 6 |
7 # arch-tag: 75cd3c50-1875-4814-8360-190f7de38302 |