view admin/notes/BRANCH @ 72516:aba79a1f03ed

2006-08-25 Michael Kifer <[e-mail]> * viper.el (viper-set-hooks): use frame bindings for viper-vi-state-cursor-color. (viper-non-hook-settings): don't set default mode-line-buffer-identification. * viper-util.el (viper-set-cursor-color-according-to-state): new function. (viper-set-cursor-color-according-to-state, viper-get-saved-cursor-color-in-replace-mode, viper-get-saved-cursor-color-in-insert-mode): make conditional on viper-emacs-state-cursor-color. * viper-cmd.el (viper-envelop-ESC-key): bug fix. (viper-undo): use point if undo-beg-posn is nil. (viper-insert-state-post-command-sentinel,viper-change-state-to-emacs, viper-after-change-undo-hook): don't use viper-emacs-state-cursor-color by default. (viper-undo): more sensible positioning after undo. * viper-ex.el (ex-splice-args-in-1-letr-cmd): got rid of caddr. (viper-emacs-state-cursor-color): default to nil, since this feature doesn't work well yet. * ediff-mult.el (ediff-intersect-directories, ediff-get-directory-files-under-revision, ediff-dir-diff-copy-file): always expand filenames.

This file describes the CVS branch in which it is maintained.
Everything below the line is branch-specific.
________________________________________________________________________

This is the "HEAD" branch, otherwise known as the "trunk".  Its primary
purpose is to accumulate changes that are not yet partitioned into a
specific (versioned) release.  When people say "use CVS emacs", this is
the branch they are talking about.  Likewise, a "cvs checkout" without
the "-r" option results in this branch.

The plans for this branch are not specified; Emacs hackers add to it
relatively free of constraint (aside from proper legal / accounting
practices), although sometimes there is related discussion on the
emacs-devel mailing list.

The closure process for this branch is undocumented; concepts such as
"freeze", "release", or "integration with the trunk" are not applicable
to this branch.