Merge remote-tracking branch 'staging'

* staging:
  dot/gitconfig.in: Don't have `git send-email' try to do threading.
  dot/gitconfig.in: Abolish the `git email' alias.
  dot/gitconfig.in: Remove output filename; force full indices.
  git/gitignore: Ignore toplevel `p/' and `p.*/' directories.
  git/gitignore: Only ignore `build' etc. if they're toplevel directories.
  git/gitignore: Deprecate `deb-build/' and `build-*/' directories.
  dot/gitconfig.in: Configure `format-patch' to do sensible things.

diff --git a/dot/zshrc b/dot/zshrc
index a42e48220f2932fcabffb679676ef83790ac42c7..f6b205a0131995bb134575189648fecb26e241e5 100644 (file)
--- a/dot/zshrc
+++ b/dot/zshrc
@@ -137,6 +137,7 @@ unsetopt bash_auto_list
 unsetopt beep
 setopt extendedglob
 unsetopt flow_control
+unsetopt global_export
 setopt glob_star_short
 setopt hist_ignore_all_dups
 setopt hist_ignore_space

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 24d076d2e05477c4c1fb5ccd08e9eaf33fa20a6e..001fa2947f96129ee1ec14f238fa220b015ae338 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1012,6 +1012,9 @@ (defun mdw-w3m-browse-url (url &optional new-session-p)
            (w3m-browse-url url new-session-p))
        (select-window window)))))
 
+(eval-after-load 'w3m
+  '(define-key w3m-mode-map [?\e ?\r] 'w3m-view-this-url-new-session))
+
 (defvar mdw-good-url-browsers
   '(browse-url-chromium
     browse-url-mozilla
@@ -4006,7 +4009,7 @@ (defun ssh (host)
   (ansi-term (list "ssh" host) (format "ssh@%s" host)))
 
 (defvar git-grep-command
-  "env PAGER=cat git grep --no-color -nH -e "
+  "env GIT_PAGER=cat git grep --no-color -nH -e "
   "*The default command for \\[git-grep].")
 
 (defvar git-grep-history nil)
@@ -4016,7 +4019,8 @@ (defun git-grep (command-args)
   (interactive
    (list (read-shell-command "Run git grep (like this): "
                             git-grep-command 'git-grep-history)))
-  (grep command-args))
+  (let ((grep-use-null-device nil))
+    (grep command-args)))
 
 ;;;--------------------------------------------------------------------------
 ;;; Magit configuration.