From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-29439-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 4386 invoked by alias); 2 Jun 2011 16:25:42 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 29439
Received: (qmail 18024 invoked from network); 2 Jun 2011 16:25:40 -0000
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW
	autolearn=ham version=3.3.1
Received-SPF: none (ns1.primenet.com.au: domain at realraum.at does not designate permitted sender hosts)
Message-ID: <4DE7B432.5090204@realraum.at>
Date: Thu, 02 Jun 2011 18:02:58 +0200
From: Bernhard Tittelbach <xro@realraum.at>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.8.1.24) Gecko/20100411 Thunderbird/2.0.0.24 Mnenhy/0.7.6.666
MIME-Version: 1.0
To: zsh-workers@zsh.org
Subject: Re: Behaviour of {beginning,end}-of-buffer-or-history
References: <is65ie$jtu$1@dough.gmane.org>	<110601192206.ZM14271@torch.brasslantern.com>	<4DE6FDA4.6060705@realraum.at> <110602072553.ZM15639@torch.brasslantern.com>
In-Reply-To: <110602072553.ZM15639@torch.brasslantern.com>
X-Enigmail-Version: 1.1.2
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-TUG-Backscatter-control: 0B1a6U/lEHC+vq3P81DLWg
X-Scanned-By: MIMEDefang 2.70 on 129.27.10.19

On 02/06/11 16:25, Bart Schaefer wrote:
> On Jun 2,  5:04am, Bernhard Tittelbach wrote:
> }
[...]
> A quick test of [[ $LBUFFER[-1] = $'\n' ]] should fix that.
[...]

indeed, works perfectly now:

beginning-or-end-of-somewhere() {
  local hno=$HISTNO
  if [[ ( "${LBUFFER[-1]}" == $'\n' && "${WIDGET}" == beginning-of* )\
     || ( "${RBUFFER[1]}" == $'\n' && "${WIDGET}" == end-of* ) ]]; then
    zle .${WIDGET:s/somewhere/buffer-or-history/} "$@"
  else
    zle .${WIDGET:s/somewhere/line-hist/} "$@"
    if (( HISTNO != hno )); then
      zle .${WIDGET:s/somewhere/buffer-or-history/} "$@"
    fi
  fi
}
zle -N beginning-of-somewhere beginning-or-end-of-somewhere
zle -N end-of-somewhere beginning-or-end-of-somewhere


Cheers & Thanks,
Bernhard