Merge branch 'history' into v6 [#146, pr #152]...

- #146
- #152

Author: olets

tests/abbr-history.ztr.zsh

@@ -0,0 +1,9 @@
+#!/usr/bin/env zsh
+
+main() {
+	emulate -LR zsh
+
+	ztr skip '@TODO' 'When ABBR_PUSH_HISTORY == 1, abbreviations are included in history'
+}
+
+main

zsh-abbr.zsh

@@ -47,6 +47,11 @@ typeset -gi ABBR_LOG_AVAILABLE_ABBREVIATION_AFTER=${ABBR_LOG_AVAILABLE_ABBREVIAT
 # deprecated
 typeset -gi ABBR_PRECMD_LOGS=${ABBR_PRECMD_LOGS:-1}
 
+# Should abbr-expand-and-accept push the unexpanded line to the shell history? (default false)
+# If true, if abbr-expand-and-accept expands an abbreviation there will be two history entries:
+# the first is what was typed (with the abbreviation), the second is what was run (with the expansion).
+typeset -gi ABBR_PUSH_HISTORY=${ABBR_PUSH_HISTORY:-0}
+
 # Behave as if `--quiet` was passed? (default false)
 typeset -gi ABBR_QUIET=${ABBR_QUIET:-0}
 
@@ -1638,11 +1643,17 @@ abbr-expand-and-accept() {
 
   # do not support debug message
 
+  local buffer
+
   local trailing_space
   trailing_space=${LBUFFER##*[^[:IFSSPACE:]]}
 
   if [[ -z $trailing_space ]]; then
+    buffer=$BUFFER
+
     zle abbr-expand
+
+    (( ABBR_PUSH_HISTORY )) && [[ $buffer != $BUFFER ]] && print -s $buffer
   fi
 
   _abbr_accept-line