Subject: Re: bug#13793: 24.3.50; M-x broken in viper and X

From: Michael Kifer <[email-masked]>
Date: Sat, 06 Jul 2013 16:33:36 -0400

On 07/06/2013 03:12 PM, Glenn Morris wrote:

Michael Kifer wrote:

ok. I committed your patch along with some of my other changes. <br>

You haven't committed anything to the Emacs repo AFAICS.
Maybe you forgot to push the changes, or something.

I did push. Here is the log:

> bzr log

revno: 113293
committer: Michael Kifer <[email-masked]>
branch nick: trunk
timestamp: Fri 2013-07-05 18:50:16 -0400
message:
* faces.el  (tty-run-terminal-initialization): function changed (Stefan
Monnier's patch).

* viper.el (viper-emacs-state-mode-list): add egg-status-buffer-mode.
(viper-version): version update.
(viper-go-away,viper-setup-hooks): function changed (Stefan Monnier's
patch).
(viper--lookup-key,viper-catch-tty-ESC,viper-uncatch-tty-ESC,
viper-setup-ESC-to-escape): new functions (Stefan Monnier's
patch).

* viper-cmd.el: (viper-del-forward-char-in-insert): new function.
(viper-save-kill-buffer): check if buffer is modified.
(viper-envelop-ESC-key): function deleted (Stefan Monnier's patch).
(viper-intercept-ESC-key): function changed (Stefan Monnier's patch).

* viper-keym.el (viper-ESC-key): constant changed (Stefan Monnier's
patch).

* ediff.el (ediff-files-command,ediff3-files-command): new functions.
(ediff-merge-command,ediff-merge-with-ancestor-command): new functions.
(ediff-directories-command,ediff-directories3-command): new functions.
(ediff-merge-directories-command): new function.
(ediff-merge-directories-with-ancestor-command): new function.
All the above are command-line interfaces to ediff: facilitate calling
Emacs with the appropriate ediff functions invoked.
(ediff-version): version update.
------------------------------------------------------------
revno: 113292
committer: Paul Eggert <[email-masked]>
branch nick: trunk
timestamp: Fri 2013-07-05 09:58:01 -0700
message:
Remove duplicate #include directives.

* alloc.c [GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES]:
* xfaces.c:
Don't include stdio.h twice.
* buffer.c [USE_MMAP_FOR_BUFFERS]:
Don't in  * fileio.c [WINDOWSNT | MSDOS]: Don't include fcntl.h twice.
* lread.c: Don't include coding.h twice.
* nsfont.m: Don't include frame.h twice.
* process.c [HAVE_RES_INIT]: Don't include <netinet/in.h> twice.
* ralloc.c: Don't include <unistd.h> twice.
* xdisp.c: Don't include font.h twice.
* xterm.c: Don't include fontset.h twice.
* xterm.h [USE_X_TOOLKIT]: Don't include X11/StringDefs.h twice.
------------------------------------------------------------
revno: 113291
committer: Glenn Morris <[email-masked]>
branch nick: trunk
timestamp: Fri 2013-07-05 09:10:47 -0700
message:
* admin/admin.el (make-manuals): Use a pdf/ subdirectory for pdf versions.
clude sys/types.h or stdio.h twice.

etc.