1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-07-25 09:21:05 +02:00
Commit graph

852 commits

Author SHA1 Message Date
Joey Pabalinas
fc3826190a 43779 (tweaked): add parentheses to fix expression with cprecedences option set 2018-11-08 11:46:27 +01:00
Daniel Shahaf
f6adb79ba5 43685: add-zle-hook-widget: Support running under NO_UNSET ('set -u'). 2018-10-14 14:01:33 +00:00
Daniel Shahaf
e38f15f8ff 43620 (tweaked): vcs_info git: Reverse the order patches are passed to gen-unapplied-string in.
This is an incompatible change; see README for details.

Tweaks (relative to posted version): tweaked README, removed scalpel (debug print).
2018-10-08 13:44:40 +00:00
Daniel Shahaf
31dcba76f0 43617: vcs_info git: During a non-interactive rebase of a detached head, computer the %b expando correctly.
Before this commit, the value of %b was the hash of the commit from the
"source" side of the rebase, from .git/rebase-apply/orig-head and
.git/rebase-apply/original-commit.  This broke the invariant that
%b expands to a git-rev-parse(1) expression resolving to what %r
expands to.

Use .git/rebase-apply/onto instead as, empirically, it contains the
correct value.
2018-10-08 13:41:45 +00:00
Daniel Shahaf
0e0219118d 43619: vcs_info git: In non-interactive rebases, always set $hook_com[git_patches_applied] to a string of the form 'foo bar', never just 'foo'. 2018-10-08 13:41:43 +00:00
Daniel Shahaf
a05533e425 43618: vcs_info: Don't redefine helper functions on every execution of the autoloadable outer function.
This allows enabling tracing of the helper functions without fned'ing
the outer function.
2018-10-08 13:41:41 +00:00
Daniel Shahaf
5c9ef1a1fa 43587: vcs_info git: In 'git rebase -i', when computing subjects of applied-patches, handle an edge case where the subject is not available. 2018-10-07 15:05:19 +00:00
Daniel Shahaf
0c00eed4c7 43588: vcs_info git: Make sure applied-patches is of the form "$hash $subject" --- that is, has a space and a non-empty second argument --- even with future 'git rebase -i' verbs.
Use of '?' is consistent with these precedents:

Backends/VCS_INFO_get_data_git:220:            printf -v "git_patches_applied[$p]"  "%04d ?" "$p"
Backends/VCS_INFO_get_data_git:242:                git_patches_applied+=("? $subject")
Backends/VCS_INFO_get_data_git:244:                git_patches_applied+=("?")
VCS_INFO_quilt:160:            applied[$i]+=" ?"
VCS_INFO_quilt:168:            unapplied[$i]+=" ?"
2018-10-07 15:05:17 +00:00
Daniel Shahaf
a27fad1ae2 43586: vcs_info git: Reformat to minimise next diff. No functional change. 2018-10-07 15:05:15 +00:00
Daniel Shahaf
abc94e8f6a 43585: vcs_info svn: Recognize working copies in need of an upgrade. 2018-10-07 15:05:13 +00:00
Daniel Shahaf
f9952301b2 unposted: Indicate which use-case each branch handles. 2018-10-02 15:22:06 +00:00
Daniel Shahaf
40d9681b62 43313 (log message tweaked): vcs_info git: For the branch name, try to find a symbolic name before falling back to a raw commit hash.
Ask git-describe(1) and git-name-rev(1) to compute a gitrevisions(7)
name in terms of a branch or tag that contains (= is a descendant of,
is younger than) HEAD.

In this repository, the output changes from "9567bfe..." to
"master~1" or "remotes/origin/HEAD~1". This would also happen
during bisects, e.g., "bisect/bad~22".
2018-08-24 15:50:18 +00:00
Daniel Shahaf
4cfbbf9ca5 43314: vcs_info git: Flatten a nested if.
No functional change.
2018-08-24 15:49:38 +00:00
Peter Stephenson
0a6cb5078d 43084: Variable warning suppression enhancements.
Add vared -g option along the lines of typeset -g.

