A little cleanup

A little cleanup

[Zefram]

-----BEGIN PGP SIGNED MESSAGE-----

It seems that ZLE_NAMEDBUFFER isn't actually used anywhere.  This minor
cleanup doesn't seem to break anything...

      *** Src/zle.h.old	Mon Jul  3 05:18:30 1995
      --- Src/zle.h	Mon Jul  3 05:28:36 1995
      ***************
      *** 205,217 ****
        #define ZLE_YANK     	 8
        #define ZLE_LINEMOVE 	 16
        #define ZLE_ARG      	 32
      ! #define ZLE_NAMEDBUFFER 128
      ! #define ZLE_KILL        (64|ZLE_NAMEDBUFFER)
        #define ZLE_HISTSEARCH  256
        #define ZLE_NEGARG      512
        #define ZLE_INSERT     1024
        #define ZLE_DELETE     2048
      - #define ZLE_DIGIT      4096
        
        typedef struct key *Key;
        
      --- 205,216 ----
        #define ZLE_YANK     	 8
        #define ZLE_LINEMOVE 	 16
        #define ZLE_ARG      	 32
      ! #define ZLE_DIGIT        64
      ! #define ZLE_KILL        128
        #define ZLE_HISTSEARCH  256
        #define ZLE_NEGARG      512
        #define ZLE_INSERT     1024
        #define ZLE_DELETE     2048
        
        typedef struct key *Key;
        
      *** Src/zle_bindings.c.old	Mon Jul  3 05:17:27 1995
      --- Src/zle_bindings.c	Mon Jul  3 05:34:27 1995
      ***************
      *** 169,175 ****
            {"vi-yank", viyank, 0},
            {"vi-yank-eol", viyankeol, 0},
            {"which-command", processcmd, 0},
      !     {"yank", yank, ZLE_YANK | ZLE_NAMEDBUFFER},
            {"yank-pop", yankpop, ZLE_YANK},
            {"emacs-backward-word", emacsbackwardword, ZLE_MOVEMENT},
            {"emacs-forward-word", emacsforwardword, ZLE_MOVEMENT},
      --- 169,175 ----
            {"vi-yank", viyank, 0},
            {"vi-yank-eol", viyankeol, 0},
            {"which-command", processcmd, 0},
      !     {"yank", yank, ZLE_YANK},
            {"yank-pop", yankpop, ZLE_YANK},
            {"emacs-backward-word", emacsbackwardword, ZLE_MOVEMENT},
            {"emacs-forward-word", emacsforwardword, ZLE_MOVEMENT},

 -zefram

-----BEGIN PGP SIGNATURE-----
Version: 2.6.i

iQBVAgUBL/d0lWWJ8JfKi+e9AQGQtgIAjwncrZp817+Sy/1+R+bk8Z0W0SRayXQh
XYNxhCzckzxYQ3n/p/FlxSKrkwvbFJposefcp1qqtzBC9CZugt3wUw==
=WVre
-----END PGP SIGNATURE-----

Re: A little cleanup

[Wayne Davison]

> It seems that ZLE_NAMEDBUFFER isn't actually used anywhere.  This minor
> cleanup doesn't seem to break anything...

And actually fixed the bug I reported when yanking things (where
zsh keeps using the same kill buffer after a yank as it was using
before).  With this cleaned up, my patch to zle_utils.c (that has
not yet been included as of beta 10) is no longer needed.  The
change was on line 113:

    else if (!(lastcmd & ZLE_KILL)) {

changed to:

    else if ((lastcmd & ZLE_KILL) != ZLE_KILL) {

It was required because ZLE_NAMEDBUFFER had ZLE_KILL in it, but
with the cleanup only kill commands now have ZLE_KILL set -- a
good thing.

..wayne..