fiddlerwoaroof/dotfiles - Change PZ5HUCRXCTUXIKAFUFDGMVSZVV4MIDZ2EE7OC3TBZTTQ7HZCMUYAC

zsh and emacs changes

zsh: make vsp and friends work more reliably cross-platform
emacs: various tweaks

Created by Ed Langley on March 9, 2018

PZ5HUCRXCTUXIKAFUFDGMVSZVV4MIDZ2EE7OC3TBZTTQ7HZCMUYAC

Dependencies

In channels

main

Change contents

File deletion: dependencies, dependencies
BFD:BFD[3.1] → [4.129:152]
BFD:BFD[3.1] → [4.129:152]
BFD:BFD[4.152] → [4.128:128]
Deletion in zsh/zsh_plugins/02-pandoc.zsh at line 3 [3.1259]
B:BD[5.33] → [5.33:164]
∅:D[5.164] → [3.1278:1279]
B:BD[3.1278] → [3.1278:1279]
```
man-() {
  (echo ".ll 18.0i"; echo ".nr LL 18.0i"; /bin/cat) | /usr/bin/tbl | /usr/bin/groff -Wall -mtty-char -Tascii -mandoc -c
}
```
Replacement in zsh/zsh_plugins/02-pandoc.zsh at line 16 [3.1259]
B:BD[6.119] → [7.114:138]
```
  2man $1 $2 | man -l -
```
[6.119]
[6.143]
```
  2man $1 $2 | man-
```
Replacement in zsh/zsh_plugins/02-pandoc.zsh at line 20 [3.1259]
B:BD[8.159] → [6.146:167]
```
  man_fun="man -l -"
```
[8.159]
[6.167]
```
  man_fun="man-"
```
Replacement in zsh/zsh_plugins/02-pandoc.zsh at line 33 [3.1259]
B:BD[6.203] → [6.203:218]
```
  man_fun=vman
```
[6.203]
[6.218]
```
  man_fuvman
```

Insertion in zsh/zsh_plugins/01-tmux.zsh at line 1 [9.86]

[9.86]

[9.87]

man-() {
  (echo ".ll 18.0i"; echo ".nr LL 18.0i"; /bin/cat) | /usr/bin/tbl | /usr/bin/groff -Wall -mtty-char -Tascii -mandoc -c
}

Replacement in zsh/zsh_plugins/01-tmux.zsh at line 6 [9.86]
B:BD[9.96] → [9.96:124]
```
  tmux split-window -h "$*"
```
[9.96]
[9.124]
```
  tmux split-window -h "$*; sleep 1"
```
Replacement in zsh/zsh_plugins/01-tmux.zsh at line 9 [9.86]
B:BD[9.134] → [9.134:165]
```
  tmux split-window -d -h "$*"
```
[9.134]
[10.8]
```
  tmux split-window -d -h "$*; sleep 1"
```
Replacement in zsh/zsh_plugins/01-tmux.zsh at line 12 [9.86]
B:BD[10.17] → [10.17:45]
```
  tmux split-window -d "$*"
```
[10.17]
[10.45]
```
  tmux split-window -d "$*; sleep 1"
```
Replacement in zsh/zsh_plugins/01-tmux.zsh at line 15 [9.86]
B:BD[10.55] → [10.55:80]
```
  tmux split-window "$*"
```
[10.55]
[8.185]
```
  tmux split-window "$*; sleep 1"
}
pager() {
  $PAGER -f "$*"
```
Replacement in zsh/zsh_plugins/01-tmux.zsh at line 26 [9.86]
B:BD[8.255] → [8.255:275]
```
  vsp man -l "$inp"
```
[8.255]
[10.80]
```
  vsp man- "$inp"
```
Replacement in zsh/zsh_plugins/01-tmux.zsh at line 32 [9.86]
B:BD[8.341] → [8.341:370]
```
      cat - > `_vman_helper`
```
[8.341]
[8.370]
```
      cat - | man- > `_vman_helper`
```
Replacement in zsh/zsh_plugins/01-tmux.zsh at line 45 [9.86]
B:BD[11.79] → [11.79:99]
```
  vsp $PAGER "$inp"
```
[11.79]
[9.165]
```
  vsp ${PAGER:-less} -f "$inp"
```

Replacement in zsh/zsh_plugins/00-iterm.zsh at line 1 [12.21717]

B:BD[12.21717] → [12.21718:21828]

if [[ -o interactive ]]; then
  if [ "$TERM" != "screen" -a "$ITERM_SHELL_INTEGRATION_INSTALLED" = "" ]; then

[12.21717]

[12.21828]

if [[ $TERM_PROGRAM == "iTerm.app" && -o interactive ]]; then
  if [ "$ITERM_ENABLE_SHELL_INTEGRATION_WITH_TMUX""$TERM" != "screen" -a "$ITERM_SHELL_INTEGRATION_INSTALLED" = "" ]; then

Replacement in zsh/zsh_plugins/00-iterm.zsh at line 123 [12.21717]

B:BD[12.26367] → [12.26367:26432]

    [[ -z "$iterm2_hostname" ]] && iterm2_hostname=`hostname -f`

[12.26367]

[12.26432]

    [[ -z "$iterm2_hostname" ]] && iterm2_hostname=`hostname -f 2>/dev/null`
    # some flavors of BSD (i.e. NetBSD and OpenBSD) don't have the -f option
    if [ $? -ne 0 ]; then
      iterm2_hostname=`hostname`
    fi