Set reply safely in zsh_directory_name_cdr.
2018-06-25 09:31:40 +01:00
dana
faa07d064b 43030: Replace VCS_INFO_realpath() by :P 2018-06-16 12:03:23 -05:00
Oliver Kiddle
594f2ff06e users/23434: initialise UNDO_LIMIT_NO so that an initial undo doesn't clear the whole edit buffer 2018-06-07 17:48:48 +02:00
Sebastian Gniazdowski
52f1c4ffb0 42929 (tweaked): additional default bindings in zed.
Add to both zed and zed-vicmd keymaps.
2018-06-05 09:38:31 +01:00
Sebastian Gniazdowski
abd0040253 41839: force IFS to default for "read" 2018-01-19 22:56:11 -08:00
Daniel Shahaf
a8ad9768bd unposted: vcs_info: Add docstrings to the internal functions VCS_INFO_formats and VCS_INFO_set. 2017-12-30 06:14:22 +00:00
Alexey Sokolov
1a5d8a6916 41952: Use HGPLAIN instead of HGRCPATH in VCS_INFO_get_data_hg
Fixes prompt indicator in case if the repository requires a non-default
feature. With HGRCPATH, it results in:

abort: repository requires features unknown to this Mercurial: ...
(see https://mercurial-scm.org/wiki/MissingRequirement for more information)

Which, in turn, results in "default" getting reported regardless of what
is the current state of the repo.
2017-10-25 10:34:34 +02:00
Barton E. Schaefer
96845524a6 41899: handle multi-word values of $VISUAL et al., and line counting of buffer for emacs startup 2017-10-15 11:17:06 -07:00
Peter Stephenson
b2e44bce62 Make mbegin, mend, match local in zed.
Needed for zstyle -m.
2017-08-31 16:55:26 +01:00
Daniel Shahaf
d6aa949977 41565: vcs_info patch2subject: Support svn log -r N --diff output. 2017-08-22 20:50:14 +00:00
Barton E. Schaefer
43e55a9bcd 41472: introduce cleanup hooks default and restore special themes, and update documentation 2017-07-29 16:58:39 -07:00
Peter Stephenson
d78761c003 41345: Use consistent prompt variables in prompt themese.
Some more sanity may be needed in this area but this apsect seems
uncontroversial.
2017-06-26 11:16:38 +01:00
Wieland Hoffmann
cf72c2d288 41265: quote the inserted file names as necessary 2017-06-16 22:28:54 -07:00
Eric Cook
6ecc34a55e unposted: fix typo in url-quote-magic 2017-06-13 21:47:48 -04:00
Sebastian Gniazdowski
d6d7ef2a0d 41232: Use page up/down keys in zed keymap.
Find with terminfo where available.
2017-06-07 10:01:38 +01:00
Peter Stephenson
ab6f30350a unposted: Use typeset -g in insert-unicode-char
Avoid warning from WARN_NESTED_VAR if set.
2017-05-02 09:39:53 +01:00
Aaron Schrab
7fc15db684 40892: subcommand matching for ip help 2017-03-24 09:46:03 +00:00
Barton E. Schaefer
1b0541c52f Julien Nicoulaud: 40586: discard stderr 2017-02-21 20:45:18 -08:00
Daniel Shahaf
ecd88284f3 40492: vcs_info: Escape '%' signs in payloads.
Test case: a patch whose subject is '%Sfoo%sbar'.  ('S' and 's' are
expandos both in prompts and in the 'formats' style.)
2017-02-09 15:24:04 +00:00
Daniel Shahaf
bb6c08b51a unposted: vcs_info git: Fix typo in manual. 2017-02-04 05:55:46 +00:00
Daniel Shahaf
33c0a10448 40480: vcs_info set-patch-format: Eliminate the remaining code duplication. 2017-02-03 18:14:01 +00:00
Daniel Shahaf
9211d7f277 40479: vcs_info set-patch-format: Prepare for more code sharing between the callers.
This changes hook invocation order in the hg backend.
2017-02-03 18:14:00 +00:00
Daniel Shahaf
fca4f90bba 40481: vcs_info hg: Pass arguments to the set-patch-format hook. 2017-02-03 18:13:59 +00:00
Daniel Shahaf
3a1756b728 40478: vcs_info set-patch-format: Guard against empty variable elision. 2017-02-03 18:13:58 +00:00
Daniel Shahaf
49bc46946e 40476: vcs_info $backend_misc: Document at the right point, provide in quilt 'standalone' mode. 2017-02-03 18:13:57 +00:00
Daniel Shahaf
2854a67e09 40403/0004: vcs_info set-patch-format helper: Part .
This also fixes the %a (${hook_com[all-n]}) expando in the hg backend:
before this change, it counted only unapplied changes.
2017-01-25 04:22:32 +00:00
Daniel Shahaf
edd9798de7 40403/0003: vcs_info set-patch-format helper: Part . 2017-01-25 04:22:32 +00:00
Daniel Shahaf
2702857334 40403/0002: vcs_info set-patch-format helper: Part .
Not all callers reset ${hook_com}, but those that don't, immediately
overwrite it a few lines later.
2017-01-25 04:22:31 +00:00
Daniel Shahaf
0ea1957608 40403/0001: vcs_info set-patch-format helper: Part . 2017-01-25 04:22:30 +00:00
Daniel Shahaf
57013f8b96 40401: vcs_info git: Fix the %c patch-format expando.
Before this change, ${git_unapplied_s} was unused and the %c
(${hook_com[unapplied]}) expando evaluated to the number of digits in
the string returned by the gen-unapplied-string hook (or to the number
of digits in the number of unapplied patches, when there was no such
hook).
2017-01-25 04:22:30 +00:00
Daniel Shahaf
699a38e698 40392: vcs_info patch2subject: Support git show output. 2017-01-25 04:22:28 +00:00
Barton E. Schaefer
5455798bb5 Oliver: 40118: alternate fix replacing 40115
This commit reverts 40115 (commit 3594f55f) thus restoring 38579, then
applies 40118: Relocate BUFFER/CURSOR reset to work around "fc -p" issue
2016-12-24 00:15:21 -08:00
Daniel Shahaf
816084c0ac 40149: vcs_info git: Avoid a fork. 2016-12-16 10:48:10 +00:00
Daniel Shahaf
feb4be4a5e 40126: zed (fned): When editing a new function. escape its name.
Example:

    % unfunction \(
    % fned \(
2016-12-09 08:21:07 +00:00
Zhiming Wang
3594f55fc0 40115: revert 38579 due to bug restoring BUFFER after history search
This reverts commit 20948d0889.
2016-12-06 21:37:30 -08:00
Daniel Shahaf
f71de84f1d unposted: vcs_info git: Handle rebase-apply sequences with >=10000 patches.
Review-by: Frank Terbeck
2016-12-04 21:37:02 +00:00
Daniel Shahaf
d9237ccdbf 40074: vcs_info git: rfc822-unfold rebase-apply patch subjects when msg-clean is unavailable.
Example (in this repository):

    git -c merge.merge-changelog.driver=/bin/false rebase --onto=1955cce^^  1955cce^ 1955cce
2016-12-04 21:37:01 +00:00
Daniel Hahler
ccf50048ac Get subject of current patch in rebase-apply mode 2016-12-03 00:18:22 +01:00
Daniel Shahaf
8891f5a33d unposted: vcs_info: Break out VCS_INFO_quilt-patch2subject into VCS_INFO_patch2subject
... so other places can use it; compare 40030 in the 39990 thread.
2016-12-01 17:13:37 +00:00
Oliver Kiddle
5dc7b35ff6 unposted: set new vichange flag for surround widget 2016-11-25 23:07:53 +01:00
Oliver Kiddle
cb5f100bd3 39986, 39989: improve handling of vi-repeat-change
Save previous vi change and throw away a new change that fails.
Add zle -f vichange to allow shell widget to be a single change.
Fix repeat of command where numeric arguments were multiplied.
2016-11-20 23:59:48 +01:00
Oliver Kiddle
488d73c07d 39884: fix history-beginning-search-menu for history lines containing a pipe character 2016-11-09 16:55:13 +01:00
Daniel Shahaf
74aa45910b 39786: vcs_info (hg): Use native hexdump implementation instead of external command.
Fixes issue whereby the external command would print "*" for repeated
octets.

Includes comment change, cf 39790.
2016-10-31 18:35:47 +00:00
Barton E. Schaefer
87c951c6bd unposted: add "--" to zle widget call for conventional sanity 2016-10-29 10:08:53 -07:00
Barton E. Schaefer
9cfd26bf10 unposted: handle empty pastes and "zle bracketed-paste variablename" form. 2016-10-28 16:44:35 -07:00
Daniel Shahaf
4f2a1810f2 39495: add-zle-hook-widget: Add end-of-options guard to hook invocation.
Currently, the only special widget that takes arguments is zle-keymap-select.
2016-09-30 23:15:57 +00:00
Daniel Shahaf
889f6690fd 39423: vcs_info git: Produce nicer applied-string messages for 'exec' actions.
This changes the behaviour on "unknown" git-rebase actions (those other
than pick/reword/edit/fixup/squash/execute).
2016-09-24 07:22:15 +00:00
Mikael Magnusson
c3fbd97f9b bracketed-paste-url-magic: Handle magnet links too, and allow for schemes without // 2016-09-19 00:34:13 +02:00
Barton E. Schaefer
70166178bd 39131: return on error needs to be at the outer scope. 2016-08-30 20:31:21 -07:00
Daniel Shahaf
7154052ebe 39046 + 39061: New :P history modifier. 2016-08-22 03:34:30 +00:00
Daniel Shahaf
8e029323a7 unposted: Avoid $0 for POSIX_ARGZERO compatibility. 2016-07-28 18:07:57 +00:00
Oliver Kiddle
b816bb42cf 38957: make use of updates to match-words-by-style and better support completion of word-style styles for zstyle 2016-07-28 16:16:25 +02:00
Oliver Kiddle
7830a8c498 unposted: fix vi-pipe for visual mode: don't need to force line mode 2016-07-28 16:07:59 +02:00
Peter Stephenson
26361e438b 38953: Fix some issues with match-words-by-style.
Add keyword retrieval of words.  Improve test for start of
word in subwords for use in delete-whole-word.  If line after
cursor is empty, white space is treated as ws-after-cursor.
2016-07-28 09:51:19 +01:00
Daniel Shahaf
74722c7392 unposted: Prefix function's name to its error messages. 2016-07-27 14:04:45 +00:00
Oliver Kiddle
ac05343049 38936: fix vi-pipe function for option compatibility 2016-07-24 22:33:14 +02:00
Oliver Kiddle
932ff2b6f8 38929: new vim style text object using match-words-by-style mechanism 2016-07-24 22:18:34 +02:00
Barton E. Schaefer
b3dba0f7c1 Relocate add-zle-hook-widget, everything else in Functions/Zle is a widget. 2016-07-17 12:07:43 -07:00
Barton E. Schaefer
e3884c60ed 38866: update add-zle-hook-widget doc for 38850, bug fixes
Edge case handling, wrap in anonymous function for kshautoload management.
2016-07-17 12:04:48 -07:00
Barton E. Schaefer
3e61af3ff4 38850: Simplify indexing scheme to store hooks in the order they are added
Also, better handling of edge cases and of autoloading/sourcing file
2016-07-13 22:14:54 -07:00
Peter Stephenson
c135c416b2 38796: Fix subword matching on last character of subword. 2016-07-08 15:32:44 +01:00
Peter Stephenson
a7d5d239e6 38783: zcalc tweaks for RPN mode.
Make it more straightforward to exchange variables with stack.
2016-07-04 12:08:14 +01:00
Oliver Kiddle
a73ae70e82 38770: vi upper/lowercase widgets and shell widget example that reads a vi movement 2016-06-29 17:05:06 +02:00
Oliver Kiddle
76f28cc908 38749: fixes for case at start of a line and for ksharrays 2016-06-22 22:15:52 +02:00
Peter Stephenson
26c01f5711 38737: clean up zcalc variables.
Undocumented variables now start with "_".
2016-06-21 17:26:35 +01:00
Peter Stephenson
5103c85abb 38736: various RPN mode enhancements for zcalc 2016-06-21 16:34:55 +01:00
Barton E. Schaefer
0b8ab3a21a 38715: add-zle-hook-widget: assorted ksharrays fixes; assign an index to any hook that is added without one, to preserve append ordering 2016-06-19 19:50:37 -07:00
Barton E. Schaefer
61a383ec4d unposted: zed needs localoptions noksharrays 2016-06-18 16:18:52 -07:00
Peter Stephenson
4cacf1624f 38693: Add RPN mode to zcalc 2016-06-16 11:39:42 +01:00
Barton E. Schaefer
8e2ec4517f 38670: New function for managing ZLE special widgets, modeled after Functions/Misc/add-zsh-hook. 2016-06-12 18:50:10 -07:00
Oliver Kiddle
20948d0889 38579: simplify saving and restoring of state 2016-06-09 22:58:45 +02:00
Daniel Shahaf
7a5ecf4909 38610: vcs_info quilt: Extract a patch subject, 2.0. 2016-06-06 08:10:12 +00:00
Daniel Shahaf
e8943e7007 38609: vcs_info quilt: Factor out a helper function. No functional change. 2016-06-06 08:10:11 +00:00
Daniel Shahaf
29e88b3ea3 unposted: Commit forgotten part of users/21256. 2016-05-10 18:39:18 +00:00
Barton E. Schaefer
c5c2fa4fb5 unposted: update documentary comments to remove references to self-insert-unmeta. 2016-05-09 08:27:52 -07:00
Barton E. Schaefer
e54578ff74 37971: fix potential issues when interacting with user-defined widgets
Cf. users/21284: Eric Freese
2016-02-14 11:35:18 -08:00
Kamil Dudka
c7edb354c7 37814: run-help-ip: use an absolute path for the shebang. 2016-01-28 20:55:23 -05:00
Daniel Shahaf
a45a9fa104 unposted: Fix typo in comment. 2016-01-15 06:30:06 +00:00
Daniel Shahaf
ce1148db45 37612: vcs_info git: Set $git_patches_unapplied correctly for 'rebase-apply' case.
This manifested, e.g., in 'git am' of a single patch that had a conflict.
2016-01-15 06:29:09 +00:00
Barton E. Schaefer
4a30b542a0 37570: give truth to the doc assertion transpose-words-match is a drop-in replacement for transpose-words 2016-01-13 19:51:07 -08:00
Barton E. Schaefer
c275839033 37567: use (Z:n:) to split the buffer into words so line breaks are treated as whitespace 2016-01-13 19:50:24 -08:00
Frank Terbeck
dab6e7c231 37451: vcs_info: Declare "msgs" in early context
The parameter *is* being declared with the redefinition of the
function, but not in its initial form, which gets you a warning
about the parameter being defined globally. This fixes it.
2015-12-30 15:23:08 +01:00
Philip Sequeira
038b1d4b38 37345: VCS_INFO functions break with setopt no_unset
With setopt no_unset in my config file, vcs_info fails with:
VCS_INFO_maxexports:7: vcs: parameter not set
2015-12-23 01:57:45 +01:00
Barton E. Schaefer
aedff53d1f users/21082 (expanded): a more complete sorting of version strings that are not in the form of zsh version numbers; additional explanatory comment 2015-12-19 22:03:34 -08:00
Barton E. Schaefer
597ffd85ed users/21068: use emacs keymap in vared by default 2015-12-19 16:52:38 -08:00
Daniel Shahaf
1f2bdc2aa2 unposted (after users/20873): Theoretical fix: don't parse print/echo escape sequences in $zle_bracketed_paste. 2015-12-19 10:48:48 +00:00
Peter Stephenson
53bc8ef2d8 37400: typo gave unwanted error message in zsh_directory_name_generic 2015-12-14 10:59:03 +00:00
Peter Stephenson
1f75d7ff2c 37386: localise mbegin, mend, match in URL magic 2015-12-11 14:05:29 +00:00
Oliver Kiddle
f546ea64df users/20873: disable bracketed paste while running external editor from zle 2015-12-11 05:34:48 +01:00
Peter Stephenson
4105f79a3a 37347: Remove incorrect local for msgs in VCS info 2015-12-08 12:59:48 +00:00
Daniel Shahaf
253df6d4bb 37295: kill-word-match: Join kills 2015-12-03 23:47:24 +00:00
Daniel Shahaf
502d55c014 37252: vcs_info git: Compute %b correctly with "rebase --onto" of detached heads. (Follow-up to 36725.) 2015-11-30 03:42:47 +00:00
Peter Stephenson
8efa4b4088 unposted: ZCALCPROMPT created globally in zcalc 2015-11-27 09:31:46 +00:00
Daniel Shahaf
694aee4c3d 37214: 'prompt walters': Don't export PS1 2015-11-27 07:27:23 +00:00
Barton E. Schaefer
14487ff5cc 37192: silence WARN_CREATE_GLOBAL in prompt themes 2015-11-22 10:19:49 -08:00
Peter Stephenson
ae4cf7b743 37186: a couple more WARN_CREATE_GLOBAL fixes 2015-11-22 16:06:20 +00:00
Peter Stephenson
4add525883 37170: suppress global create warning in function 2015-11-20 12:42:35 +00:00
Eric Cook
8d1e882b78 zed: Add -- to the `functions' builtin calls
Reported on IRC:

% autoload zed; zed -f -- "-zgen-prezto-load"
zed:83: bad option: -g
-zgen-prezto-load() {
}
2015-11-16 02:58:03 +01:00
Daniel Shahaf
f59864ce7a 37025: vcs_info git: Add a cherry-pick patch-format 2015-11-13 20:17:27 +00:00
Eric Cook
607a7a85b6 36993: zed: fix argument parsing 2015-10-31 19:06:47 +01:00
Peter Stephenson
1eef57b3d1 37027: allow subword context to discriminate between words 2015-10-30 16:59:41 +00:00
Peter Stephenson
0628802baf 37014: Improved internal parameter setting.
Enhance WARNCREATEGLOBAL to work in many more cases.

Don't create REPLY as an integer if it didn't previously exist
as one, even if the value to be set is integral, as this is likely to
mess up later uses of REPLY.
2015-10-29 15:01:07 +00:00
Barton E. Schaefer
aba7c00698 36994: declare local REPLY for use with "zle .read-command"; use .self-insert instead of .self-insert-unmeta 2015-10-27 20:29:07 -07:00
Daniel Shahaf
779b3112f8 36913 + 36945: vcs_info quilt: Pass patch subject lines to gen-applied-string
The format used is '${patchname} ${subject}', which is analogous to the git backend.
2015-10-24 20:42:26 +00:00
Daniel Shahaf
c62db9e7dc 36912: vcs_info quilt: Tolerate being in child of .pc's parent
Without this, gen-applied-string would only be set when .pc is a child of cwd,
not when it is a child of an ancestor of cwd.
2015-10-24 20:26:41 +00:00
Barton E. Schaefer
b947789d7c 36871: move initial call to "zle .bracketed-paste-magic" to occur earlier in the function
Just in case any later initialization might have side-effects.
2015-10-21 14:47:41 -07:00
Frank Terbeck
2e600b432a 36888: vcs_info: Prevent warn_create_global warning with '-preinit-' state
This is related to 33405. Turns out that not all other calls to
VCS_INFO_set are okay: With recent zsh versions the early call to that
function with the '-preinit-' argument causes a warning like this:

  VCS_INFO_set:9: math parameter maxexports created globally
                  in function VCS_INFO_set

This fixes it.
2015-10-18 20:40:18 +02:00
Peter Stephenson
bab1fc5043 36856: cdr -p/-P to prune directory list 2015-10-14 14:23:16 +01:00
Frank Terbeck
e245dd7193 36832: vcs_info: Remove dependency on "seq"
The "seq" utility is usually available on GNU systems only. This
exchanges calls to seq with pure zsh features. Also: Less forks are
good.
2015-10-11 12:54:30 +02:00
Frank Terbeck
7a1678767f 36830: vcs_info: Silence an error message with new git versions
Mikael informs me on IRC, that in new versions of git (he used 2.6.1)
where the "am" subcommand is now a builtin, a file that is used by the
git backend of vcs_info (namely .git/rebase-apply/msg-clean) is not
available anymore, leading to an annoying error message:

  VCS_INFO_get_data_git:232: no such file or directory: .git/rebase-apply/msg-clean

This patch checks for the availabiliy of the file before using it,
and adjusts the value of the dependant values accordingly.
2015-10-11 12:29:41 +02:00
Mikael Magnusson
64061e504f 36754: Functions/TCP: Tweak some usage output in the tcp_* functions 2015-10-03 00:05:40 +02:00
Mikael Magnusson
99aff5bb0c unposted: bracketed-paste-url-magic: actually do what the comment says 2015-10-01 20:16:24 +02:00
Peter Stephenson
196e6a0ec0 36735: add ~/.zcalcrc handling to zcalc 2015-10-01 15:55:01 +01:00
Mikael Magnusson
76da752fd7 36692: bracketed-paste-url-magic: simpler alternative for handling pasted urls 2015-10-01 03:55:21 +02:00
Daniel Shahaf
a90cf551ef 36725: vcs_info git: Compute %b correctly when "git am"-ing onto detached heads.
Before this patch, $gitbranch would be set to empty, which caused
VCS_INFO_get_data_git to early out with a failure status¹, consequently
$vcs_info_msg_0_ would be empty.

¹ via the 'if [[ -z ]]' block around line 170.
2015-09-30 21:43:37 +00:00
Daniel Shahaf
cd1cda9d57 36725: vcs_info git: Compute %b correctly when rebasing detached heads.
This sets the %b expando to the hash of the before-the-merge HEAD, rather
than to the literal string "detached HEAD".  That hash is already available
via the gen-applied-string hook.
2015-09-30 21:43:37 +00:00
Daniel Shahaf
7ac34a3055 36725: vcs_info git: Compute %b correctly when merging to detached heads.
The %b expando should be the hash prior to the merge.  The hash of the merge
result is available as the %i expando and via the gen-applied-string hook.
2015-09-30 21:43:37 +00:00
Daniel Hahler
45bdc87a1f 36601: vcs_info: handle missing .git/rebase-apply/{next,msg-clean}
When pressing Ctrl-C after `git am`, only `last` exists in
`.git/rebase-apply/`, which is empty.

This patch fixes it to fall back to "no patch applied" then.
2015-09-28 20:03:12 +02:00
Mikael Magnusson
d85a1fcd88 unposted: Fix broken case condition and "qualifer" typo 2015-09-28 02:24:54 +02:00
Peter Stephenson
649d06a8cd 36630: new function zsh_directory_name_generic 2015-09-25 21:30:34 +01:00
Barton E. Schaefer
8d5c0c7760 36604: fix getopts+shift calculation 2015-09-23 23:16:38 -07:00
Barton E. Schaefer
56ed4df898 36587: use +LINE:COLUMN to place the cursor when invoking emacs variants, for emacsclient 2015-09-22 08:52:52 -07:00
Barton E. Schaefer
b957cdd21a unposted: revert 36483 as multibyte is now handled by "zle .read-command"; adapt to new default behavior of zle_highlight for paste 2015-09-12 17:16:43 -07:00
Peter Stephenson
f5e8527a8c 36483: handle incomplete multibyte characters in bracketed-paste-magi 2015-09-11 18:40:22 +01:00
Daniel Shahaf
880579dc1e 36410: vcs_info git: Present merge heads as patches
This shows, during 'git merge', the revision hashes of the "remote" head
(the one that will become second parent of the commit) in the %m expando.

Review-by: Frank Terbeck
2015-09-05 10:47:44 +00:00
Axel Beckert
a9df6aaa70 36338: Replace "5.0.9" with "5.1" in source comments 2015-08-30 22:47:00 +02:00
Mikael Magnusson
095dd71cc0 36314: Avoid using short_loops syntax in distributed files 2015-08-28 09:37:37 +02:00
Barton E. Schaefer
2ed3b84fa6 36266: preserve emulation and setopt context for init and finish functions, handle vi modes 2015-08-21 13:38:19 -07:00
Barton E. Schaefer
c239a7bd91 36212: save and restore HISTNO along with other editor state, for sanity of "zle undo" 2015-08-17 20:59:00 -07:00
brian m. carlson
9a369d39e1 36209: vcs_info: avoid grep error message when file is missing
When running git rebase -m and a conflict occurs, the git-rebase-todo
file is not present.  This leads to an error from grep every time the
shell prompt is printed when vcs_info is enabled.  Avoid this message by
checking if the file exists before trying to grep it.
2015-08-18 01:00:25 +02:00
Barton E. Schaefer
2f2808098b unposted: mention bracketed-paste-magic in url-quote-magic comments 2015-08-16 22:52:21 -07:00
Barton E. Schaefer
795e6eb9b3 36195, 36196: wrapper of bracketed-paste for compatibilty with url-quote-magic and other self-insert wrapper widgets 2015-08-16 22:23:06 -07:00
Oliver Kiddle
832130c57d 36131: make use of undo limits; call mkundoent() when $UNDO_CHANGE_NO is referenced for a clear change number marking the current state 2015-08-13 16:18:26 +02:00
Mikael Magnusson
c5abf2bcff 36077: vcs_info: stop exporting everything 2015-08-12 04:31:22 +02:00
Oliver Kiddle
8bbfbfebbc unposted (c.f. Bart: 35902): use - after zle -U in case $key is - 2015-08-05 15:44:18 +02:00
Barton E. Schaefer
e0980e91be 35937: wait for process IDs instead of job numbers in parallel mode 2015-07-27 09:44:10 -07:00
Barton E. Schaefer
1629d5bcbd add RPS2 handling to "prompt bart", update help text, clean up indentation whitespace 2015-07-25 15:48:10 -07:00