Mercurial > emacs
view etc/emacs.bash @ 65856:d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-merge.el (ediff-merge-region-is-non-clash): new defsubst.
(ediff-merge-region-is-non-clash-to-skip): previouslu called
ediff-merge-region-is-non-clash.
* ediff-mult.el (ediff-append-custom-diff,ediff-meta-show-patch): use
insert-buffer-substring.
* ediff-ptch.el (ediff-fixup-patch-map): use better heuristics for
selecting files to patch. Also bug fixes.
* ediff-util.el (ediff-setup): bug fix.
(ediff-next-difference): Never skip clashes that differ in white space
only.
* ediff-wind.el (ediff-setup-control-frame,ediff-destroy-control-frame):
check the menubar feature.
* viper-cmd.el (viper-normalize-minor-mode-map-alist,
viper-refresh-mode-line): use make-local-variable to localize some vars
instead of make-variable-buffer-local. Suggested by Stefan Monnier.
* viper-init.el (viper-make-variable-buffer-local): delete alias.
(viper-restore-cursor-type,viper-set-insert-cursor-type): use
make-local-variable instead of make-variable-buffer-local. Suggested by
Stefan Monnier.
* viper.el (viper-mode): don't use viper-make-variable-buffer-local.
(viper-comint-mode-hook): use make-local-variable on
require-final-newline.
(viper-non-hook-settings): don't use make-variable-buffer-local.
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Thu, 06 Oct 2005 00:09:49 +0000 |
parents | 615a90f44f52 |
children | 873c558e1383 72cf6261961e |
line wrap: on
line source
# This defines a bash command named `edit' which contacts/resumes an # existing emacs or starts a new one if none exists. # # One way or another, any arguments are passed to emacs to specify files # (provided you have loaded `resume.el'). # # This function assumes the emacs program is named `emacs' and is somewhere # in your load path. If either of these is not true, the most portable # (and convenient) thing to do is to make an alias called emacs which # refers to the real program, e.g. # # alias emacs=/usr/local/bin/gemacs # # Written by Noah Friedman. function edit () { local windowsys="${WINDOW_PARENT+sun}" windowsys="${windowsys:-${DISPLAY+x}}" if [ -n "${windowsys:+set}" ]; then # Do not just test if these files are sockets. On some systems # ordinary files or fifos are used instead. Just see if they exist. if [ -e "${HOME}/.emacs_server" -o -e "/tmp/emacs${UID}/server" ]; then emacsclient "$@" return $? else echo "edit: starting emacs in background..." 1>&2 fi case "${windowsys}" in x ) (emacs "$@" &) ;; sun ) (emacstool "$@" &) ;; esac else if jobs %emacs 2> /dev/null ; then echo "$(pwd)" "$@" >| ${HOME}/.emacs_args && fg %emacs else emacs "$@" fi fi } # arch-tag: 1e1b74b9-bf2c-4b23-870f-9eebff7515cb