Replacement in zsh/zsh_plugins/00-iterm.zsh at line 136 [12.21717]

B:BD[12.26658] → [13.331:433]

      iterm2_print_state_data
      printf "\033]1337;ShellIntegrationVersion=5;shell=zsh\007"
    fi

[12.26658]

[12.26749]

    iterm2_print_state_data
    printf "\033]1337;ShellIntegrationVersion=6;shell=zsh\007"

Insertion in zsh/zsh_plugins/00-iterm.zsh at line 140 [12.21717]

[12.26757]

alias imgcat=~/.iterm2/imgcat;alias imgls=~/.iterm2/imgls;alias it2attention=~/.iterm2/it2attention;alias it2check=~/.iterm2/it2check;alias it2copy=~/.iterm2/it2copy;alias it2dl=~/.iterm2/it2dl;alias it2getvar=~/.iterm2/it2getvar;alias it2setcolor=~/.iterm2/it2setcolor;alias it2setkeylabel=~/.iterm2/it2setkeylabel;alias it2ul=~/.iterm2/it2ul;alias it2universion=~/.iterm2/it2universion

File addition: utils.el (----------)

[14.131]

(defun op--collect-args (body)
  (flet ((walker (body &optional args)
                 (if (null body)
                     args
                   (if (symbolp body)
                       (when (eql ?\_ (elt (symbol-name body) 0))
                         (cons body args))
                     (if (listp body)
                         (append (op--collect-args (car body))
                                 (op--collect-args (cdr body))
                                 ))))))
    (sort (walker body)
          (lambda (a b)
            (< (string-to-number (subseq (symbol-name a) 1))
               (string-to-number (subseq (symbol-name b) 1)))))))
(defmacro op (&rest body)
  `(lambda ,(op--collect-args body)
     ,@body))

Insertion in emacs.d/init.el at line 9 [16.136]

[15.7018]

(setq fwoar.is-ordinary (not (string= invocation-name "EmacsNotes")))

Replacement in emacs.d/init.el at line 17 [16.136]

B:BD[15.7224] → [15.7224:7293]

            (unless (server-running-p)
              (server-start))

[15.7224]

[15.7293]

            (let ((server-name (if fwoar.is-ordinary
                                   server-name
                                 "notes")))
                               (unless (server-running-p)
               (server-start)))

Deletion in emacs.d/init.el at line 37 [16.136]
B:BD[15.7653] → [15.7653:7654]
Deletion in emacs.d/init.el at line 348 [16.136]
B:BD[2.195] → [2.195:266]
```
(setq fwoar.is-ordinary (not (string= invocation-name "EmacsNotes")))
```

File addition: utils.el (----------)

[14.131]

(defun op--collect-args (body)
  (flet ((walker (body &optional args)
                 (if (null body)
                     args
                   (if (symbolp body)
                       (when (eql ?\_ (elt (symbol-name body) 0))
                         (cons body args))
                     (if (listp body)
                         (append (op--collect-args (car body))
                                 (op--collect-args (cdr body))
                                 ))))))
    (sort (walker body)
          (lambda (a b)
            (< (string-to-number (subseq (symbol-name a) 1))
               (string-to-number (subseq (symbol-name b) 1)))))))
(defmacro op (&rest body)
  `(lambda ,(op--collect-args body)
     ,@body))

zsh and emacs changes

Dependencies

In channels

Change contents

File deletion: dependencies, dependencies

Deletion in zsh/zsh_plugins/02-pandoc.zsh at line 3 [3.1259]

Replacement in zsh/zsh_plugins/02-pandoc.zsh at line 16 [3.1259]

Replacement in zsh/zsh_plugins/02-pandoc.zsh at line 20 [3.1259]

Replacement in zsh/zsh_plugins/02-pandoc.zsh at line 33 [3.1259]

Insertion in zsh/zsh_plugins/01-tmux.zsh at line 1 [9.86]

Replacement in zsh/zsh_plugins/01-tmux.zsh at line 6 [9.86]

Replacement in zsh/zsh_plugins/01-tmux.zsh at line 9 [9.86]

Replacement in zsh/zsh_plugins/01-tmux.zsh at line 12 [9.86]

Replacement in zsh/zsh_plugins/01-tmux.zsh at line 15 [9.86]

Replacement in zsh/zsh_plugins/01-tmux.zsh at line 26 [9.86]

Replacement in zsh/zsh_plugins/01-tmux.zsh at line 32 [9.86]

Replacement in zsh/zsh_plugins/01-tmux.zsh at line 45 [9.86]

Replacement in zsh/zsh_plugins/00-iterm.zsh at line 1 [12.21717]

Replacement in zsh/zsh_plugins/00-iterm.zsh at line 123 [12.21717]

Replacement in zsh/zsh_plugins/00-iterm.zsh at line 136 [12.21717]

Insertion in zsh/zsh_plugins/00-iterm.zsh at line 140 [12.21717]

File addition: utils.el (----------)

Insertion in emacs.d/init.el at line 9 [16.136]

Replacement in emacs.d/init.el at line 17 [16.136]

Deletion in emacs.d/init.el at line 37 [16.136]

Deletion in emacs.d/init.el at line 348 [16.136]

File addition: utils.el (----------)