@@ -6,6 +6,7 @@

 ;;(let ((file-name-handler-alist nil))

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

 (add-hook 'after-init-hook

           (lambda ()

             ;; (require 'projectile)

@@ -13,8 +14,11 @@

             (unless (fboundp 'server-running-p)

               (require 'server))

-            (unless (server-running-p)

-              (server-start))

+            (let ((server-name (if fwoar.is-ordinary

+                                   server-name

+                                 "notes")))

+                               (unless (server-running-p)

+               (server-start)))

             (projectile-mode)

             (evil-mode)

             (paredit-mode)

@@ -30,7 +34,6 @@

             ))

-

 (when (file-exists-p "/usr/local/bin/gls")

   (setq insert-directory-program "/usr/local/bin/gls"))

@@ -342,8 +345,6 @@

 (setq gc-cons-threshold (* 100 1024))

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

-

 (unless fwoar.is-ordinary

   (setq with-editor-emacsclient-executable "/usr/local/bin/emacsclient")

   (require 'cjpad)

new file mode 100644

@@ -0,0 +1,19 @@

+(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))

@@ -1,5 +1,5 @@

-if [[ -o interactive ]]; then

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

+if [[ $TERM_PROGRAM == "iTerm.app" && -o interactive ]]; then

+  if [ "$ITERM_ENABLE_SHELL_INTEGRATION_WITH_TMUX""$TERM" != "screen" -a "$ITERM_SHELL_INTEGRATION_INSTALLED" = "" ]; then

     ITERM_SHELL_INTEGRATION_INSTALLED=Yes

     ITERM2_SHOULD_DECORATE_PROMPT="1"

     # Indicates start of command output. Runs just before command executes.

@@ -120,7 +120,11 @@ if [[ -o interactive ]]; then

     }

     # If hostname -f is slow on your system, set iterm2_hostname prior to sourcing this script.

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

+    [[ -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

     if [[ "$TERM_PROGRAM" = "iTerm.app" ]]; then 

       [[ -z $precmd_functions ]] && precmd_functions=()

@@ -129,8 +133,8 @@ if [[ -o interactive ]]; then

       [[ -z $preexec_functions ]] && preexec_functions=()

       preexec_functions=($preexec_functions iterm2_preexec)

-      iterm2_print_state_data

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

-    fi

+    iterm2_print_state_data

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

   fi

 fi

+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

@@ -1,27 +1,35 @@

+man-() {

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

+}

+

 vspf() {

-  tmux split-window -h "$*"

+  tmux split-window -h "$*; sleep 1"

 }

 vsp() {

-  tmux split-window -d -h "$*"

+  tmux split-window -d -h "$*; sleep 1"

 }

 sp() {

-  tmux split-window -d "$*"

+  tmux split-window -d "$*; sleep 1"

 }

 spf() {

-  tmux split-window "$*"

+  tmux split-window "$*; sleep 1"

+}

+

+pager() {

+  $PAGER -f "$*"

 }

 _vman_helper() {

   inp="`mktemp -u`"

   mkfifo "$inp"

   echo "$inp"

-  vsp man -l "$inp"

+  vsp man- "$inp"

 }

 vman() {

   if [[ x"$TMUX" != x"" ]]; then

     if [[ x"$1" == "x" ]]; then

-      cat - > `_vman_helper`

+      cat - | man- > `_vman_helper`

     else

       vsp man $*

     fi

@@ -34,7 +42,7 @@ _vless_helper() {

   inp="`mktemp -u`"

   mkfifo "$inp"

   echo "$inp"

-  vsp $PAGER "$inp"

+  vsp ${PAGER:-less} -f "$inp"

 }

 vless() {

@@ -1,9 +1,5 @@

 # Requires pandoc

-man-() {

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

-}

-

 2man() {

   input="$2"

   if [[ "$input" == "" ]]; then

@@ -17,11 +13,11 @@ alias md2man='2man markdown'

 alias latex2man='2man latex'

 _pandoc_view() {

-  2man $1 $2 | man -l -

+  2man $1 $2 | man-

 }

 pandoc_view() {

-  man_fun="man -l -"

+  man_fun="man-"

   _pandoc_view $*

 }

@@ -34,7 +30,7 @@ dump_md() {

 }

 vpandoc_view() {

-  man_fun=vman

+  man_fuvman

   _pandoc_view $*

 }