<feed xmlns='http://www.w3.org/2005/Atom'>
<title>emacs/lisp/ediff-init.el, branch scratch/static_assert</title>
<subtitle>Emacs is the extensible, customizable, self-documenting real-time display editor. 
</subtitle>
<link rel='alternate' type='text/html' href='https://jason.zzq.org/git/emacs/'/>
<entry>
<title>Move version control related files to the "vc" subdirectory.</title>
<updated>2010-06-11T18:51:00+00:00</updated>
<author>
<name>Juri Linkov</name>
</author>
<published>2010-06-11T18:51:00+00:00</published>
<link rel='alternate' type='text/html' href='https://jason.zzq.org/git/emacs/commit/?id=56b2854f302ee88e9adb03c196e6643841220440'/>
<id>56b2854f302ee88e9adb03c196e6643841220440</id>
<content type='text'>
* add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff-diff.el,
* ediff.el, ediff-help.el, ediff-hook.el, ediff-init.el,
* ediff-merg.el, ediff-mult.el, ediff-ptch.el, ediff-util.el,
* ediff-vers.el, ediff-wind.el, emerge.el, log-edit.el, log-view.el,
* pcvs-defs.el, pcvs.el, pcvs-info.el, pcvs-parse.el, pcvs-util.el,
* smerge-mode.el, vc-annotate.el, vc-arch.el, vc-bzr.el, vc-cvs.el,
* vc-dav.el, vc-dir.el, vc-dispatcher.el, vc.el, vc-git.el,
* vc-hg.el, vc-hooks.el, vc-mtn.el, vc-rcs.el, vc-sccs.el, vc-svn.el:
Move files to the "vc" subdirectory.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff-diff.el,
* ediff.el, ediff-help.el, ediff-hook.el, ediff-init.el,
* ediff-merg.el, ediff-mult.el, ediff-ptch.el, ediff-util.el,
* ediff-vers.el, ediff-wind.el, emerge.el, log-edit.el, log-view.el,
* pcvs-defs.el, pcvs.el, pcvs-info.el, pcvs-parse.el, pcvs-util.el,
* smerge-mode.el, vc-annotate.el, vc-arch.el, vc-bzr.el, vc-cvs.el,
* vc-dav.el, vc-dir.el, vc-dispatcher.el, vc.el, vc-git.el,
* vc-hg.el, vc-hooks.el, vc-mtn.el, vc-rcs.el, vc-sccs.el, vc-svn.el:
Move files to the "vc" subdirectory.
</pre>
</div>
</content>
</entry>
<entry>
<title>Add 2010 to copyright years.</title>
<updated>2010-01-13T08:35:10+00:00</updated>
<author>
<name>Glenn Morris</name>
</author>
<published>2010-01-13T08:35:10+00:00</published>
<link rel='alternate' type='text/html' href='https://jason.zzq.org/git/emacs/commit/?id=114f9c96795aff3b51b9060d7c9c1b77debcc99a'/>
<id>114f9c96795aff3b51b9060d7c9c1b77debcc99a</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>2009-12-07  Michael Kifer &lt;kifer@cs.stonybrook.edu&gt;</title>
<updated>2009-12-07T06:56:40+00:00</updated>
<author>
<name>Michael Kifer</name>
</author>
<published>2009-12-07T06:56:40+00:00</published>
<link rel='alternate' type='text/html' href='https://jason.zzq.org/git/emacs/commit/?id=2de386ca1d481a544e6fed79baaa19adcc80161d'/>
<id>2de386ca1d481a544e6fed79baaa19adcc80161d</id>
<content type='text'>
	* ediff-init.el (ediff-event-key): use event-to-character instead of
	event-key.

	* ediff-mult.el (ediff-setup-meta-map, ediff-prepare-meta-buffer): add
	menus to the meta mode. (Dan Nicolaescu's &lt;dann@ics.uci.edu&gt; patch.)

	* ediff.el (ediff-buffers-internal): add unwind-protect.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
	* ediff-init.el (ediff-event-key): use event-to-character instead of
	event-key.

	* ediff-mult.el (ediff-setup-meta-map, ediff-prepare-meta-buffer): add
	menus to the meta mode. (Dan Nicolaescu's &lt;dann@ics.uci.edu&gt; patch.)

	* ediff.el (ediff-buffers-internal): add unwind-protect.
</pre>
</div>
</content>
</entry>
<entry>
<title>2009-11-22  Michael Kifer  &lt;kifer@cs.stonybrook.edu&gt;</title>
<updated>2009-11-22T03:14:14+00:00</updated>
<author>
<name>Michael Kifer</name>
</author>
<published>2009-11-22T03:14:14+00:00</published>
<link rel='alternate' type='text/html' href='https://jason.zzq.org/git/emacs/commit/?id=433d9ace74fbd35205c06bcef487bd3e5d41e6bb'/>
<id>433d9ace74fbd35205c06bcef487bd3e5d41e6bb</id>
<content type='text'>
	* viper-cmd.el: use viper-last-command-char instead of
	last-command-char/last-command-event.
	(viper-prefix-arg-value): do correct conversion of event-char for
	XEmacs.

	* viper-util.el, viper.el: use viper-last-command-char instead of
	last-command-char/last-command-event.

	* ediff-init.el, ediff-mult.el, ediff-util.el: relpace
	last-command-char and last-command-event with (ediff-last-command-char) everywhere.

	* ediff-vers.el (ediff-rcs-get-output-buffer): make sure the buffer is
	created in fundamental mode.

	* ediff.el (ediff-version): revert the change of interactive-p to
	called-interactively-p.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
	* viper-cmd.el: use viper-last-command-char instead of
	last-command-char/last-command-event.
	(viper-prefix-arg-value): do correct conversion of event-char for
	XEmacs.

	* viper-util.el, viper.el: use viper-last-command-char instead of
	last-command-char/last-command-event.

	* ediff-init.el, ediff-mult.el, ediff-util.el: relpace
	last-command-char and last-command-event with (ediff-last-command-char) everywhere.

	* ediff-vers.el (ediff-rcs-get-output-buffer): make sure the buffer is
	created in fundamental mode.

	* ediff.el (ediff-version): revert the change of interactive-p to
	called-interactively-p.
</pre>
</div>
</content>
</entry>
<entry>
<title>2009-08-15  Michael Kifer  &lt;kifer@cs.stonybrook.edu&gt;</title>
<updated>2009-08-15T05:57:08+00:00</updated>
<author>
<name>Michael Kifer</name>
</author>
<published>2009-08-15T05:57:08+00:00</published>
<link rel='alternate' type='text/html' href='https://jason.zzq.org/git/emacs/commit/?id=68b962d42a9cc126759448484d23e10e2102d622'/>
<id>68b962d42a9cc126759448484d23e10e2102d622</id>
<content type='text'>
	* 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.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
	* 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.
</pre>
</div>
</content>
</entry>
<entry>
<title>Add 2009 to copyright years.</title>
<updated>2009-01-05T03:18:22+00:00</updated>
<author>
<name>Glenn Morris</name>
</author>
<published>2009-01-05T03:18:22+00:00</published>
<link rel='alternate' type='text/html' href='https://jason.zzq.org/git/emacs/commit/?id=ae940284fa77a6928f5162b7de859e67bdc7506c'/>
<id>ae940284fa77a6928f5162b7de859e67bdc7506c</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>* align.el:</title>
<updated>2008-12-03T05:48:14+00:00</updated>
<author>
<name>Lute Kamstra</name>
</author>
<published>2008-12-03T05:48:14+00:00</published>
<link rel='alternate' type='text/html' href='https://jason.zzq.org/git/emacs/commit/?id=9201cc281b10650e96296eda8519403e2b508fbd'/>
<id>9201cc281b10650e96296eda8519403e2b508fbd</id>
<content type='text'>
* allout.el:
* apropos.el:
* arc-mode.el:
* autoinsert.el:
* avoid.el:
* battery.el:
* bookmark.el:
* buff-menu.el:
* calculator.el:
* chistory.el:
* cmuscheme.el:
* comint.el:
* compare-w.el:
* dabbrev.el:
* delim-col.el:
* desktop.el:
* diff-mode.el:
* diff.el:
* dired-aux.el:
* dired-x.el:
* dired.el:
* dos-vars.el:
* ediff-diff.el:
* ediff-help.el:
* ediff-init.el:
* ediff-merg.el:
* ediff-mult.el:
* ediff-ptch.el:
* ediff-vers.el:
* ediff-wind.el:
* ediff.el:
* emerge.el:
* facemenu.el:
* faces.el:
* ffap.el:
* filecache.el:
* find-dired.el:
* font-core.el:
* font-lock.el:
* forms.el:
* fringe.el:
* help-at-pt.el:
* hippie-exp.el:
* ido.el:
* image-file.el:
* imenu.el:
* indent.el:
* info.el:
* isearchb.el:
* iswitchb.el:
* jit-lock.el:
* jka-compr.el:
* log-edit.el:
* lpr.el:
* ls-lisp.el:
* man.el:
* menu-bar.el:
* midnight.el:
* mouse-sel.el:
* mouse.el:
* msb.el:
* outline.el:
* paren.el:
* pcmpl-cvs.el:
* pcmpl-gnu.el:
* pcomplete.el:
* pcvs-info.el:
* pcvs-parse.el:
* printing.el:
* ps-mule.el:
* ps-print.el:
* replace.el:
* ruler-mode.el:
* saveplace.el:
* sb-image.el:
* scroll-bar.el:
* sha1.el:
* shadowfile.el:
* shell.el:
* sort.el:
* speedbar.el:
* strokes.el:
* tempo.el:
* term.el:
* terminal.el:
* time-stamp.el:
* time.el:
* tree-widget.el:
* type-break.el:
* vc-cvs.el:
* vc-hg.el:
* vc-mcvs.el:
* vc-rcs.el:
* vc-sccs.el:
* vc.el:
* view.el:
* w32-vars.el:
* whitespace.el:
* wid-edit.el: Remove leading * from docstrings of defcustoms,
deffaces, defconsts and defuns.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* allout.el:
* apropos.el:
* arc-mode.el:
* autoinsert.el:
* avoid.el:
* battery.el:
* bookmark.el:
* buff-menu.el:
* calculator.el:
* chistory.el:
* cmuscheme.el:
* comint.el:
* compare-w.el:
* dabbrev.el:
* delim-col.el:
* desktop.el:
* diff-mode.el:
* diff.el:
* dired-aux.el:
* dired-x.el:
* dired.el:
* dos-vars.el:
* ediff-diff.el:
* ediff-help.el:
* ediff-init.el:
* ediff-merg.el:
* ediff-mult.el:
* ediff-ptch.el:
* ediff-vers.el:
* ediff-wind.el:
* ediff.el:
* emerge.el:
* facemenu.el:
* faces.el:
* ffap.el:
* filecache.el:
* find-dired.el:
* font-core.el:
* font-lock.el:
* forms.el:
* fringe.el:
* help-at-pt.el:
* hippie-exp.el:
* ido.el:
* image-file.el:
* imenu.el:
* indent.el:
* info.el:
* isearchb.el:
* iswitchb.el:
* jit-lock.el:
* jka-compr.el:
* log-edit.el:
* lpr.el:
* ls-lisp.el:
* man.el:
* menu-bar.el:
* midnight.el:
* mouse-sel.el:
* mouse.el:
* msb.el:
* outline.el:
* paren.el:
* pcmpl-cvs.el:
* pcmpl-gnu.el:
* pcomplete.el:
* pcvs-info.el:
* pcvs-parse.el:
* printing.el:
* ps-mule.el:
* ps-print.el:
* replace.el:
* ruler-mode.el:
* saveplace.el:
* sb-image.el:
* scroll-bar.el:
* sha1.el:
* shadowfile.el:
* shell.el:
* sort.el:
* speedbar.el:
* strokes.el:
* tempo.el:
* term.el:
* terminal.el:
* time-stamp.el:
* time.el:
* tree-widget.el:
* type-break.el:
* vc-cvs.el:
* vc-hg.el:
* vc-mcvs.el:
* vc-rcs.el:
* vc-sccs.el:
* vc.el:
* view.el:
* w32-vars.el:
* whitespace.el:
* wid-edit.el: Remove leading * from docstrings of defcustoms,
deffaces, defconsts and defuns.
</pre>
</div>
</content>
</entry>
<entry>
<title>(ediff-coding-system-for-read): Doc fix.</title>
<updated>2008-10-19T08:24:49+00:00</updated>
<author>
<name>Eli Zaretskii</name>
</author>
<published>2008-10-19T08:24:49+00:00</published>
<link rel='alternate' type='text/html' href='https://jason.zzq.org/git/emacs/commit/?id=595072327af6b78ad79beb9413572d2d032f9293'/>
<id>595072327af6b78ad79beb9413572d2d032f9293</id>
<content type='text'>
(ediff-coding-system-for-write): Set to emacs-internal.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
(ediff-coding-system-for-write): Set to emacs-internal.
</pre>
</div>
</content>
</entry>
<entry>
<title>* bitmaps/README:</title>
<updated>2008-07-31T05:33:56+00:00</updated>
<author>
<name>Dan Nicolaescu</name>
</author>
<published>2008-07-31T05:33:56+00:00</published>
<link rel='alternate' type='text/html' href='https://jason.zzq.org/git/emacs/commit/?id=7c2fb837ec2f0e0a509f22ccc35f9b43476a6119'/>
<id>7c2fb837ec2f0e0a509f22ccc35f9b43476a6119</id>
<content type='text'>
* xfns.c:
* termcap.c:
* term.c:
* syswait.h:
* systty.h:
* systime.h:
* syssignal.h:
* sysdep.c:
* process.h:
* process.c:
* print.c:
* ndir.h:
* lread.c:
* keyboard.c:
* getpagesize.h:
* floatfns.c:
* fileio.c:
* emacs.c:
* doc.c:
* dispnew.c:
* dired.c:
* data.c:
* callproc.c:
* buffer.c:
* README:
* Makefile.in:
* s/template.h:
* s/msdos.h:
* m/vax.h: Remove VMS support.
* s/vms.h:
* vlimit.h:
* uaf.h:
* temacs.opt:
* param.h:
* ioctl.h: Remove file.

* descrip.mms:
* compile.com: Remove file.
* Create.c: Remove VMS support.

* message.el (Module):

* gnus-start.el (Module):

* gnus-registry.el (Module):

* textmodes/texinfmt.el:
* nxml/nxml-enc.el:
* mail/feedmail.el:
* international/mule.el:
* international/latexenc.el:
* emulation/viper-util.el:
* emulation/viper-init.el:
* emulation/viper-ex.el:
* emacs-lisp/bytecomp.el:
* version.el:
* subr.el:
* startup.el:
* sort.el:
* shadowfile.el:
* recentf.el:
* printing.el:
* paths.el:
* minibuffer.el:
* ls-lisp.el:
* loadup.el:
* hippie-exp.el:
* finder.el:
* files.el:
* ediff-util.el:
* ediff-ptch.el:
* ediff-init.el:
* ediff-diff.el:
* dired.el:
* dired-aux.el:
* cus-edit.el:
* bindings.el:
* arc-mode.el:
* add-log.el: Remove VMS support.
* obsolete/vmsproc.el:
* obsolete/vms-pmail.el:
* obsolete/vms-patch.el: Remove file.

* etags.c:
* emacsclient.c: Remove VMS support.

* termcap.src: Remove file.
* README:
* PROBLEMS:
* MACHINES: Remove VMS info.

* ediff.texi: Remove VMS support.

* os.texi:
* intro.texi:
* files.texi: Remove VMS support.

* emacs.texi: Remove VMS support.

* make-dist:
* README: Remove VMS support.
* vms: Remove directory.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* xfns.c:
* termcap.c:
* term.c:
* syswait.h:
* systty.h:
* systime.h:
* syssignal.h:
* sysdep.c:
* process.h:
* process.c:
* print.c:
* ndir.h:
* lread.c:
* keyboard.c:
* getpagesize.h:
* floatfns.c:
* fileio.c:
* emacs.c:
* doc.c:
* dispnew.c:
* dired.c:
* data.c:
* callproc.c:
* buffer.c:
* README:
* Makefile.in:
* s/template.h:
* s/msdos.h:
* m/vax.h: Remove VMS support.
* s/vms.h:
* vlimit.h:
* uaf.h:
* temacs.opt:
* param.h:
* ioctl.h: Remove file.

* descrip.mms:
* compile.com: Remove file.
* Create.c: Remove VMS support.

* message.el (Module):

* gnus-start.el (Module):

* gnus-registry.el (Module):

* textmodes/texinfmt.el:
* nxml/nxml-enc.el:
* mail/feedmail.el:
* international/mule.el:
* international/latexenc.el:
* emulation/viper-util.el:
* emulation/viper-init.el:
* emulation/viper-ex.el:
* emacs-lisp/bytecomp.el:
* version.el:
* subr.el:
* startup.el:
* sort.el:
* shadowfile.el:
* recentf.el:
* printing.el:
* paths.el:
* minibuffer.el:
* ls-lisp.el:
* loadup.el:
* hippie-exp.el:
* finder.el:
* files.el:
* ediff-util.el:
* ediff-ptch.el:
* ediff-init.el:
* ediff-diff.el:
* dired.el:
* dired-aux.el:
* cus-edit.el:
* bindings.el:
* arc-mode.el:
* add-log.el: Remove VMS support.
* obsolete/vmsproc.el:
* obsolete/vms-pmail.el:
* obsolete/vms-patch.el: Remove file.

* etags.c:
* emacsclient.c: Remove VMS support.

* termcap.src: Remove file.
* README:
* PROBLEMS:
* MACHINES: Remove VMS info.

* ediff.texi: Remove VMS support.

* os.texi:
* intro.texi:
* files.texi: Remove VMS support.

* emacs.texi: Remove VMS support.

* make-dist:
* README: Remove VMS support.
* vms: Remove directory.
</pre>
</div>
</content>
</entry>
<entry>
<title>Switch to recommended form of GPLv3 permissions notice.</title>
<updated>2008-05-06T08:06:51+00:00</updated>
<author>
<name>Glenn Morris</name>
</author>
<published>2008-05-06T08:06:51+00:00</published>
<link rel='alternate' type='text/html' href='https://jason.zzq.org/git/emacs/commit/?id=eb3fa2cfcfff550c08f5645c740608f97c2c949e'/>
<id>eb3fa2cfcfff550c08f5645c740608f97c2c949e</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
